update...

潘钊
1 parent aed56989
Showing 24 changed files with 1054 additions and 98 deletions
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/Station2ParkBuffer.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/entity/EditType.java
src/main/java/com/bsth/data/schedule/edit_logs/loggers/AfterwardsLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/service/SchEditInfoServiceImpl.java
src/main/java/com/bsth/data/utils/CustomStringUtils.java
src/main/java/com/bsth/entity/realcontrol/StationToPark.java
src/main/java/com/bsth/repository/realcontrol/StationToParkRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lp_change.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_custom.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_in_out.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_range_turn.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/main.html
@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
+import com.bsth.data.Station2ParkBuffer;
 import com.bsth.entity.Line;
+import com.bsth.entity.realcontrol.StationToPark;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
@@ -29,6 +31,9 @@ public class BasicDataController {
 	BasicData basicData;
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	@Autowired
+	Station2ParkBuffer station2ParkBuffer;
 	@RequestMapping("/cars")
 	public Iterable<String> findAllNbbm(Map<String, Object> map){
@@ -180,4 +185,25 @@ public class BasicDataController {
 		return rs;
 	}
+
+	/**
+	 * 获取站点和停车场对照表
+	 * @param idx
+	 * @return
+	 */
+	@RequestMapping("/station2ParkData")
+	public Map<String, Collection<StationToPark>> findStation2ParkData(@RequestParam String idx){
+		List<String> lines = Splitter.on(",").splitToList(idx);
+		ArrayListMultimap<String, StationToPark> rs = ArrayListMultimap.create();
+
+		for(String lineCode : lines){
+			rs.putAll(lineCode, Station2ParkBuffer.get(lineCode));
+		}
+		return rs.asMap();
+	}
+
+	@RequestMapping(value = "/deleteStation2Park", method = RequestMethod.POST)
+	public Map<String, Object> deleteStation2Park(@RequestParam String lineCode,@RequestParam Integer id){
+		return station2ParkBuffer.delete(lineCode, id);
+	}
 }
@@ -134,6 +134,9 @@ public class BasicData implements CommandLineRunner {
         @Autowired
         GeoCacheData geoCacheData;
+        @Autowired
+        Station2ParkBuffer station2ParkBuffer;
+
         @Override
         public void run() {
@@ -160,6 +163,7 @@ public class BasicData implements CommandLineRunner {
                 loadBusinessInfo();
                 geoCacheData.loadData();
+                station2ParkBuffer.saveAll();
                 logger.info("加载基础数据成功！，");
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
+package com.bsth.data;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.StationToPark;
+import com.bsth.repository.realcontrol.StationToParkRepository;
+import com.bsth.util.Arith;
+import com.google.common.collect.ArrayListMultimap;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+/**
+ * 站到场 历时、公里 数据缓存
+ * Created by panzhao on 2017/7/10.
+ */
+@Component
+public class Station2ParkBuffer implements CommandLineRunner {
+
+    @Autowired
+    StationToParkRepository stationToParkRepository;
+
+    private static ArrayListMultimap listMultimap;
+
+    private static Set<StationToPark> pstBuff;
+
+    static Logger log = LoggerFactory.getLogger(Station2ParkBuffer.class);
+
+    @Override
+    public void run(String... strings) throws Exception {
+        listMultimap = ArrayListMultimap.create();
+        pstBuff = new HashSet<>();
+        Iterator<StationToPark> iterator = stationToParkRepository.findAll().iterator();
+        StationToPark stp;
+        while (iterator.hasNext()) {
+            stp = iterator.next();
+            listMultimap.put(stp.getLineCode(), stp);
+        }
+    }
+
+    public static List<StationToPark> get(String lineCode) {
+        return listMultimap.get(lineCode);
+    }
+
+    public static StationToPark get(String lineCode, String sName, String eName) {
+        List<StationToPark> list = get(lineCode);
+        StationToPark stp = null;
+        for (StationToPark s : list) {
+            if (s.getStationName().equals(sName) && s.getParkName().equals(eName)) {
+                stp = s;
+                break;
+            }
+        }
+        return stp;
+    }
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    public static void put(ChildTaskPlan ctask) {
+        try{
+            String type2 = ctask.getType2();
+            String lineCode = ctask.getSchedule().getXlBm(), sName, eName;
+
+            if (type2.equals("2")) {
+                sName = ctask.getStartStationName();
+                eName = ctask.getEndStationName();
+            } else if (type2.equals("3")) {
+                eName = ctask.getStartStationName();
+                sName = ctask.getEndStationName();
+            } else
+                return;
+
+            Float time = calcMinute(ctask);
+            Float mileage = ctask.getMileage();
+
+            StationToPark stp = get(lineCode, sName, eName);
+            if (stp == null) {
+                stp = new StationToPark();
+                stp.setLineCode(lineCode);
+                stp.setStationName(sName);
+                stp.setParkName(eName);
+                listMultimap.put(lineCode, stp);
+            }
+
+            if (type2.equals("2")) {
+                stp.setTime1(time);
+                stp.setMileage1(mileage);
+            } else {
+                stp.setTime2(time);
+                stp.setMileage2(mileage);
+            }
+
+            pstBuff.add(stp);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    public static Float calcMinute(ChildTaskPlan ctask) {
+        long t = 0;
+
+        try {
+            long st = fmtHHmm.parseMillis(ctask.getStartDate());
+            long et = fmtHHmm.parseMillis(ctask.getEndDate());
+
+            t = et - st;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Float.parseFloat(String.valueOf(Arith.div(Arith.div(t, 1000), 60)));
+    }
+
+    public void saveAll(){
+        if(pstBuff.size()==0)
+            return;
+        Set<StationToPark> pstBuffCopy =  pstBuff;
+        pstBuff = new HashSet<>();
+        //持久化到数据库
+        stationToParkRepository.save(pstBuffCopy);
+    }
+
+    public Map<String, Object> delete(String lineCode, Integer id) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            List<StationToPark> list = listMultimap.get(lineCode);
+
+            StationToPark stp = null;
+            for(StationToPark temp : list){
+                if(temp.getId().equals(id)){
+                    stp=temp;
+                    break;
+                }
+            }
+
+            if(stp != null){
+                listMultimap.remove(lineCode, stp);
+                stationToParkRepository.delete(id);
+                rs.put("status", ResponseCode.SUCCESS);
+            }
+            else{
+                rs.put("status", ResponseCode.SUCCESS);
+                rs.put("msg", "操作失败，可能数据已经被删除！");
+            }
+
+        }catch (Exception e){
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+            log.error("", e);
+        }
+        return rs;
+    }
+}
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=173";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=" + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -231,4 +231,20 @@ public class ScheduleModifyLogger {
     public static void put(SchEditInfo sei) {
         list.add(sei);
     }
+
+    public static void afterEdit(ScheduleRealInfo sch, String remarks, JSONArray jsonArray) {
+        try {
+            if (jsonArray == null || jsonArray.size() == 0)
+                return;
+
+            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            sei.setRemarks(remarks);
+            sei.setJsonArray(jsonArray.toJSONString());
+            sei.setType(EditType.LSBCTZ);
+
+            put(sei);
+        } catch (Exception e) {
+            log.error("", e);
+        }
+    }
 }
@@ -5,5 +5,5 @@ package com.bsth.data.schedule.edit_logs.entity;
  */
 public enum EditType {
-    DFTZ,SFTZ,FCXXWT,TZRC,LPDD,ZRW,JHLB,CXLB, CXSF, CXZX
+    DFTZ,SFTZ,FCXXWT,TZRC,LPDD,ZRW,JHLB,CXLB, CXSF, LSBCTZ, CXZX
 }
 \ No newline at end of file
+package com.bsth.data.schedule.edit_logs.loggers;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.schedule.edit_logs.ScheduleModifyLogger;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 事后历史班次编辑
+ * Created by panzhao on 2017/5/19.
+ */
+public class AfterwardsLogger {
+
+    static Logger log = LoggerFactory.getLogger(AfterwardsLogger.class);
+
+    private JSONArray jsonArray = new JSONArray();
+    private String remarks;
+    private ScheduleRealInfo sch;
+
+    public void log(String title, Object old, Object now){
+        try {
+
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("title", title);
+            jsonObject.put("old", old);
+            jsonObject.put("now", now);
+
+            jsonArray.add(jsonObject);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    public void log(String text){
+        try {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("title", text);
+
+            jsonArray.add(jsonObject);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    public static AfterwardsLogger start(ScheduleRealInfo sch, String remarks){
+        AfterwardsLogger fLog = new AfterwardsLogger();
+        fLog.setSch(sch);
+        fLog.setRemarks(remarks);
+        return fLog;
+    }
+
+    public void end(){
+        ScheduleModifyLogger.afterEdit(sch, this.remarks, jsonArray);
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public ScheduleRealInfo getSch() {
+        return sch;
+    }
+
+    public void setSch(ScheduleRealInfo sch) {
+        this.sch = sch;
+    }
+}
@@ -41,7 +41,7 @@ public class SchEditInfoServiceImpl extends BaseServiceImpl&lt;SchEditInfo, Long&gt; i
             for(String k : ks){
                 v =map.get(k);
                 if(StringUtils.isNotEmpty(v))
-                    cont += " and t2." + BatchSaveUtils.propertyToField(k) + "='" + v + "'";
+                    cont += " and " + BatchSaveUtils.propertyToField(k) + "='" + v + "'";
             }
             String sql = "select t1.*, t2.fcsj,t2.lp_name,t2.cl_zbh,t2.j_gh,t2.j_name,t2.xl_dir,t2.real_exec_date from (select * from logger_sch_modify where rq=? and line_code=? ) t1 INNER JOIN bsth_c_s_sp_info_real t2 on t1.sch_id=t2.id where 1=1 " + cont;
+package com.bsth.data.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Created by panzhao on 2017/7/10.
+ */
+public class CustomStringUtils {
+
+    public static boolean equals(String s1, String s2){
+        if(s1 == null){
+            if(StringUtils.isNotEmpty(s2))
+                return false;
+            else
+                return true;
+        }
+        return s1.equals(s2);
+    }
+}
+package com.bsth.entity.realcontrol;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 站 到 场
+ * Created by panzhao on 2017/7/10.
+ */
+@Entity
+@Table(name = "bsth_c_station_to_park")
+public class StationToPark {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 站点名称 */
+    private String stationName;
+
+    /** 停车场编码 */
+    private String parkName;
+
+    /** 站到场时间（分钟） */
+    private Float time1;
+
+    /** 站到场公里 */
+    private Float mileage1;
+
+    /** 场到站时间（分钟） */
+    private Float time2;
+
+    /** 场到站公里 */
+    private Float mileage2;
+
+    /** 排序字段 */
+    private int orderNo;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+
+    public Float getTime1() {
+        return time1;
+    }
+
+    public void setTime1(Float time1) {
+        this.time1 = time1;
+    }
+
+    public Float getMileage1() {
+        return mileage1;
+    }
+
+    public void setMileage1(Float mileage1) {
+        this.mileage1 = mileage1;
+    }
+
+    public Float getTime2() {
+        return time2;
+    }
+
+    public void setTime2(Float time2) {
+        this.time2 = time2;
+    }
+
+    public Float getMileage2() {
+        return mileage2;
+    }
+
+    public void setMileage2(Float mileage2) {
+        this.mileage2 = mileage2;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public int getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(int orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getParkName() {
+        return parkName;
+    }
+
+    public void setParkName(String parkName) {
+        this.parkName = parkName;
+    }
+
+    @Override
+    public int hashCode() {
+        return ("stp_" + this.toString()).hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return this.toString().equals(((StationToPark)obj).toString());
+    }
+
+    @Override
+    public String toString() {
+        return this.lineCode + "_" + this.getStationName() + "_" + this.getParkName();
+    }
+}
+package com.bsth.repository.realcontrol;
+
+import com.bsth.entity.realcontrol.StationToPark;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/7/10.
+ */
+@Repository
+public interface StationToParkRepository extends BaseRepository<StationToPark, Integer>{
+}
@@ -2,6 +2,7 @@ package com.bsth.service.realcontrol.impl;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
+import com.bsth.data.Station2ParkBuffer;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -67,6 +68,9 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
             dayOfSchedule.save(sch);
             //直接持久化
             //scheduleRealInfoRepository.save(sch);
+            //站到场对照
+            t.setSchedule(sch);
+            Station2ParkBuffer.put(t);
             rs.put("status", ResponseCode.SUCCESS);
             rs.put("t", sch);
@@ -15,9 +15,11 @@ import com.bsth.data.schedule.SchAttrCalculator;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.data.schedule.edit_logs.FormLogger;
 import com.bsth.data.schedule.edit_logs.ScheduleModifyLogger;
+import com.bsth.data.schedule.edit_logs.loggers.AfterwardsLogger;
 import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
+import com.bsth.data.utils.CustomStringUtils;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
@@ -3040,14 +3042,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         rs.put("status", ResponseCode.ERROR);
         ScheduleRealInfo oldSch = super.findById(sch.getId());
+        //事后日志记录
+        AfterwardsLogger aflog = AfterwardsLogger.start(oldSch, "事后调整");
         //换车
         if (StringUtils.isNotEmpty(sch.getClZbh()) && !oldSch.getClZbh().equals(sch.getClZbh())) {
             if (!carExist(oldSch.getGsBm(),sch.getClZbh())) {
                 rs.put("msg", "车辆 " + sch.getClZbh() + " 不存在！");
                 return rs;
-            } else
+            } else{
+                aflog.log("换车", oldSch.getClZbh(), sch.getClZbh());
                 oldSch.setClZbh(sch.getClZbh());
+            }
         }
         //换驾驶员
@@ -3057,6 +3063,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 rs.put("msg", oldSch.getXlName() + "所属的公司编码下找不到工号为【" + sch.getjGh() + "】的驾驶员");
                 return rs;
             }
+            aflog.log("换驾驶员", oldSch.getjGh()+"/"+ oldSch.getjName(),  sch.getjGh()+"/"+ sch.getjName());
             persoChange(oldSch, sch.getjGh());
         }
@@ -3067,6 +3074,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 rs.put("msg", sch.getXlName() + "所属的公司编码下找不到工号为【" + sch.getsGh() + "】的售票员");
                 return rs;
             }
+            aflog.log("换售票员", oldSch.getsGh()+"/"+ oldSch.getsName(),  sch.getsGh()+"/"+ sch.getsName());
             persoChangeSPY(oldSch, sch.getsGh());
         }
@@ -3075,12 +3083,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         boolean dest2 = sch.getStatus() == -1;
         if (!dest1 && dest2) {
             oldSch.destroy();
+            aflog.log("烂班");
         }
         else if(dest1 && !dest2){
             //撤销烂班
             oldSch.setJhlc(oldSch.getJhlcOrig());
             oldSch.setStatus(0);
             oldSch.calcStatus();
+            aflog.log("撤销烂班");
         }
@@ -3089,6 +3099,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          */
         if (!oldSch.getJhlc().equals(sch.getJhlc())) {
             double jhlcNum = sch.getJhlc();
+            aflog.log("修改班次里程", oldSch.getJhlc(), jhlcNum);
             //烂班
             if(jhlcNum == 0 && oldSch.getJhlcOrig() != 0)
                 oldSch.destroy();
@@ -3101,15 +3112,30 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         //待发时间
-        oldSch.setDfsj(sch.getDfsj());
+        if(!CustomStringUtils.equals(oldSch.getDfsj(), sch.getDfsj())){
+            aflog.log("修改待发时间", oldSch.getDfsj(), sch.getDfsj());
+            oldSch.setDfsj(sch.getDfsj());
+        }
         //实发时间
-        oldSch.setFcsjActual(sch.getFcsjActual());
+        if(!CustomStringUtils.equals(oldSch.getFcsjActual(), sch.getFcsjActual())){
+            aflog.log("修改实发时间", oldSch.getFcsjActual(), sch.getFcsjActual());
+            oldSch.setFcsjActual(sch.getFcsjActual());
+        }
         //实际终点
-        oldSch.setZdsjActual(sch.getZdsjActual());
+        if(!CustomStringUtils.equals(oldSch.getZdsjActual(), sch.getZdsjActual())){
+            aflog.log("修改实达时间", oldSch.getZdsjActual(), sch.getZdsjActual());
+            oldSch.setZdsjActual(sch.getZdsjActual());
+        }
+
         //备注
-        oldSch.setRemarks(sch.getRemarks());
+        if(!CustomStringUtils.equals(oldSch.getRemarks(), sch.getRemarks())){
+            aflog.log("修改备注", oldSch.getRemarks(), sch.getRemarks());
+            oldSch.setRemarks(sch.getRemarks());
+        }
         scheduleRealInfoRepository.save(oldSch);
+
+        aflog.end();
         rs.put("status", ResponseCode.SUCCESS);
         return rs;
     }
@@ -1341,25 +1341,6 @@ ul.left_tabs_lg li{
     margin-bottom: 0;
 }
-.sub_task_form_v2.repeat_main:before{
-    content: '复';
-    position: absolute;
-    top: -10px;
-    font-size: 12px;
-    color: #2196F3;
-    background: #ffffff;
-    padding: 0 3px;
-    font-weight: 600;
-}
-
-.sub_task_form_v2.repeat_main.destroy_form:before{
-    color: #F44336;
-}
-
-.sub_task_form_v2.repeat_main{
-    background: #f4faff;
-}
-
 .sub_task_form_v2.destroy_form{
     background-color: #fff5f4 !important;
 }
@@ -1434,4 +1415,161 @@ ul.left_tabs_lg li{
     font-size: 16px;
     color: #a44a4a;
     font-family: 微软雅黑;
+}
+
+#schedule-lp_change-modal .ct_table dl{
+    height: 35px;
+}
+
+#schedule-lp_change-modal .ct_table dl dd, #schedule-lp_change-modal .ct_table dl dt{
+    line-height: 35px;
+}
+
+/*
+.sub_task_form_v2.repeat_main:before{
+    content: '复';
+    position: absolute;
+    top: -10px;
+    font-size: 12px;
+    color: #2196F3;
+    background: #ffffff;
+    padding: 0 3px;
+    font-weight: 600;
+}*/
+
+.sub_task_form_v2:before{
+    position: absolute;
+    top: -7px;
+    font-size: 12px;
+    padding: 0 3px;
+    font-weight: 600;
+    line-height: 14px;
+}
+
+.sub_task_form_v2.destroy_form:before{
+    content: '烂班' !important;
+    color: #f14235 !important;
+    background: #ffffff !important;
+}
+
+.sub_task_form_v2.service_form:before{
+    content: '营运';
+    color: #2196F3;
+    background: #ffffff;
+}
+
+.sub_task_form_v2.empty_form:before{
+    content: '空驶';
+    color: #928f92;
+    background: #ffffff;
+}
+
+.sub_task_form_v2.service_form{
+    background: #f4faff;
+}
+
+/*.sub_task_form_v2.repeat_main.destroy_form:before{
+    color: #F44336;
+}
+
+.sub_task_form_v2.repeat_main{
+    background: #f4faff;
+}*/
+.footer_tools{
+    position: absolute;
+    left: 235px;
+    bottom: 19px;
+}
+
+.footer_mileage_count{
+    border: 1px solid #f2f2f2;
+    padding: 5px;
+    box-shadow: 0px 2px 5px 0 rgba(0, 0, 0, 0.2), 0px 2px 7px 0 rgba(0, 0, 0, 0.19);
+    display: inline-block;
+}
+
+.footer_mileage_count>span{
+    padding: 2px 5px;
+}
+
+.footer_mileage_count>span.service_sum{
+    color: #2196F3;
+}
+
+.footer_mileage_count>span.empty_sum{
+    color: #636363;
+}
+
+.footer_mileage_count>span.destroy_sum{
+    color: #f5574b;
+}
+
+.station_to_park_link{
+    display: inline-block;
+    margin-left: 15px;
+    vertical-align: bottom;
+    font-size: 12px;
+}
+
+.station_to_park_link>a{
+    color: #607D8B;
+}
+
+#station_to_park-modal.ct-form-modal form input[type=text],
+#station_to_park-modal.ct-form-modal form select{
+    width: auto;
+}
+
+.s_2_park_form_wrap{
+    background: #fafafa;
+    border: 1px solid #e5e5e5;
+    padding: 7px 16px;
+    margin: 15px 0;
+    position: relative;
+}
+
+.s_2_park_form_wrap .ct_close{
+    position: absolute;
+    top: -12px;
+    padding: 0 4px;
+    right: -8px;
+    color: #939393;
+    border: 1px solid #f7dfdf;
+    border-radius: 25px;
+    cursor: pointer;
+}
+
+.s_2_park_form_wrap .ct_close:hover{
+    background: #e5e5e5;
+    color: #fd6e6e;
+}
+
+.s_2_park_form_wrap label{
+    color: #666;
+    font-size: 13px;
+}
+
+#station_to_park-modal.ct-form-modal form input[readonly]{
+    background: #fafafa;
+}
+
+.s_2_park_form_wrap .bottom_label{
+    margin-top: 25px;
+    display: block;
+}
+
+.s_2_park_form_wrap .bottom_label_2{
+    margin-top: 4px;
+    display: block;
+}
+
+.ct_describe{
+    font-size: 12px;
+    color: #909090;
+    font-family: FontAwesome;
+}
+
+.ct_describe:before{
+    content: "\f059";
+    margin-right: 3px;
 }
 \ No newline at end of file
@@ -481,4 +481,13 @@
 .ct-badge.ct-badge-TZRC:hover{
     background: #97a50f;
     color: #fff;
+}
+
+.ct-badge.ct-badge-LSBCTZ {
+    color: red;
+}
+
+.ct-badge.ct-badge-LSBCTZ:hover{
+    background: red;
+    color: #fff;
 }
 \ No newline at end of file
-<div class="uk-modal ct_move_modal" id="schedule-lp_change-modal">
+<div class="uk-modal" id="schedule-lp_change-modal">
     <div class="uk-modal-dialog" style="width: 1240px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
@@ -88,6 +88,7 @@
                             gb_schedule_table.updateSchedule(rst);
                             UIkit.modal('#add-sub-task-main-modal').hide();
                             $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: sch});
+                            gb_data_basic.reload_stat_park_data();
                             return;
                         }
                         var data = dataArray[i];
@@ -40,14 +40,16 @@
                     repeat_In(inf);
                     //出场子任务
                     repeat_Out(outf);
+
+                    //进场终点改变事件
+                    $f('endStation', inf).on('change', function () {
+                        $f('startStation',outf).val($(this).val()).trigger('change');
+                    });
+
                 }, 500);
-                //营运终点和进场起点改变事件
+                //营运终点改变事件
                 $f('endStation', sf).on('change', changeServiceEnd);
-                //进场终点改变事件
-                $f('endStation', inf).on('change', function () {
-                    $f('startStation',outf).val($(this).val());
-                });
                 //进场公里改变
                 $f('mileage',inf).on('input', function () {
                     $f('mileage',outf).val($(this).val());
@@ -145,11 +147,14 @@
                 }
                 if(eCode==sch.qdzCode || eCode==sch.zdzCode){
                     $f('startStation',inf).val(eCode).trigger('change');
+                    $f('type2',outf).trigger('change');
                     return;
                 }
                 //进场起点
-                $f('startStation',inf).val(eCode);
+                $f('startStation',inf).val(eCode);//.trigger('change');
+                //终点trigger change 出发重计算
+                $f('endStation',inf).trigger('change');
                 //中途进场
                 showHalfPanel(eCode);
@@ -220,7 +225,7 @@
                 var htmlStr = template('st-v2-domains-changecar-form-temp', {inOutExps: gb_common.inOutExps});
                 $('.domains', half_form).html(htmlStr);
                 $('.domains', outf).html(htmlStr);
-                half_form.css('z-index', 99).trigger('add_reason_field');
+                half_form.css('z-index', 99).formValidation('addField', 'reason').formValidation('addField', 'nbbm');
                 outf.trigger('add_reason_field');
                 //车辆 autocomplete
@@ -236,6 +241,8 @@
                 //出场终点
                 $f('endStation',outf).val($f('endStation',sf).val());
+                //出发合计公里重新计算
+                $f('mileage', half_form).trigger('input');
             }
             function disabledChangeCar() {
@@ -269,6 +276,7 @@
                             gb_schedule_table.updateSchedule(rst);
                             UIkit.modal('#add-sub-task-main-modal').hide();
                             $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: sch});
+                            gb_data_basic.reload_stat_park_data();
                             return;
                         }
                         var data = dataArray[i];
@@ -127,6 +127,14 @@
              */
             function changeTurnStation() {
                 f1.nextAll('.sub_task_form_v2').remove();
+                //掉头站点编码
+                var eCode = $('#turnStationSelect', topf).val();
+                if(!eCode){
+                    //$('.footer_mileage_count', '#add-sub-task-main-modal').trigger('refresh');
+                    $f('endStation', f1).val(sch.zdzCode).trigger('change');
+                    $('#emptyTurnCbox input')[0].checked=false;
+                    return;
+                }
                 //烂班1
                 df1 = destroyForm(disabled_form(addTaskForm()));
@@ -135,8 +143,7 @@
                 //营运2
                 f2 = disabled_form(addTaskForm());
                 $('.domains', f2).empty();
-                //掉头站点编码
-                var eCode = $('#turnStationSelect', topf).val();
+
                 //营运1终点
                 $f('endStation', f1).val(eCode).trigger('change');
@@ -155,7 +162,7 @@
                 $('[sch_id_inp]', f2).val(nextSch.id);
                 //set css
-                setCss();
+                //setCss();
                 //reason
                 changeTurnReason();
             }
@@ -180,7 +187,7 @@
                 return f;
             }
-            function setCss() {
+            /*function setCss() {
                 $('.sub_task_form_v2', wrap).each(function () {
                     if($(this).hasClass('destroy_form'))
                         return true;
@@ -190,7 +197,7 @@
                     else
                         $(this).removeClass('service_st_form');
                 });
-            }
+            }*/
             /**
              * 空驶调头
@@ -209,12 +216,14 @@
                     $f('startDate', df2).val(nextSch.dfsj);
                     $f('endDate', df2).val(nextSch.zdsj);
                     //营运2 变空驶
-                    f2.removeClass('service_st_form');
-                    $f('mileageType',f2).val('empty');
+                    //f2.removeClass('service_st_form');
+                    $f('mileageType',f2).val('empty').trigger('change');
                 }
                 else{
                     changeTurnStation();
                 }
+
+                //$f('mileage', df2).trigger('input');
             }
             //提交
@@ -245,6 +254,7 @@
                             //gb_schedule_table.addRemarks([sch, nextSch], gb_common.trim(remarks, 'g'));
                             UIkit.modal('#add-sub-task-main-modal').hide();
                             $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: sch});
+                            gb_data_basic.reload_stat_park_data();
                             return;
                         }
                         var data = dataArray[i];
@@ -20,6 +20,20 @@
                 </ul>
             </div>
         </div>
+
+        <div class="footer_tools">
+            <!-- 底部公里统计栏 -->
+            <div class="footer_mileage_count">
+                合计&nbsp;&nbsp;
+                <span class="service_sum"></span>
+                <span class="destroy_sum"></span>
+                <span class="empty_sum"></span>
+            </div>
+            <!-- 站到场 链接 -->
+            <div class="station_to_park_link">
+                <a>站 <i class="uk-icon-exchange"></i> 场</a>
+            </div>
+        </div>
     </div>
     <script id="sub-task-v2-form-temp" type="text/html">
@@ -108,7 +122,7 @@
                     <label class="uk-form-label">车辆编码</label>
                     <div class="uk-form-controls">
                         <div class="uk-autocomplete autocomplete-cars">
-                            <input type="text" name="nbbm" placeholder="车辆自编号">
+                            <input type="text" name="nbbm" placeholder="车辆自编号" required>
                         </div>
                     </div>
                 </div>
@@ -189,12 +203,15 @@
             var modal = '#add-sub-task-main-modal', sch,
                     stationRoutes,
                     parks,
-                    information;
+                    information,
+                    st_park_data;
             $(modal).on('init', function (e, data) {
                 e.stopPropagation();
                 sch = data.sch;
+                //站到场数据
+                st_park_data = gb_data_basic.get_stat_park_data()[sch.xlBm];
                 //站点路由
                 stationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(sch.xlBm).sort(function (a, b) {
                     return a.stationRouteCode - b.stationRouteCode;
@@ -230,15 +247,50 @@
             $(modal).on('change', 'input[name=destroy]', destroyClick);
             //起终点站切换事件
             $(modal).on('change', 'select[name=startStation],select[name=endStation]', reCalcInputs_station);
-            //开始时间和公里数改变
-            $(modal).on('input', 'input[name=startDate], input[name=mileage]', reCalcEndTime);
+            //开始时间改变
+            $(modal).on('input', 'input[name=startDate]', reCalcEndTime);
+            //公里数改变
+            $(modal).on('input', 'input[name=mileage]', reCalcMileageCount);
             //终点时间改变
             $(modal).on('input', 'input[name=endDate]', reCalcNext_s_time);
             //进出场原因切换
             $(modal).on('change', 'select[name=reason]', reSynchroReason);
+            //里程类型改变
+            $(modal).on('change', 'select[name=mileageType]', changeMileageType);
             //关闭
             $(modal).on('click', '.task_form_close_icon', closeTaskForm);
+            //公里合计footer
+            var re_count;
+            $('.footer_mileage_count', modal).on('refresh', function () {
+                if(re_count)
+                    return;
+                re_count = true;
+                var that=this;
+                setTimeout(function () {
+                    var fs = $('#tempScheduleContent li.uk-active form.sub_task_form_v2', modal);
+                    var s=0,e=0,d=0,mileage;
+                    $.each(fs, function () {
+                        mileage = parseFloat($f('mileage',this).val());
+                        if($(this).hasClass('destroy_form'))
+                            d = gb_common.accAdd(d, mileage);
+                        else if($(this).hasClass('service_form'))
+                            s = gb_common.accAdd(s, mileage);
+                        else if($(this).hasClass('empty_form'))
+                            e = gb_common.accAdd(e, mileage);
+                    });
+
+                    $('span',that).hide();
+                    if(s>0)
+                        $('span.service_sum',that).html('营运: ' + s).show();
+                    if(e>0)
+                        $('span.empty_sum',that).html('空驶: ' + e).show();
+                    if(d>0)
+                        $('span.destroy_sum',that).html('烂班: ' + d).show();
+                    re_count=false;
+                }, 200);
+            });
+
             /**
              * 根据班次类型切换起终点下拉框
              */
@@ -261,28 +313,28 @@
                 switch ($(this).val()) {
                     case '3'://出场
                         qdz.html(park_opts).val(information.carPark);
-                        zdz.html(opts);
-                        mType.val('empty').attr('disabled', 'disabled');
+                        zdz.html(opts).trigger('change');
+                        mType.val('empty').attr('disabled', 'disabled').trigger('change');
                         domainsTemp = 'st-v2-domains-inout-form-temp';
-                        //如果上一个form是进场
+                        /*//如果上一个form是进场
                         try {
                             var prev_f = f.prev('.sub_task_form_v2');
                             if ($f('type2', prev_f).val() == 2)
                                 zdz.val($f('startStation', prev_f).val());
                         } catch (e) {
                             console.log(e);
-                        }
+                        }*/
                         break;
                     case '2'://进场
                         qdz.html(opts)
-                        zdz.html(park_opts).val(information.carPark);
-                        mType.val('empty').attr('disabled', 'disabled');
+                        zdz.html(park_opts).val(information.carPark).trigger('change');
+                        mType.val('empty').attr('disabled', 'disabled').trigger('change');
                         domainsTemp = 'st-v2-domains-inout-form-temp';
                         break;
                     default:
                         qdz.html(opts);
-                        zdz.html(opts).val(lastCode);
-                        mType.val('service').removeAttr('disabled');
+                        zdz.html(opts).val(lastCode).trigger('change');
+                        mType.val('service').removeAttr('disabled').trigger('change');
                         domainsTemp = 'st-v2-domains-service-form-temp';
                 }
@@ -319,27 +371,37 @@
                         upDown = sch.xlDir
                 }
-                switch (upDown + '_' + type2) {
-                    case '0_3'://上行出场
-                        mileage = information.upOutMileage;
-                        time = information.upOutTimer;
-                        break;
-                    case '1_3'://下行出场
-                        mileage = information.downOutMileage;
-                        time = information.downOutTimer;
-                        break;
-                    case '0_2'://上行进场
-                        mileage = information.upInMileage;
-                        time = information.upInTimer;
-                        break;
-                    case '1_2'://下行进场
-                        mileage = information.downInMileage;
-                        time = information.downInTimer;
-                        break;
-                    default:
-                        //线路上站点间
-                        mileage = calcMileageByRoutes(stationRoutes[upDown], qdzCode, zdzCode);
-                        time = gb_common.mul(gb_common.accDiv(sch.bcsj, sch.jhlcOrig), mileage);
+                //从站到场里获取数据
+                var stp = search_st_park(f);
+                if(stp){
+                    mileage=type2==2?stp['mileage1']:stp['mileage2'];
+                    time=type2==2?stp['time1']:stp['time2'];
+                }
+                else{
+                    if(upDown==-1)
+                        return;
+                    switch (upDown + '_' + type2) {
+                        case '0_3'://上行出场
+                            mileage = information.upOutMileage;
+                            time = information.upOutTimer;
+                            break;
+                        case '1_3'://下行出场
+                            mileage = information.downOutMileage;
+                            time = information.downOutTimer;
+                            break;
+                        case '0_2'://上行进场
+                            mileage = information.upInMileage;
+                            time = information.upInTimer;
+                            break;
+                        case '1_2'://下行进场
+                            mileage = information.downInMileage;
+                            time = information.downInTimer;
+                            break;
+                        default:
+                            //线路上站点间
+                            mileage = calcMileageByRoutes(stationRoutes[upDown], qdzCode, zdzCode);
+                            time = gb_common.mul(gb_common.accDiv(sch.bcsj, sch.jhlcOrig), mileage);
+                    }
                 }
                 $f('mileage', f).val(mileage);
@@ -349,6 +411,7 @@
                 if (type2 != 1) {
                     reCalcEndTime.call(this);
                 }
+                reCalcMileageCount();
             }
             /**
@@ -363,26 +426,34 @@
                     return;
                 var time;
-                if (type2 == 1) {
-                    time = gb_common.mul(gb_common.accDiv(sch.bcsj, sch.jhlcOrig), mileage);
-                }
-                else if (type2 == 2) {
-                    //进场
-                    var qdzCode = $f('startStation', f).val(),
-                            updown = inout_updown(qdzCode, sch);
-
-                    if (updown == -1)
-                        return;
-                    time = updown == 0 ? information.upInTimer : information.downInTimer;
+                //从站到场里获取数据
+                var stp = search_st_park(f);
+                if(stp){
+                    mileage=type2==2?stp['mileage1']:stp['mileage2'];
+                    time=type2==2?stp['time1']:stp['time2'];
                 }
-                else if (type2 == 3) {
-                    //出场
-                    var zdzCode = $f('endStation', f).val(),
-                            updown = inout_updown(zdzCode, sch);
-
-                    if (updown == -1)
-                        return;
-                    time = updown == 0 ? information.upOutTimer : information.downOutTimer;
+                else{
+                    if (type2 == 1) {
+                        time = gb_common.mul(gb_common.accDiv(sch.bcsj, sch.jhlcOrig), mileage);
+                    }
+                    else if (type2 == 2) {
+                        //进场
+                        var qdzCode = $f('startStation', f).val(),
+                                updown = inout_updown(qdzCode, sch);
+
+                        if (updown == -1)
+                            return;
+                        time = updown == 0 ? information.upInTimer : information.downInTimer;
+                    }
+                    else if (type2 == 3) {
+                        //出场
+                        var zdzCode = $f('endStation', f).val(),
+                                updown = inout_updown(zdzCode, sch);
+
+                        if (updown == -1)
+                            return;
+                        time = updown == 0 ? information.upOutTimer : information.downOutTimer;
+                    }
                 }
                 var et = moment(startDate, 'HH:mm').add(time, 'minutes');
@@ -456,6 +527,16 @@
                     $('.destroy_reason_wrap', f).hide();
                     f.removeAttr('destroy').removeClass('destroy_form');
                 }
+                reCalcMileageCount();
+            }
+            
+            function changeMileageType() {
+                var f = $(this).parents('.sub_task_form_v2'),
+                        mileageType = $(this).val();
+                if (mileageType) {
+                    f.removeClass('service_form empty_form').addClass(mileageType + '_form');
+                    reCalcMileageCount();
+                }
             }
             function $f(name, f) {
@@ -464,6 +545,7 @@
             function closeTaskForm() {
                 $(this).parents('.sub_task_form_v2').remove();
+                reCalcMileageCount();
             }
             /**
@@ -480,6 +562,47 @@
                     return -1;
             }
+            function search_st_park(f) {
+                var stp;
+                var qdSelect=$f('startStation', f)[0],zdSelect=$f('endStation', f)[0];
+
+                var qdzName=qdSelect.options[qdSelect.options.selectedIndex].text,
+                        zdzName=zdSelect.options[zdSelect.options.selectedIndex].text,
+                        type2 = $f('type2', f).val();
+
+                if(type2!=2 && type2!=3)
+                    return;
+
+                $.each(st_park_data, function () {
+                    if((type2==2 && this.stationName==qdzName && this.parkName==zdzName)
+                        || (type2==3 && this.stationName==zdzName && this.parkName==qdzName)){
+                        stp = this;
+                        return false;
+                    }
+                });
+
+                return stp;
+            }
+
+            $('.left_tabs_lg', modal).on('show.uk.switcher', reCalcMileageCount);
+            
+            function reCalcMileageCount() {
+                $('.footer_mileage_count', modal).trigger('refresh');
+                var f = $(this).parents('.sub_task_form_v2');
+                if($f('type2',f).val()==1)
+                    reCalcEndTime.call(this);
+            }
+
+
+            var folder = '/real_control_v2/fragments/line_schedule/context_menu';
+            /**
+             * 弹出站 到 场对照表
+             */
+            $('.station_to_park_link', modal).on('click', function () {
+                open_modal(folder + '/utils/station_to_park.html', {
+                    sch: sch
+                }, {center: false, bgclose: false, modal: false});
+            });
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -54,8 +54,7 @@
                 </div>
                 <div class="uk-width-1-2">
                     <div class="uk-form-row">
-                        <label class="uk-form-label">驾驶员 <i class="uk-icon-question-circle" data-uk-tooltip
-                                                            title="如果有驾驶员未提示，请至后台“基础信息 -人员信息”里纠正该员工的“工种”类别 "></i></label>
+                        <label class="uk-form-label">驾驶员 </label>
                         <div class="uk-form-controls">
                             <div class="uk-autocomplete uk-form jsy-autocom">
                                 <input type="text" value="" name="jsy" required>
@@ -192,7 +191,10 @@
                 //});
                 //submit
-                var f = $('form.tzrc_form', modal).formValidation(gb_form_validation_opts);
+                var f = $('form.tzrc_form', modal).formValidation({
+                    framework: 'uikit',
+                    locale: 'zh_CN'
+                });
                 f.on('success.form.fv', function (e) {
                     e.preventDefault();
                     var param = $(this).serializeJSON();
+<div class="uk-modal ct-form-modal" id="station_to_park-modal">
+    <div class="uk-modal-dialog" style="width: 780px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>站到场历时、公里对照表</h2></div>
+
+        <div class="ct_lists">
+        </div>
+
+        <div class="ct_describe" >从历史的子任务、临加里采集进出场历时和公里</div>
+    </div>
+
+    <script id="station_park_list-temp" type="text/html">
+        {{each list as obj i}}
+            {{if obj.mileage1 != obj.mileage2}}
+                <div class="s_2_park_form_wrap" data-id="{{obj.id}}">
+                    <span class="ct_close"><i class="uk-icon-times"></i></span>
+                    <form class="uk-form">
+                        {{if obj.time1!=null && obj.mileage1!=null}}
+                        <div class="uk-grid">
+                            <div class="uk-width-1-4">
+                                <label class="">起点：</label>
+                                <input type="text" value="{{obj.stationName}}" class="uk-width-1-1" readonly>
+                            </div>
+                            <div class="uk-width-1-4">
+                                <label>终点：</label>
+                                <input type="text" value="{{obj.parkName}}" class="uk-width-1-1" readonly>
+                            </div>
+                            <div class="uk-width-2-4 uk-grid">
+                                <div class="uk-width-1-3">
+                                    <label>历时：</label>
+                                    <input type="text" value="{{obj.time1}}" class="uk-width-1-1" readonly>
+                                </div>
+                                <div class="uk-width-1-3">
+                                    <label>公里：</label>
+                                    <input type="text" value="{{obj.mileage1}}" class="uk-width-1-1" readonly>
+                                </div>
+                                <div class="uk-width-1-3">
+                                    <label class="bottom_label">进场</label>
+                                </div>
+                            </div>
+                        </div>
+                        {{/if}}
+                        {{if obj.time2!=null && obj.mileage2!=null}}
+                        <div class="uk-grid">
+                            <div class="uk-width-1-4">
+                                <input type="text" value="{{obj.parkName}}" class="uk-width-1-1" readonly>
+                            </div>
+                            <div class="uk-width-1-4">
+                                <input type="text" value="{{obj.stationName}}" class="uk-width-1-1" readonly>
+                            </div>
+                            <div class="uk-width-2-4 uk-grid">
+                                <div class="uk-width-1-3">
+                                    <input type="text" value="{{obj.time2}}" class="uk-width-1-1" readonly>
+                                </div>
+                                <div class="uk-width-1-3">
+                                    <input type="text" value="{{obj.mileage2}}" class="uk-width-1-1" readonly>
+                                </div>
+                                <div class="uk-width-1-3">
+                                    <label class="bottom_label_2">出场</label>
+                                </div>
+                            </div>
+                        </div>
+                        {{/if}}
+                    </form>
+                </div>
+            {{else}}
+                <div class="s_2_park_form_wrap" data-id="{{obj.id}}">
+                    <span class="ct_close"><i class="uk-icon-times"></i></span>
+                    <form class="uk-form">
+                        <div class="uk-grid">
+                            <div class="uk-width-1-4">
+                                <label class="">起点：</label>
+                                <input type="text" value="{{obj.stationName}}" class="uk-width-1-1" readonly>
+                            </div>
+                            <div class="uk-width-1-4">
+                                <label>终点：</label>
+                                <input type="text" value="{{obj.parkName}}" class="uk-width-1-1" readonly>
+                            </div>
+                            <div class="uk-width-2-4 uk-grid">
+                                <div class="uk-width-1-3">
+                                    <label>历时：</label>
+                                    <input type="text" value="{{obj.time1}}" class="uk-width-1-1" readonly>
+                                </div>
+                                <div class="uk-width-1-3">
+                                    <label>公里：</label>
+                                    <input type="text" value="{{obj.mileage1}}" class="uk-width-1-1" readonly>
+                                </div>
+                                <div class="uk-width-1-3">
+                                    <label class="bottom_label"><input type="checkbox" disabled checked> 进=出 </label>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            {{/if}}
+        {{/each}}
+    </script>
+
+    <script>
+        (function () {
+            var modal = '#station_to_park-modal', sch;
+
+            $(modal).on('init', function (e, data) {
+                e.stopPropagation();
+                sch = data.sch;
+
+                var list = gb_data_basic.get_stat_park_data()[sch.xlBm];
+                list.sort(function (a, b) {
+                    return a.stationName.localeCompare(b.stationName);
+                });
+
+                var htmlStr = template('station_park_list-temp', {list: list});
+                $('.ct_lists', modal).html(htmlStr);
+            });
+
+            $(modal).on('click', '.s_2_park_form_wrap>.ct_close', function () {
+                var wrap=$(this).parent(),
+                        id=wrap.data('id');
+
+                gb_common.$post('/basic/deleteStation2Park', {lineCode: sch.xlBm, id: id}, function () {
+                    gb_data_basic.reload_stat_park_data();
+                    wrap.remove();
+                });
+            });
+        })();
+    </script>
+</div>
@@ -35,6 +35,22 @@
                     <div class="uk-autocomplete uk-form autocomplete-jsy">
                         <input type="text" name="jGh" placeholder="驾驶员">
                     </div>
+                    &nbsp;
+                    <span class="horizontal-field">修正类型</span>
+                    <select name="type">
+                        <option value="">全部</option>
+                        <option value="DFTZ">待发调整</option>
+                        <option value="SFTZ">实发调整</option>
+                        <option value="FCXXWT">发车信息微调</option>
+                        <option value="TZRC">调整人车</option>
+                        <option value="JHLB">计划烂班</option>
+                        <option value="CXLB">撤销烂班</option>
+                        <option value="CXSF">撤销实发</option>
+                        <option value="CXZX">撤销执行</option>
+                        <option value="LPDD">路牌对调</option>
+                        <option value="ZRW">添加子任务</option>
+                        <option value="LSBCTZ">历史班次调整</option>
+                    </select>
                     <button class="uk-button">检索</button>
                     <label style="float: right;font-size: 12px;color: #989797;">
@@ -122,6 +138,19 @@
         </div>
     </script>
+    <!-- 历史班次调整 tip -->
+    <script id="edit-info-tip-lsbctz-temp" type="text/html">
+        <div class="edit-info-tip">
+            {{each jsonArray as obj i}}
+            <p class="text">{{obj.title}} 由 {{obj.old==null?'无':obj.old}} 调整为 {{obj.now}}</p>
+            {{/each}}
+            <p class="sub_text">调整人：{{user}} 调整时间：{{ts_str}}</p>
+            {{if remarks!=null && remarks != ''}}
+            <p class="sub_text">备注：{{remarks}}</p>
+            {{/if}}
+        </div>
+    </script>
+
     <!-- 撤销实发tip -->
     <script id="edit-info-tip-cxsf-temp" type="text/html">
         <div class="edit-info-tip">
@@ -248,6 +277,7 @@
                     $.each(rs.list, function () {
                         this.jsonArray = JSON.parse(this.jsonArray);
                         etInfos[this.id] = this;
+                        this['ts_str'] = moment(this.ts).format('YYYY-MM-DD HH:mm');
                         nbbmArray.push({value: this.clZbh});
                         jsyArray.push({value: this.jGh+'/'+this.jName,
@@ -365,7 +395,7 @@
                 return gb_common.get_vals(rs);
             }
-            var types = {'DFTZ': '待发调整', 'FCXXWT':'发车信息微调', 'JHLB': '计划烂班', 'CXLB': '撤销烂班', 'CXZX': '撤销执行', 'CXSF': '撤销实发', 'SFTZ': '实发调整', 'TZRC': '调整人车'};
+            var types = {'DFTZ': '待发调整', 'FCXXWT':'发车信息微调', 'JHLB': '计划烂班', 'CXLB': '撤销烂班', 'CXZX': '撤销执行', 'CXSF': '撤销实发', 'SFTZ': '实发调整', 'TZRC': '调整人车', 'LSBCTZ':'历史班次调整'};
             function subData(data){
                 return {
                     id: data.id,
@@ -535,6 +565,26 @@
             });
+            //发车信息微调tip
+            $(modal).on('mouseenter', '.ct-badge.ct-badge-LSBCTZ', function() {
+                $(this).qtip({
+                    show: _opts.show,
+                    content: {
+                        title: '发车信息微调',
+                        text: function() {
+                            var obj = etInfos[$(this).data('id')];
+                            return template('edit-info-tip-lsbctz-temp', obj);
+                        }
+                    },
+                    position: _opts.position,
+                    style: {
+                        classes: 'qtip-blue qtip-rounded qtip-shadow sch-badge-tip'
+                    },
+                    hide: _opts.hide,
+                    events: _opts.events
+                });
+            });
+
             function sortFun(a, b) {
                 return (a.realExecDate + a.fcsj).localeCompare(b.realExecDate + b.fcsj);
             }
@@ -75,6 +75,9 @@ var gb_data_basic = (function () {
     var carparks = {};
     //停车场数据
     gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
+        rs.list.sort(function (a, b) {
+           return a.parkName.localeCompare(b.parkName);
+        });
         $.each(rs.list, function () {
             carparks[this.parkCode] = this;
         });
@@ -116,6 +119,15 @@ var gb_data_basic = (function () {
         ep.emit('svg_attrs', data);
     });
+    //站点和停车场历时、公里对照数据
+    var stat_park_data;
+    var load_stat_park_data = function () {
+        $.get('/basic/station2ParkData?t='+Math.random(), {idx: line_idx}, function (rs) {
+            stat_park_data = rs;
+        });
+    }
+    load_stat_park_data();
+
     function findLineByCodes(codeArr) {
         var rs = [];
         $.each(codeArr, function () {
@@ -239,6 +251,12 @@ var gb_data_basic = (function () {
         },
         remarksMapps: function () {
             return remarksMapps;
+        },
+        get_stat_park_data: function () {
+            return stat_park_data;
+        },
+        reload_stat_park_data: function () {
+            load_stat_park_data();
         }
     };
 })();