Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents 8722f91c 4e2bb969
Showing 73 changed files with 2564 additions and 546 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/ChildTaskPlanController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/controller/realcontrol/summary/TempSchSituationController.java
src/main/java/com/bsth/data/gpsdata_v2/GpsRealData.java
src/main/java/com/bsth/data/gpsdata_v2/cache/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata_v2/entity/GpsEntity.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/data/line_version/EnableRouteVersionHandler.java
src/main/java/com/bsth/data/line_version/thread/FixedEnableVerionsThread.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/data/summary/entity/TempSchSituation.java
src/main/java/com/bsth/data/summary/repository/TempSchSituationRepository.java
src/main/java/com/bsth/data/summary/service/TempSchSituationService.java
src/main/java/com/bsth/data/summary/service/impl/DestroySituationServiceImpl.java
@@ -38,6 +38,7 @@ public class Constants {
 	public static final String SESSION_USERNAME = "sessionUserName";
 	public static final String COMPANY_AUTHORITYS = "cmyAuths";
+	public static final String STATION_AND_SECTION_COUNT = "/station/updateStationAndSectionCode";
 	/**
 	 * 解除调度指令和班次的外键约束
@@ -212,5 +212,15 @@ public class GpsController {
 		map.put("pageData","10");
 		return gpsService.Pagequery(map);
 	}
+
+    /**
+     * 获取线路下所有车辆，包括实时设备 和 计划排班
+     * @param lineCode
+     * @return
+     */
+    @RequestMapping(value = "/allCarsByLine",method = RequestMethod.GET)
+	public Map<String, Object> allCarsByLine(String lineCode){
+        return gpsService.allCarsByLine(lineCode);
+    }
 }
@@ -27,4 +27,9 @@ public class ChildTaskPlanController extends BaseController&lt;ChildTaskPlan, Long&gt;
     public Map<String, Object> delHistory(@PathVariable("id") Long id){
         return childTaskPlanService.delHistory(id);
     }
+
+    @RequestMapping(value = "update", method = RequestMethod.POST)
+    public Map<String, Object> update(ChildTaskPlan childTask){
+        return childTaskPlanService.update(childTask);
+    }
 }
@@ -63,7 +63,9 @@ public class ServiceDataInterface {
             map = new HashMap<>();
             map.put("clZbh", sch.getClZbh());
             map.put("jGh", sch.getjGh());
+            map.put("jName", sch.getjGh());
             map.put("sGh", sch.getsGh());
+            map.put("sName", sch.getsGh());
             map.put("lpName", sch.getLpName());
             map.put("xlBm", sch.getXlBm());
             map.put("xlName", sch.getXlName());
+package com.bsth.controller.realcontrol.summary;
+
+import com.bsth.controller.BaseController;
+import com.bsth.data.summary.entity.TempSchSituation;
+import com.bsth.data.summary.service.TempSchSituationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@RestController
+@RequestMapping("/summary/temp_sch")
+public class TempSchSituationController extends BaseController<TempSchSituation, Long> {
+
+    @Autowired
+    TempSchSituationService tempSchSituationService;
+
+    @RequestMapping("excel")
+    public void excel(@RequestParam Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
+        tempSchSituationService.excel(map, request, response);
+    }
+}
@@ -123,7 +123,13 @@ public class GpsRealData {
      * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
      */
     public List<GpsEntity> getByLine(String lineCode) {
-        NavigableSet<String> set = lineCode2Devices.get(lineCode);
+        NavigableSet<String> set = lineCode2Devices.get(lineCode);//实际车载
+        Set<String> nbbmSet = dayOfSchedule.findCarByLineCode(lineCode);//计划用车
+
+        Map<String, String> nbbm2deviceMap = BasicData.deviceId2NbbmMap.inverse();
+        for(String nbbm : nbbmSet){
+            set.add(nbbm2deviceMap.get(nbbm));
+        }
         List<GpsEntity> rs = new ArrayList<>();
         GpsEntity gps;
@@ -135,14 +141,28 @@ public class GpsRealData {
                 continue;
             sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
-            if (null != sch)
+            if (null != sch){
                 gps.setSchId(sch.getId());
+                if(!sch.getXlBm().equals(lineCode)){
+                    //车辆在其他线路营运
+                    gps.setRemark("执行 " + sch.getXlName() + " " + sch.getDfsj() + " 班次");
+                    gps.setPlanCode(sch.getXlBm());
+                }
+                else
+                    gps.setRemark(null);
+            }else
+                gps.setRemark(null);
+
             rs.add(gps);
         }
         return rs;
     }
+    public static Set<String> findDevices(String lineCode){
+        return lineCode2Devices.get(lineCode);
+    }
+
     public List<GpsEntity> get(List<String> pArray) {
         List<GpsEntity> list = new ArrayList<>();
@@ -139,7 +139,7 @@ public class GeoCacheData {
     private void loadTccMapData(){
         //加载停车场数据
-        String sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null";
+        String sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null and destroy=0";
         List<Map<String, Object>> tccList = jdbcTemplate.queryForList(sql);
         Map<String, Polygon> tccTempMap = new HashMap<>();
@@ -100,6 +100,9 @@ public class GpsEntity implements Cloneable{
 	 */
 	private int source = -1;
+	private String remark;
+	private String planCode;
+
 	public Object clone() {
 		try {
 			return super.clone();
@@ -360,4 +363,20 @@ public class GpsEntity implements Cloneable{
 	public void setPremiseCode(String premiseCode) {
 		this.premiseCode = premiseCode;
 	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getPlanCode() {
+		return planCode;
+	}
+
+	public void setPlanCode(String planCode) {
+		this.planCode = planCode;
+	}
 }
@@ -159,7 +159,7 @@ public class InStationProcess {
         logger.info("车辆：" + nbbm + " 班次：" + sch.getDfsj() + "到终点， 时间：" + sch.getZdsjActual());
         //清除车辆误点调整监听
-        LateAdjustHandle.remove(nbbm);
+        LateAdjustHandle.remove(sch);
         //将gps转换成下一个班次走向的站内信号（应对只有一个站内信号 即 发出时）
         transformUpDown(gps, next);
@@ -113,7 +113,7 @@ public class OutStationProcess {
             dayOfSchedule.save(sch);
             //清理应发未发标记
-            LateAdjustHandle.remove(sch.getClZbh());
+            LateAdjustHandle.remove(sch);
             //发车的时候，同步一下状态
             if (!gps.isService() && !dayOfSchedule.emptyService(sch))
@@ -59,6 +59,25 @@ public class EnableRouteVersionHandler {
         }
     }
+    public void sync(String lineCode, int version){
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+
+        try{
+            enableStation(lineCode, version);
+            enableRoad(lineCode, version);
+
+            tran.commit(status);
+        }catch (Exception e){
+            tran.rollback(status);
+            logger.error("", e);
+        }
+    }
+
     /**
      * 启用新版本站点
      * @param lineCode
@@ -14,7 +14,7 @@ import java.util.Map;
  * Created by panzhao on 2017/12/28.
  */
 @Component
-public class FixedEnableVerionsThread extends Thread{
+public class FixedEnableVerionsThread extends Thread {
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -26,24 +26,39 @@ public class FixedEnableVerionsThread extends Thread{
     @Override
     public void run() {
-        try{
+        try {
             String sql = "select * from bsth_c_line_versions where status=2 and start_date<=SYSDATE()";
             List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
-            if(list.size() == 0)
-                return;
+            if (list.size() > 0) {
+                String lineCode;
+                int version;
-            String lineCode;
-            int version;
+                for (Map<String, Object> map : list) {
+                    lineCode = map.get("line_code").toString();
+                    version = Integer.parseInt(map.get("versions").toString());
-            for(Map<String, Object> map : list){
-                lineCode = map.get("line_code").toString();
-                version = Integer.parseInt(map.get("versions").toString());
+                    enableRouteVersionHandler.enable(lineCode, version);
+                }
+            }
+
+
+            //自动同步当前启用版本
+            long t = System.currentTimeMillis();
+            List<String> syncs = jdbcTemplate.queryForList("SELECT CONCAT(line_code,'_',versions) FROM bsth_c_line_versions WHERE STATUS = 1 AND CONCAT(line_code, '_', versions) IN (SELECT CONCAT(line_code, '_', version) FROM logger_route_synchro where t < " + t + ")", String.class);
-                enableRouteVersionHandler.enable(lineCode, version);
+            String[] ks;
+            for (String keys : syncs) {
+                ks = keys.split("_");
+
+                enableRouteVersionHandler.sync(ks[0], Integer.parseInt(ks[1]));
+
+                logger.info("同步线路 " + ks[0] + " 版本：" + ks[1]);
             }
-        }catch (Exception e){
+
+            jdbcTemplate.update("delete from logger_route_synchro where t < " + t);
+        } catch (Exception e) {
             logger.error("", e);
         }
     }
@@ -20,9 +20,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 /**
@@ -55,10 +53,16 @@ public class PilotReport {
     private static ConcurrentHashMap<Integer, D80> d80Maps;
+    /**
+     * 设备 ——> 最后一条请求出场记录
+     */
+    public static ConcurrentHashMap<String, D80> qqccMap;
+
     Logger logger = LoggerFactory.getLogger(PilotReport.class);
     static {
         d80Maps = new ConcurrentHashMap<>();
+        qqccMap = new ConcurrentHashMap<>();
     }
     public void report(D80 d80) {
@@ -81,6 +85,7 @@ public class PilotReport {
             switch (d80.getData().getRequestCode()) {
                 //出场请求
                 case 0xA3:
+                    qqccMap.put(d80.getDeviceId(), d80);
                     ScheduleRealInfo outSch = dayOfSchedule.searchNearByBcType(nbbm, "out");
                     //如果有对应出场班次
                     if (outSch != null && StringUtils.isEmpty(outSch.getFcsjActual())) {
@@ -241,6 +246,7 @@ public class PilotReport {
         List<D80> rems = findByLine(lineCode);
         for (D80 d80 : rems) {
             d80Maps.remove(d80.getId());
+            qqccMap.remove(d80.getDeviceId());
         }
         rems.clear();
@@ -15,6 +15,7 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.HashMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -55,6 +56,9 @@ public class DayOfSchedule {
     // 按车辆分组的班次数据
     private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
+    //按线路分组计划用车
+    private static HashMultimap<String, String> lineNbbmsMap;
+
     //按路牌分组的班次数据 线路编码_路牌名称 ——> 班次list
     private static ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap;
@@ -199,6 +203,8 @@ public class DayOfSchedule {
                 reCalcExecPlan(nbbm);
             }
+            //分组计划用车
+            reCalcLineNbbms();
             // 页面 翻班通知
             //sendUtils.shiftSchedule(lineCode);
         } catch (Exception e) {
@@ -543,15 +549,15 @@ public class DayOfSchedule {
      * @Description: TODO(线路下运营的车辆)
      */
     public Set<String> findCarByLineCode(String lineCode) {
-        Set<String> rs = new HashSet<>();
+        /*Set<String> rs = new HashSet<>();
         Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
         for (ScheduleRealInfo sch : schs) {
             if (sch.getXlBm().equals(lineCode))
                 rs.add(sch.getClZbh());
         }
-
-        return rs;
+*/
+        return lineNbbmsMap.get(lineCode);
     }
     public List<ScheduleRealInfo> findByNbbm(String nbbm) {
@@ -908,6 +914,8 @@ public class DayOfSchedule {
         //重新计算车辆当前执行班次
         reCalcExecPlan(newClZbh);
         reCalcExecPlan(sch.getClZbh());
+        //重新分组计划用车
+        reCalcLineNbbms();
         return ups;
     }
@@ -970,7 +978,6 @@ public class DayOfSchedule {
                 //删除班次数据
                 removeRealSch(lineCode, rq);
-                //删除相关班次修正记录
             }
             rs.put("status", ResponseCode.SUCCESS);
@@ -1083,6 +1090,20 @@ public class DayOfSchedule {
         return id2SchedulMap.size();
     }
+    /**
+     * 重新计算线路计划用车
+     */
+    public void reCalcLineNbbms(){
+        HashMultimap<String, String> multimap = HashMultimap.create();
+
+        Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+        for (ScheduleRealInfo sch : schs) {
+            multimap.put(sch.getXlBm(), sch.getClZbh());
+        }
+
+        lineNbbmsMap = multimap;
+    }
+
     public String sizeString(){
         return id2SchedulMap.size() + "/" + nbbmScheduleMap.size();
     }
@@ -117,7 +117,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
         }
     }
-    public static void remove(String nbbm){
+/*    public static void remove(String nbbm){
         if(lateSchMap.containsKey(nbbm)){
             ScheduleRealInfo sch = lateSchMap.get(nbbm);
             sch.setLate2(false);
@@ -127,7 +127,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
             lateSchMap.remove(nbbm);
             logger.info("移除误点调整 nbbm -" + nbbm);
         }
-    }
+    }*/
     /**
      * 车辆到站
@@ -74,14 +74,6 @@ public class ScheduleRefreshThread extends Thread{
 						//重载排班数据
 						dayOfSchedule.reloadSch(lineCode, currSchDate, false);
 						logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
-
-
-						//校验一下数据库和缓存的数据
-						/*int dbCount = dayOfSchedule.dbCount(lineCode, currSchDate);
-						logger.info(lineCode + " 数据库数量：" + dbCount);
-						if(dbCount != dayOfSchedule.findByLineCode(lineCode).size()){
-							logger.error("异常异常异常，，数据库和缓存数量不一致，" + lineCode);
-						}*/
 					}
 				}catch (Exception e){
 					logger.error("班次更新失败！！ -" + lineCode, e);
+package com.bsth.data.summary.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 临加情况
+ * Created by panzhao on 2017/10/31.
+ */
+@Entity
+@Table(name = "z_calc_temp_detail")
+public class TempSchSituation {
+
+    @Id
+    private Long id;
+
+    private String rq;
+
+    private String gsBm;
+
+    private String fgsBm;
+
+    private String lineCode;
+
+    private String lineName;
+
+    private String nbbm;
+
+    private String jGh;
+
+    private String sGh;
+
+    private String reason;
+
+    private int size;
+
+    private Double mileage;
+
+    private Long t;
+
+    private String remark;
+
+    private String idsStr;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public Double getMileage() {
+        return mileage;
+    }
+
+    public void setMileage(Double mileage) {
+        this.mileage = mileage;
+    }
+
+    public Long getT() {
+        return t;
+    }
+
+    public void setT(Long t) {
+        this.t = t;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getIdsStr() {
+        return idsStr;
+    }
+
+    public void setIdsStr(String idsStr) {
+        this.idsStr = idsStr;
+    }
+
+    public String getGsBm() {
+        return gsBm;
+    }
+
+    public void setGsBm(String gsBm) {
+        this.gsBm = gsBm;
+    }
+
+    public String getFgsBm() {
+        return fgsBm;
+    }
+
+    public void setFgsBm(String fgsBm) {
+        this.fgsBm = fgsBm;
+    }
+}
+package com.bsth.data.summary.repository;
+
+import com.bsth.data.summary.entity.TempSchSituation;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@Repository
+public interface TempSchSituationRepository extends BaseRepository<TempSchSituation, Long> {
+}
+package com.bsth.data.summary.service;
+
+import com.bsth.data.summary.entity.TempSchSituation;
+import com.bsth.service.BaseService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+public interface TempSchSituationService extends BaseService<TempSchSituation, Long> {
+    void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response);
+}
 \ No newline at end of file
@@ -118,7 +118,7 @@ public class DestroySituationServiceImpl extends BaseServiceImpl&lt;DestroySituatio
                 row.createCell(9).setCellValue(dys.getRemark());
             }
-            String name = list.get(0).getLineName();
+            String name = "";//list.get(0).getLineName();
             wb.setSheetName(0, name + "烂班明细");
             //response 输出
             String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "烂班明细情况.xls";
+package com.bsth.data.summary.service.impl;
+
+import com.bsth.data.summary.entity.TempSchSituation;
+import com.bsth.data.summary.service.TempSchSituationService;
+import com.bsth.data.utils.CustomStringUtils;
+import com.bsth.service.impl.BaseServiceImpl;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@Service
+public class TempSchSituationServiceImpl extends BaseServiceImpl<TempSchSituation, Long> implements TempSchSituationService {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public Iterable<TempSchSituation> list(Map<String, Object> map) {
+        List<TempSchSituation> list = (List<TempSchSituation>) super.list(map);
+
+        //排序
+        Collections.sort(list, new Comparator<TempSchSituation>() {
+            @Override
+            public int compare(TempSchSituation o1, TempSchSituation o2) {
+                int i = o1.getRq().compareTo(o2.getRq());
+                if(i != 0)
+                    return i;
+
+                i = o1.getLineName().compareTo(o2.getLineName());
+                if(i != 0)
+                    return i;
+
+                i = (int) (o1.getT() - o2.getT());
+                if(i != 0)
+                    return i;
+
+                i = o1.getReason().compareTo(o2.getReason());
+
+                return i;
+            }
+        });
+        return list;
+    }
+
+    @Override
+    public void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
+        try {
+            map.put("rq_le", CustomStringUtils.maxEndTime(map.get("rq_ge").toString()
+                    , map.get("rq_le").toString(), 62));
+
+            List<TempSchSituation> list = (List<TempSchSituation>) super.list(map);
+
+            if(list.size() == 0){
+                response.setHeader("Content-type", "text/html;charset=UTF-8");
+                response.getWriter().print("<span style='color:red;font-size:24px;'>根据查询条件没有搜索到数据，别导了！</span>");
+                return ;
+            }
+
+            //排序
+            Collections.sort(list, new Comparator<TempSchSituation>() {
+                @Override
+                public int compare(TempSchSituation o1, TempSchSituation o2) {
+                    int i = o1.getRq().compareTo(o2.getRq());
+                    if(i != 0)
+                        return i;
+
+                    i = o1.getLineName().compareTo(o2.getLineName());
+                    if(i != 0)
+                        return i;
+
+                    i = (int) (o1.getT() - o2.getT());
+                    if(i != 0)
+                        return i;
+
+                    i = o1.getReason().compareTo(o2.getReason());
+
+                    return i;
+                }
+            });
+
+            //输出excel
+            String basePath = Thread.currentThread().getContextClassLoader().getResource("").getPath();
+            String filePath = basePath + "/static/pages/summary/excel/临加明细情况.xls";
+            POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filePath));
+            HSSFWorkbook wb = new HSSFWorkbook(fs);
+
+            //写入数据
+            Sheet sheet = wb.getSheetAt(0);
+            Row row;
+            TempSchSituation tss;
+            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+            for(int i = 0; i < list.size(); i++){
+                tss = list.get(i);
+                row = sheet.createRow(i + 1);
+                row.createCell(0).setCellValue(tss.getRq());
+                row.createCell(1).setCellValue(tss.getLineName());
+                row.createCell(2).setCellValue(tss.getNbbm());
+                row.createCell(3).setCellValue(tss.getjGh());
+                row.createCell(4).setCellValue(tss.getsGh());
+                row.createCell(5).setCellValue(tss.getSize());
+                row.createCell(6).setCellValue(tss.getMileage());
+                row.createCell(7).setCellValue(sdf.format(new Date(tss.getT())));
+                row.createCell(8).setCellValue(tss.getRemark());
+            }
+
+            String name = "";//list.get(0).getLineName();
+            wb.setSheetName(0, name + "临加明细");
+            //response 输出
+            String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "临加明细情况.xls";
+            response.setContentType("application/x-msdownload");
+            response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
+
+            OutputStream os = response.getOutputStream();
+            wb.write(os);
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+}
 \ No newline at end of file
@@ -17,7 +17,7 @@ public abstract class BaseFilter implements Filter {
 	 * 白名单
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT };
 	@Override
 	public void destroy() {
@@ -36,7 +36,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) throws Exception {
         // 白名单
         web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL);
+                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT);
     }
     @Override
@@ -33,7 +33,7 @@ public class LoginInterceptor implements Filter {
 	 * 相比于 BaseFilter，此处对线调GPS请求进行了拦截验证
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT };
 	@Override
@@ -174,14 +174,17 @@ public class GeoDataServiceImpl implements GeoDataService {
             int id = Integer.parseInt(map.get("id").toString());
             String name = map.get("stationName").toString();
             String code = map.get("stationCode").toString();
-            //String lineCode = map.get("lineCode").toString();
-            //String stationMark = map.get("stationMark").toString();
+            String lineCode = map.get("lineCode").toString();
+            String versions = map.get("versions").toString();
             //更新历史站点路由
             jdbcTemplate.update("update bsth_c_ls_stationroute set station_name=? where id=?", name, id);
             //更新站点
             jdbcTemplate.update("update bsth_c_station set station_name=? where station_cod=?", name, code);
+            //写一条走向变更记录
+            jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), lineCode, versions);
+
             tran.commit(status);
             rs.put("station", findOne(id));
@@ -279,6 +282,10 @@ public class GeoDataServiceImpl implements GeoDataService {
                         }
                     });
+
+            //写一条走向变更记录
+            jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), lineCode, versions);
+
             tran.commit(status);
             //返回更新之后的数据
@@ -765,6 +772,9 @@ public class GeoDataServiceImpl implements GeoDataService {
                         }
                     });
+            //写一条走向变更记录
+            jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), lineCode, versions);
+
             tran.commit(status);
             //返回更新之后的数据
@@ -874,6 +884,9 @@ public class GeoDataServiceImpl implements GeoDataService {
                         }
                     });
+            //写一条走向变更记录
+            jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), station.getLineCode(), station.getVersions());
+
             tran.commit(status);
             //返回更新之后的数据
@@ -897,6 +910,9 @@ public class GeoDataServiceImpl implements GeoDataService {
             String sql = "update bsth_c_ls_sectionroute set destroy=1 where id=?";
             jdbcTemplate.update(sql, road.getId());
+            //写一条走向变更记录
+            jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), road.getLineCode(), road.getVersions());
+
             //返回更新之后的数据
             List<GeoRoad> list = findRoadByUpdown(road.getLineCode(), road.getDirections(), road.getVersions());
             rs.put("list", list);
@@ -45,4 +45,6 @@ public interface GpsService {
 			String enddate) throws ParseException;
 	Map<String, Object> Pagequery(Map<String, Object> map);
+
+    Map<String,Object> allCarsByLine(String lineCode);
 }
@@ -7,15 +7,16 @@ import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.utils.GeoUtils;
+import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.safe_driv.SafeDriv;
 import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.gps.entity.*;
-import com.bsth.util.DateUtils;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
@@ -32,6 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -164,56 +166,134 @@ public class GpsServiceImpl implements GpsService {
         return (byte) (((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
     }
+    private static DateTimeFormatter fmtyyyy = DateTimeFormat.forPattern("yyyy");
     @Override
     public List<Map<String, Object>> history(String[] nbbmArray, Long st, Long et) {
         List<Map<String, Object>> list = new ArrayList<>();
-        // 超过最大查询范围，直接忽略
         if (et - st > GPS_RANGE)
             return list;
-        // 车辆编码转换成设备号
-        String[] devices = new String[nbbmArray.length];
-        for (int i = 0; i < nbbmArray.length; i++) {
-            devices[i] = BasicData.deviceId2NbbmMap.inverse().get(nbbmArray[i]);
-        }
-        // day_of_year
+        st = st * 1000;
+        et = et * 1000;
+        // day_of_year 分区字段
         Calendar sCal = Calendar.getInstance();
-        sCal.setTime(new Date(st * 1000));
-        int sDayOfYear = sCal.get(Calendar.DAY_OF_YEAR)/* 200 */;
-
+        sCal.setTime(new Date(st));
+        int sDayOfYear = sCal.get(Calendar.DAY_OF_YEAR);
         Calendar eCal = Calendar.getInstance();
-        eCal.setTime(new Date(et * 1000));
-        int eDayOfYear = eCal.get(Calendar.DAY_OF_YEAR)/* 200 */;
+        eCal.setTime(new Date(et));
+        int eDayOfYear = eCal.get(Calendar.DAY_OF_YEAR);
-        Calendar weekCal = Calendar.getInstance();
+        String nbbm = nbbmArray[0];
-        // 如果是同一天
-        if (sDayOfYear == eDayOfYear) {
-            weekCal.setTimeInMillis(st * 1000);
-            list = findByTs(weekCal.get(Calendar.WEEK_OF_YEAR), sDayOfYear, st, et, devices);
-        } else {
-            // 跨天
-            Long tempSt = 0L, tempEt = 0L;
-            for (int i = sDayOfYear; i <= eDayOfYear; i++) {
-
-                if (i == sDayOfYear) {
-                    tempSt = st;
-                    tempEt = DateUtils.getTimesnight(sCal);
-                } else if (i == eDayOfYear) {
-                    tempSt = DateUtils.getTimesmorning(sCal);
-                    tempEt = et;
-                } else {
-                    tempSt = DateUtils.getTimesmorning(sCal);
-                    tempEt = DateUtils.getTimesnight(sCal);
-                }
+        List<DeviceChange> dcs = findDeviceChangeLogs(nbbm, et, st);
+        //没有设备变更记录，则参考车辆信息上的设备号
+        if(null == dcs || dcs.size() == 0){
+            DeviceChange dc = new DeviceChange();
+            dc.setNbbm(nbbm);
+            dc.setDevice(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
+            dc.setSt(st);
+            dc.setEt(et);
-                weekCal.setTimeInMillis(tempSt * 1000);
-                list.addAll(findByTs(weekCal.get(Calendar.WEEK_OF_YEAR), i, tempSt, tempEt, devices));
-                // 加一天
-                sCal.add(Calendar.DATE, 1);
-            }
+            dcs.add(dc);
         }
+        //bsth_c_gps_info
+        String tableName = "bsth_c_gps_info";
+        String sYear = fmtyyyy.print(st),
+            currYear = fmtyyyy.print(System.currentTimeMillis());
+
+        if(!sYear.equals(currYear))
+            tableName += "_" + sYear;
+
+        StringBuilder sql = new StringBuilder("");
+        long t1,t2;
+        DeviceChange dc;
+        for(int i = 0,len=dcs.size(); i < len; i++){
+            t1 = st;
+            t2 = et;
+            dc = dcs.get(i);
+            if(dc.getSt() > st)
+                t1 = dc.getSt();
+            if(dc.getEt() < et)
+                t2 = dc.getEt();
+
+            sql.append("select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO,DIRECTION,LINE_ID,SPEED_GPS,SECTION_CODE from "+tableName+" where days_year in ("+sDayOfYear+","+eDayOfYear+") " +
+                    " and device_id='"+dc.getDevice()+"' and ts > "+t1+" and ts < "+t2+" ");
+
+            if(i == len - 1)
+                sql.append(" ORDER BY device_id,ts,stop_no");
+            else
+                sql.append(" UNION");
+        }
+
+        logger.info("轨迹回放 nbbm: " + nbbm + " -st: " + st + " -et: " + et + " -sql: " + sql.toString());
+
+        // 查询到离站数据
+        Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(st, et, dcs);
+
+        //查询GPS数据
+        JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource());
+        List<Map<String, Object>> dataList = jdbcTemplate_ms.queryForList(sql.toString());
+
+        Float lon, lat;
+        Location bdLoc, gdLoc;
+        int inOutStop;
+        long serviceState;
+        ArrivalEntity arrival;
+
+        Map<String, Object> map = null;
+        for(Map<String, Object> rs : dataList){
+            serviceState = map_get_long(rs, "SERVICE_STATE");
+
+            if(getGpsValid(serviceState) == 1)
+                continue;
+
+            map = new HashMap<>();
+            if(getGpsValid(serviceState) == 1)
+                continue;
+
+            map = new HashMap<>();
+
+            lon = map_get_float(rs, "LON");
+            lat = map_get_float(rs, "LAT");
+            // 高德坐标
+            gdLoc = TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(lon, lat));
+            map.put("gcj_lon", gdLoc.getLng());
+            map.put("gcj_lat", gdLoc.getLat());
+            // 百度坐标
+            bdLoc = TransGPS.bd_encrypt(gdLoc);
+            map.put("bd_lon", bdLoc.getLng());
+            map.put("bd_lat", bdLoc.getLat());
+            //原始坐标
+            map.put("lon", lon);
+            map.put("lat", lat);
+
+            map.put("deviceId", map_get_str(rs, "DEVICE_ID"));
+            map.put("ts", map_get_long(rs, "TS"));
+            map.put("timestamp", map_get_long(rs, "TS"));
+            map.put("stopNo", map_get_str(rs, "STOP_NO"));
+            map.put("direction", map_get_float(rs,"DIRECTION"));
+
+            map.put("lineId", map_get_str(rs, "LINE_ID"));
+            map.put("speed", map_get_float(rs,"SPEED_GPS"));
+
+            inOutStop = Integer.parseInt(rs.get("INOUT_STOP").toString());
+            map.put("inout_stop", inOutStop);
+
+            arrival = arrivalMap.get(map_get_str(rs, "DEVICE_ID") + "_" + map_get_long(rs, "TS"));
+            if (arrival != null) {
+                map.put("inout_stop_info", arrival);
+                map.put("inout_stop", arrival.getInOut());
+            }
+
+            map.put("nbbm", BasicData.deviceId2NbbmMap.get(map_get_str(rs,"DEVICE_ID")));
+            map.put("state", getService(serviceState));
+            // 上下行
+            map.put("upDown", getUpOrDown(serviceState));
+            //路段编码
+            map.put("section_code", map_get_str(rs,"SECTION_CODE"));
+            list.add(map);
+        }
         // 按时间排序
         Collections.sort(list, new Comparator<Map<String, Object>>() {
@@ -225,132 +305,97 @@ public class GpsServiceImpl implements GpsService {
         return list;
     }
-    public List<Map<String, Object>> findByTs(int weekOfYear, int dayOfYear, Long st, Long et, String[] devices) {
-        List<Map<String, Object>> list = new ArrayList<>();
-        Map<String, Object> map = null;
-
-        // 直接拼 in 语句
-        String inv = "";
-        for (String device : devices)
-            inv += ("'" + device + "',");
-        inv = inv.substring(0, inv.length() - 1);
-
-        // 查询到离站数据
-        Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear, st, et, inv);
-
-        String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO,DIRECTION,LINE_ID,SPEED_GPS,SECTION_CODE from bsth_c_gps_info where days_year=? and device_id in ("
-                + inv + ") and ts > ? and ts < ? ORDER BY device_id,ts,stop_no";
-        try {
-            conn = DBUtils_MS.getConnection();
-            ps = conn.prepareStatement(sql);
-            ps.setInt(1, dayOfYear);
-            /* ps.setArray(2, conn.createArrayOf("VARCHAR", devices)); */
-            ps.setLong(2, st * 1000);
-            ps.setLong(3, et * 1000);
+    private String map_get_str(Map<String, Object> map, String key){
+        return map.containsKey(key)?map.get(key).toString():"";
+    }
-            rs = ps.executeQuery();
-            Float lon, lat;
-            Location bdLoc, gdLoc;
-            int inOutStop;
-            long serviceState;
-            ArrivalEntity arrival;
-            while (rs.next()) {
-                serviceState = rs.getLong("SERVICE_STATE");
-                if(getGpsValid(serviceState) == 1)
-                    continue;
+    private Long map_get_long(Map<String, Object> map, String key){
+        return map.containsKey(key)?Long.parseLong(map.get(key).toString()):-1;
+    }
-                map = new HashMap<>();
+    private Float map_get_float(Map<String, Object> map, String key){
+        return map.containsKey(key)?Float.parseFloat(map.get(key).toString()):-1;
+    }
-                lon = rs.getFloat("LON");
-                lat = rs.getFloat("LAT");
-                // 高德坐标
-                gdLoc = TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(lon, lat));
-                map.put("gcj_lon", gdLoc.getLng());
-                map.put("gcj_lat", gdLoc.getLat());
-                // 百度坐标
-                bdLoc = TransGPS.bd_encrypt(gdLoc);
-                map.put("bd_lon", bdLoc.getLng());
-                map.put("bd_lat", bdLoc.getLat());
-                //原始坐标
-                map.put("lon", lon);
-                map.put("lat", lat);
-
-                map.put("deviceId", rs.getString("DEVICE_ID"));
-                map.put("ts", rs.getLong("TS"));
-                map.put("timestamp", rs.getLong("TS"));
-                map.put("stopNo", rs.getString("STOP_NO"));
-                map.put("direction", rs.getFloat("DIRECTION"));
+    private List<DeviceChange> findDeviceChangeLogs(String nbbm, long t, long st){
+        List<DeviceChange> dcs = null;
+        List<DeviceChange> rs = new ArrayList<>();
+        try{
-                map.put("lineId", rs.getString("LINE_ID"));
-                map.put("speed", rs.getFloat("SPEED_GPS"));
+            //JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource());
+            dcs = jdbcTemplate.query("select cl_zbh as nbbm,new_device_no as device,UNIX_TIMESTAMP(qyrq) * 1000 as st from bsth_c_car_device where cl_zbh='"+nbbm+"' and UNIX_TIMESTAMP(qyrq)<" + (t / 1000)
+                    , BeanPropertyRowMapper.newInstance(DeviceChange.class));
-                inOutStop = rs.getInt("INOUT_STOP");
-                map.put("inout_stop", inOutStop);
-                arrival = arrivalMap.get(rs.getString("DEVICE_ID") + "_" + rs.getLong("TS"));
-                if (arrival != null) {
-                    map.put("inout_stop_info", arrival);
-                    map.put("inout_stop", arrival.getInOut());
+            Collections.sort(dcs, new Comparator<DeviceChange>() {
+                @Override
+                public int compare(DeviceChange d1, DeviceChange d2) {
+                    return (int) (d1.getSt() - d2.getSt());
                 }
+            });
-                map.put("nbbm", BasicData.deviceId2NbbmMap.get(rs.getString("DEVICE_ID")));
-                map.put("state", getService(serviceState));
-                // 上下行
-                map.put("upDown", getUpOrDown(serviceState));
-                //路段编码
-                map.put("section_code", rs.getString("SECTION_CODE"));
-                list.add(map);
+            for(int i = 0,len=dcs.size(); i < len - 1; i++){
+                dcs.get(i).setEt(dcs.get(i + 1).getSt());
             }
-        } catch (Exception e) {
+
+            for(DeviceChange dc : dcs){
+                if(dc.getEt() > st)
+                    rs.add(dc);
+            }
+        }catch (Exception e){
             logger.error("", e);
-        } finally {
-            DBUtils_MS.close(rs, ps, conn);
         }
-        return list;
+        return rs;
     }
     public static byte getGpsValid(long serviceState) {
         return (byte)(((serviceState & 0x80000000) == 0x80000000) ? 1 : 0);
     }
-    public Map<String, ArrivalEntity> findArrivalByTs(int weekOfYear, Long st, Long et, String devicesInSql) {
+    public Map<String, ArrivalEntity> findArrivalByTs(Long st, Long et, List<DeviceChange> dcs) {
         Map<String, ArrivalEntity> map = new HashMap<>();
-        String sql = "SELECT DEVICE_ID,LINE_ID,STOP_NO,TS,UP_DOWN,IN_OUT,WEEKS_YEAR,CREATE_DATE FROM bsth_c_arrival_info where weeks_year=? and device_id in ("
-                + devicesInSql + ") and ts > ? and ts < ?";
-        try {
-            conn = DBUtils_MS.getConnection();
-            ps = conn.prepareStatement(sql);
-            ps.setInt(1, weekOfYear);
-            ps.setLong(2, st * 1000);
-            ps.setLong(3, et * 1000);
+        // weeks_year 分区字段
+        Calendar sCal = Calendar.getInstance();
+        sCal.setTime(new Date(st * 1000));
+        int sWeekOfYear = sCal.get(Calendar.WEEK_OF_YEAR);
+        Calendar eCal = Calendar.getInstance();
+        eCal.setTime(new Date(et * 1000));
+        int eWeekOfYear = eCal.get(Calendar.DAY_OF_YEAR);
+
+        StringBuilder sql = new StringBuilder("");
+        long t1,t2;
+        DeviceChange dc;
+        for(int i = 0,len=dcs.size(); i < len; i++){
+            t1 = st;
+            t2 = et;
+            dc = dcs.get(i);
+            if(dc.getSt() > st)
+                t1 = dc.getSt();
+            if(dc.getEt() < et)
+                t2 = dc.getEt();
+
+            sql.append("SELECT DEVICE_ID,LINE_ID as LINE_CODE,STOP_NO,TS,UP_DOWN,IN_OUT,WEEKS_YEAR,CREATE_DATE FROM bsth_c_arrival_info " +
+                    " where weeks_year in ("+sWeekOfYear+", "+eWeekOfYear+") and device_id='"+dc.getDevice()+"' and ts > "+t1+" and ts < " + t2);
+
+            if(i == len - 1)
+                sql.append(" ORDER BY device_id,ts,stop_no");
+            else
+                sql.append(" UNION");
+        }
-            rs = ps.executeQuery();
-            ArrivalEntity arr;
-            int inOut, updown;
-            String prefix, stationName, lineId;
-            while (rs.next()) {
-                lineId = rs.getString("LINE_ID");
-                updown = rs.getInt("UP_DOWN");
-                prefix = lineId + "_" + updown + "_";
-                stationName = BasicData.getStationNameByCode(rs.getString("STOP_NO"), prefix);
+        JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource());
+        List<ArrivalEntity> list = jdbcTemplate_ms.query(sql.toString(), BeanPropertyRowMapper.newInstance(ArrivalEntity.class));
-                if (StringUtils.isEmpty(stationName))
-                    continue;
+        String stationName, prefix;
+        for(ArrivalEntity arr : list){
+            prefix = arr.getLineCode() + "_" + arr.getUpDown() + "_";
+            stationName = BasicData.getStationNameByCode(arr.getStopNo(), prefix);
-                arr = new ArrivalEntity(rs.getString("DEVICE_ID"), rs.getLong("TS"), lineId,
-                        updown, rs.getString("STOP_NO"), rs.getInt("IN_OUT"), rs.getLong("CREATE_DATE"),
-                        rs.getInt("WEEKS_YEAR"), stationName);
+            arr.setStopName(stationName);
-                // 设备号_时间戳_进出状态 为key
-                // 反转进出状态
-                inOut = arr.getInOut() == 0 ? 1 : 0;
-                map.put(arr.getDeviceId() + "_" + arr.getTs(), arr);
-            }
-        } catch (Exception e) {
-            logger.error("", e);
-        } finally {
-            DBUtils_MS.close(rs, ps, conn);
+            // 反转进出状态
+            map.put(arr.getDeviceId() + "_" + arr.getTs(), arr);
         }
         return map;
     }
@@ -612,14 +657,6 @@ public class GpsServiceImpl implements GpsService {
             //获取历史gps 数据
             List<HistoryGps_DTOV3> list = HistoryGps_DTOV3.craete(history(new String[]{nbbm}, st, et));
             if (list != null && list.size() > 0) {
-                //获取路段信息
-                /*String sql = "select ID, ST_AsText(GROAD_VECTOR) as GROAD_VECTOR,ROAD_CODE,ROAD_NAME,SPEED from bsth_c_road where road_code in(select section_code from bsth_c_sectionroute where line_code=? and destroy=0)";
-                List<Road_DTO> roads = Road_DTO.craete(jdbcTemplate.queryForList(sql, list.get(0).getLineId()));
-
-                //为GPS数据关联路段信息
-                for (HistoryGps_DTOV3 gps : list) {
-                    matchRoadToGps(gps, roads);
-                }*/
                 //关联路段名称
                 Map<String, String> sectionCode2Name = GeoCacheData.sectionCode2NameMap();
                 for(HistoryGps_DTOV3 gps : list){
@@ -1139,6 +1176,89 @@ public class GpsServiceImpl implements GpsService {
         return paramMap;
     }
+    @Override
+    public Map<String, Object> allCarsByLine(String lineCode) {
+        Map<String, Object> map = new HashMap();
+        try{
+            List<Map<String, Object>> list = new ArrayList<>();
+            Map<String, Object> item;
+            GpsEntity gps;
+            //当天线路下营运的车辆
+            Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
+            ScheduleRealInfo sch;
+            String device;
+
+            Map<String, Integer> allDevices = new HashMap<>();
+            String execStr = "";
+            D80 d80;
+            for(String nbbm : cars){
+                item = new HashMap<>();
+                device = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+                allDevices.put(device, 1);
+                item.put("nbbm", nbbm);
+                item.put("device", device);
+
+                sch = dayOfSchedule.executeCurr(nbbm);
+                if(null != sch){
+                    execStr = (sch.getXlDir().equals("0")?"上行":"下行") + "("+sch.getDfsj()+")";
+                    if(!sch.getXlBm().equals(lineCode))
+                        execStr = sch.getXlName()+execStr;
+                    else
+                        item.put("schId", sch.getId());
+                    item.put("exec", execStr);
+                }
+
+                gps = gpsRealData.get(device);
+                if(null != gps){
+                    item.put("loc", gps.getStationName());
+                    item.put("lineCodeReal", gps.getLineId());
+                    item.put("status", gps.isOffline()?"离线":"在线");
+                    item.put("gpsTs", gps.getTimestamp());
+                }
+                //请求出场时间
+                d80 = PilotReport.qqccMap.get(device);
+                if(null != d80)
+                    item.put("qqcc", d80.getTimestamp());
+
+                list.add(item);
+            }
+
+            //车载编码落在该线路的设备
+            Set<String> devices = gpsRealData.findDevices(lineCode);
+            for(String d : devices){
+                if(allDevices.containsKey(d))
+                    continue;
+
+                gps = gpsRealData.get(d);
+                if(null == gps)
+                    continue;
+
+                item = new HashMap<>();
+                item.put("nbbm", gps.getNbbm());
+                item.put("device", d);
+                item.put("loc", gps.getStationName());
+                item.put("lineCodeReal", gps.getLineId());
+                item.put("status", gps.isOffline()?"离线":"在线");
+                item.put("gpsTs", gps.getTimestamp());
+
+                //请求出场时间
+                d80 = PilotReport.qqccMap.get(d);
+                if(null != d80)
+                    item.put("qqcc", d80.getTimestamp());
+
+                list.add(item);
+            }
+
+            map.put("list", list);
+            map.put("status", ResponseCode.SUCCESS);
+        }catch (Exception e){
+            logger.error("", e);
+            map.put("status", ResponseCode.ERROR);
+            map.put("msg", e.getMessage());
+        }
+        return map;
+    }
+
     static List<GpsSpeed> findAll(Map<String, Object> map) {
         Connection conn = null;
         PreparedStatement ps = null;
+package com.bsth.service.gps.entity;
+
+/**
+ * 车辆设备变更记录
+ * Created by panzhao on 2018/1/16.
+ */
+public class DeviceChange {
+
+    private String nbbm;
+    private String device;
+    private long st;
+    private long et;
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getDevice() {
+        return device;
+    }
+
+    public void setDevice(String device) {
+        this.device = device;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+}
@@ -1843,7 +1843,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
-			sjlc = new BigDecimal(culateService.culateSjgl(keyMap.get(key)) + culateService.culateLjgl(keyMap.get(key)));
+			List<ScheduleRealInfo> tempList = new ArrayList<ScheduleRealInfo>();
+			for(ScheduleRealInfo s : keyMap.get(key)){
+				if(s.getcTasks() != null && s.getcTasks().size() > 0){
+					tempList.add(s);
+				} else if(s.getZdsjActual() != null && s.getFcsjActual() != null){
+					tempList.add(s);
+				}
+			}
+			
+			sjlc = new BigDecimal(culateService.culateSjgl(tempList) + culateService.culateLjgl(tempList));
 			lzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "路阻"));
 			dmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "吊慢"));
 			gzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "故障"));
@@ -2421,13 +2430,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 	        }
 	        for(Ylb ylb : queryYlbByRqXlbm){
-	        	String key = sdfMonth.format(ylb.getRq()) + ylb.getXlbm();
+	        	String key = ylb.getJsy() + ylb.getNbbm();
 	        	if(!ylbMap.containsKey(key))
 	        		ylbMap.put(key, new ArrayList<Ylb>());
 	        	ylbMap.get(key).add(ylb);
 	        }
 	        for(Dlb dlb : queryDlbByRqXlbm){
-	        	String key = sdfMonth.format(dlb.getRq()) + dlb.getXlbm();
+	        	String key = dlb.getJsy() + dlb.getNbbm();
 	        	if(!dlbMap.containsKey(key))
 	        		dlbMap.put(key, new ArrayList<Dlb>());
 	        	dlbMap.get(key).add(dlb);
@@ -2480,8 +2489,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 //		        ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(scheduleRealInfos.get(0).getId());
 		        ScheduleRealInfo s = scheduleRealInfos.get(0);
-		        String xlbm = s.getXlBm();
 		        String fcrq = s.getScheduleDateStr();
+		        String jsy = s.getjGh();
+		        String nbbm = s.getClZbh();
 		        int type = 0;
 		        Double ccyl = 0.0;
@@ -2491,8 +2501,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        Double zlc = 0.0;
 //		        List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
 //		        List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
-		        List<Ylb> listYlb = ylbMap.get(fcrq + xlbm);
-		        List<Dlb> listDlb = dlbMap.get(fcrq + xlbm);
+		        List<Ylb> listYlb = ylbMap.get(jsy + nbbm);
+		        List<Dlb> listDlb = dlbMap.get(jsy + nbbm);
 //		        List<Cars> listCars = carsRepository.findCarsByCode(s.getClZbh());
 		        List<Cars> listCars = carMap.get(s.getClZbh());
@@ -10,4 +10,6 @@ public interface ChildTaskPlanService extends BaseService&lt;ChildTaskPlan, Long&gt;{
     Map<String,Object> saveHistory(ChildTaskPlan childTask);
     Map<String,Object> delHistory(Long id);
+
+Map<String,Object> update(ChildTaskPlan childTask);
 }
@@ -21,6 +21,7 @@ import javax.transaction.Transactional;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 @Service
 public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService {
@@ -131,6 +132,66 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
         return rs;
     }
+    @Override
+    public Map<String, Object> update(ChildTaskPlan t) {
+        Map<String, Object> rs = new HashMap();
+        try {
+            ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
+            //保存起终点名称
+            if(StringUtils.isEmpty(t.getStartStationName()))
+                t.setStartStationName(getStationName(sch.getXlBm(), t.getStartStation()));
+
+            if(StringUtils.isEmpty(t.getEndStationName()))
+                t.setEndStationName(getStationName(sch.getXlBm(), t.getEndStation()));
+            if(t.getDestroyReason() == null)
+                t.setDestroyReason("");
+
+
+            //根据id 获取原对象
+            ChildTaskPlan task = null;
+            Set<ChildTaskPlan> set = sch.getcTasks();
+            for(ChildTaskPlan obj : set){
+                if(obj.getId() == t.getId()){
+                    task = obj;
+                    break;
+                }
+            }
+
+            if(null == task){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg",  "失败，服务端无法定位到数据！");
+                return rs;
+            }
+            //更新字段
+            task.setStartStation(t.getStartStation());
+            task.setStartStationName(t.getStartStationName());
+            task.setEndStation(t.getEndStation());
+            task.setEndStationName(t.getEndStationName());
+            task.setStartDate(t.getStartDate());
+            task.setEndDate(t.getEndDate());
+            task.setMileageType(t.getMileageType());
+            task.setMileage(t.getMileage());
+            task.setDestroy(t.isDestroy());
+            task.setDestroyReason(t.getReason());
+            task.setReason(t.getReason());
+            task.setType1(t.getType1());
+            task.setType2(t.getType2());
+            task.setNoClerk(t.isNoClerk());
+            task.setRemarks(t.getRemarks());
+
+            //更新数据库
+            super.save(task);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("t", sch);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg",  e.getMessage());
+        }
+        return rs;
+    }
+
     private String getStationName(String lineCode, String stationCode){
         String name;
         String prefix1 = lineCode + "_" + 0 + "_",
@@ -61,9 +61,9 @@
 			href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
 			rel="stylesheet" type="text/css" />
 	<!-- table 表格控件 -->
-	<link rel="stylesheet"
-		  href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"
-		  type="text/css" />
+	<!--<link rel="stylesheet"-->
+		  <!--href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"-->
+		  <!--type="text/css" />-->
 	<link href="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css" rel="stylesheet" type="text/css"/>
 	<!-- handsontable样式 -->
 	<link rel="stylesheet"
@@ -52,6 +52,8 @@ var gb_data_submit = function () {
     $(document).on('click', '.up_down_route_list .station_route .ul_li_input .save_icon_btn', function (e) {
         var f = $(this).parents('form');
         var data = f.serializeJSON();
+        data.lineCode = g_line_code;
+        data.versions = g_version;
         UIkit.modal.confirm('确定将站点名称修改为【'+data.stationName+'】？').then(function() {
             show_run_text('正在保存...');
@@ -152,6 +152,7 @@ var gb_version_manage = function () {
         var version = $(this).data('version');
         storage.setItem("geo_data_edit_line_version" , version);
+        g_version = version;
         $loadPanel.show();
         clearAll();
         startup();
@@ -350,7 +350,7 @@
 			</td>
 			<td>
 				<a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看</a>
-				<a href="javascript:window.localStorage.setItem('geo_data_edit_line_code' , '{{obj.lineCode}}');window.localStorage.removeItem('geo_data_edit_line_version');window.location.href='/pages/base/geo_data_edit/uk3_wrap.html';" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
+				<!--<a href="javascript:window.localStorage.setItem('geo_data_edit_line_code' , '{{obj.lineCode}}');window.localStorage.removeItem('geo_data_edit_line_version');window.location.href='/pages/base/geo_data_edit/uk3_wrap.html';" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>-->
 			</td>
 			<td>
 				<a href="details.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>
@@ -22,7 +22,7 @@
  * - - - - - -》getSectionListPlonly：根据坐标点获取两点之间的折线路段（手动规划）
  */
-var WorldsBMap = function () {
+window.WorldsBMap = function () {
 	/** WorldsBMap 全局变量定义 mapBValue：地图对象；polygon：多边形；polyUpline：走向折线；circle：圆 */
 	var mapBValue = '';polygon='',polyUpline='',circle='',iseditStatus = false;
@@ -98,7 +98,7 @@
                     <label class="col-md-2 control-label">启用日期*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control"
-                               name="qyrq" uib-datepicker-popup="yyyy年MM月dd日"
+                               name="qyrq" uib-datepicker-popup="yyyy年MM月dd日 HH:mm"
                                ng-model="ctrl.deviceInfoForDetail.qyrq" readonly/>
                     </div>
                 </div>
@@ -82,13 +82,8 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">旧终端号*：</label>
                     <div class="col-md-3">
-                        <input type="text" class="form-control"
-                               name="oldDeviceNo" ng-model="ctrl.deviceInfoForSave.oldDeviceNo"
-                               required placeholder="请输入旧终端号"/>
-                    </div>
-                    <!-- 隐藏块，显示验证信息 -->
-                    <div class="alert alert-danger well-sm" ng-show="myForm.oldDeviceNo.$error.required">
-                        旧终端号必须填写
+                        <input type="text" class="form-control" name="oldDeviceNo"
+                               ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/>
                     </div>
                 </div>
@@ -143,31 +138,40 @@
                     </div>
                 </div>
+                <!--<div class="form-group has-success has-feedback">-->
+                    <!--<label class="col-md-2 control-label">启用日期*：</label>-->
+                    <!--<div class="col-md-3">-->
+                        <!--<div class="input-group">-->
+                            <!--<input type="text" class="form-control"-->
+                                   <!--name="qyrq" placeholder="请选择启用日期..."-->
+                                   <!--uib-datepicker-popup="yyyy年MM月dd日"-->
+                                   <!--is-open="ctrl.qyrqOpen" required-->
+                                   <!--ng-model="ctrl.deviceInfoForSave.qyrq" readonly-->
+                                   <!--remote-Validation-->
+                                   <!--remotevtype="cde1"-->
+                                   <!--remotevparam="{{ {'id_eq': ctrl.deviceInfoForSave.id, 'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>-->
+                            <!--<span class="input-group-btn">-->
+                                <!--<button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">-->
+                                    <!--<i class="glyphicon glyphicon-calendar"></i>-->
+                                <!--</button>-->
+                            <!--</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                    <!--&lt;!&ndash; 隐藏块，显示验证信息 &ndash;&gt;-->
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">-->
+                        <!--启用日期必须选择-->
+                    <!--</div>-->
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">-->
+                        <!--{{$remote_msg}}-->
+                    <!--</div>-->
+                <!--</div>-->
+
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">启用日期*：</label>
                     <div class="col-md-3">
-                        <div class="input-group">
-                            <input type="text" class="form-control"
-                                   name="qyrq" placeholder="请选择启用日期..."
-                                   uib-datepicker-popup="yyyy年MM月dd日"
-                                   is-open="ctrl.qyrqOpen" required
-                                   ng-model="ctrl.deviceInfoForSave.qyrq" readonly
-                                   remote-Validation
-                                   remotevtype="cde1"
-                                   remotevparam="{{ {'id_eq': ctrl.deviceInfoForSave.id, 'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>
-                            <span class="input-group-btn">
-                                <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
-                                    <i class="glyphicon glyphicon-calendar"></i>
-                                </button>
-                            </span>
-                        </div>
-                    </div>
-                    <!-- 隐藏块，显示验证信息 -->
-                    <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
-                        启用日期必须选择
-                    </div>
-                    <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
-                        {{$remote_msg}}
+                        <input type="text" class="form-control"
+                               name="qyrq" uib-datepicker-popup="yyyy年MM月dd日 HH:mm"
+                               ng-model="ctrl.deviceInfoForSave.qyrq" readonly/>
                     </div>
                 </div>
@@ -82,13 +82,8 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">旧终端号*：</label>
                     <div class="col-md-3">
-                        <input type="text" class="form-control"
-                               name="oldDeviceNo" ng-model="ctrl.deviceInfoForSave.oldDeviceNo"
-                               required placeholder="请输入旧终端号"/>
-                    </div>
-                    <!-- 隐藏块，显示验证信息 -->
-                    <div class="alert alert-danger well-sm" ng-show="myForm.oldDeviceNo.$error.required">
-                        旧终端号必须填写
+                        <input type="text" class="form-control" name="oldDeviceNo"
+                               ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/>
                     </div>
                 </div>
@@ -143,23 +138,44 @@
                     </div>
                 </div>
+                <!--<div class="form-group has-success has-feedback">-->
+                    <!--<label class="col-md-2 control-label">启用日期*：</label>-->
+                    <!--<div class="col-md-3">-->
+                        <!--<div class="input-group">-->
+                            <!--<input type="text" class="form-control"-->
+                                   <!--name="qyrq" placeholder="请选择启用日期..."-->
+                                   <!--uib-datepicker-popup="yyyy年MM月dd日 hh:mm:ss"-->
+                                   <!--is-open="ctrl.qyrqOpen" required-->
+                                   <!--ng-model="ctrl.deviceInfoForSave.qyrq" readonly-->
+                                   <!--remote-Validation-->
+                                   <!--remotevtype="cde1"-->
+                                   <!--remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>-->
+                            <!--<span class="input-group-btn">-->
+                                <!--<button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">-->
+                                    <!--<i class="glyphicon glyphicon-calendar"></i>-->
+                                <!--</button>-->
+                            <!--</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                    <!--&lt;!&ndash; 隐藏块，显示验证信息 &ndash;&gt;-->
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">-->
+                        <!--启用日期必须选择-->
+                    <!--</div>-->
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">-->
+                        <!--{{$remote_msg}}-->
+                    <!--</div>-->
+                <!--</div>-->
+
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">启用日期*：</label>
+                    <label class="col-md-2 control-label">启用日期：</label>
                     <div class="col-md-3">
                         <div class="input-group">
-                            <input type="text" class="form-control"
-                                   name="qyrq" placeholder="请选择启用日期..."
-                                   uib-datepicker-popup="yyyy年MM月dd日"
-                                   is-open="ctrl.qyrqOpen" required
-                                   ng-model="ctrl.deviceInfoForSave.qyrq" readonly
+                            <input type="datetime-local" class="form-control" name="qyrq"
+                                   ng-model="ctrl.deviceInfoForSave.qyrq"
                                    remote-Validation
                                    remotevtype="cde1"
-                                   remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>
-                            <span class="input-group-btn">
-                                <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
-                                    <i class="glyphicon glyphicon-calendar"></i>
-                                </button>
-                            </span>
+                                   remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}" />
+
                         </div>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -7,7 +7,7 @@
                 <th style="width: 70px;">序号</th>
                 <th style="width: 15%;">线路名称</th>
                 <th style="width: 10%;">内部编号</th>
-                <th style="width: 100px;">启用日期</th>
+                <th style="width: 160px;">启用日期</th>
                 <th>旧设备编号</th>
                 <th>新设备编号</th>
                 <th style="width: 180px;">操作人/操作时间</th>
@@ -71,7 +71,7 @@
                     <span ng-bind="info.clZbh"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.qyrq | date:'yyyy-MM-dd'"></span>
+                    <span ng-bind="info.qyrq | date:'yyyy-MM-dd HH:mm'"></span>
                 </td>
                 <td>
                     <span ng-bind="info.oldDeviceNo"></span>
@@ -283,7 +283,8 @@ ScheduleApp.factory(
                         alert("我擦，后台返回连个状态码都没返回，见鬼了，服务器可能重启了");
                     } else if (rejection.status == -1) {
                         // 服务器断开了
-                        alert("貌似服务端连接不上");
+                        // alert("貌似服务端连接不上");
+                        console.log("貌似服务端连接不上");
                     } else {
                         output.push("状态编码：" + rejection.status);
                         output.push("错误内容：" + angular.toJson(rejection.data));
@@ -176,8 +176,8 @@
                        <!--class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑2 </a>-->
                     <a ui-sref="ttInfoDetailManage_edit3({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name, rflag : true, lineversion : info.lineVersion})"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑 </a>
-                    <a ng-click="ctrl.toTtInfoDetailAuto(info.id)"
-                       class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a>
+                    <!--<a ng-click="ctrl.toTtInfoDetailAuto(info.id)"-->
+                       <!--class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a>-->
                     <a ui-sref="ttInfoDetailManage_form({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 导入 </a>
                     <a href="javascript:" class="btn btn-info btn-sm" ng-click="ctrl.exportData(info.id)"> 导出 </a>
@@ -127,7 +127,7 @@
     <div uk-spinner></div>
 </div>
 <div class="ct_page" style="display: none;">
-    <h3 class="uk-heading-line uk-heading-bullet"><span>烂班明细统计</span></h3>
+    <h3 class="uk-heading-line uk-heading-bullet"><span style="color: #ff5353;">烂班明细统计</span></h3>
     <div class="ct_cont" >
         <div class="ct_search_form_wrap">
             <form>
@@ -161,7 +161,7 @@
                     <button class="uk-button uk-button-text export_excel" style="padding: 0 5px;">导出数据</button>
                 </div>
                 <div class="ct_field ct_field_bottom">
-                    <span uk-icon="icon: question" title="不统计进出场和子任务" uk-tooltip="pos: bottom"></span>
+                    <span uk-icon="icon: question" title="不统计进出场和2点间空驶" uk-tooltip="pos: bottom"></span>
                 </div>
             </form>
         </div>
+<!-- 临加明细统计 -->
+<iframe src="/pages/summary/temp_sch_detail/list.html?origin=real_control_iframe" frameborder="0" style="height: 100%;width: 100%;"></iframe>
 \ No newline at end of file
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
+    <!-- flatpickr -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
+    <style>
+        html,body{
+            height: 100%;
+        }
+        .ct_page{
+            padding: 25px 15px;
+            height: 100%;
+            height: calc(100% - 50px);
+        }
+
+        .ct_cont{
+            height: calc(100% - 35px);
+        }
+
+        .ct_cont>div>div.uk-card{
+            height: 99%;
+        }
+
+        .loading{
+            height: 100%;
+            text-align: center;
+        }
+        .loading .uk-spinner{
+            margin-top: 200px;
+        }
+        .loading circle{
+            stroke: red;
+        }
+
+        .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
+            opacity: 0.6 !important;
+            padding: 0 !important;
+        }
+
+        .ct_destroy_sch_table_width th:nth-of-type(1),.ct_destroy_sch_table_width td:nth-of-type(1){
+            width: 9%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(2),.ct_destroy_sch_table_width td:nth-of-type(2){
+            width: 10%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(3),.ct_destroy_sch_table_width td:nth-of-type(3){
+            width: 9%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(4),.ct_destroy_sch_table_width td:nth-of-type(4){
+            width: 9%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(5),.ct_destroy_sch_table_width td:nth-of-type(5){
+            width: 9%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(6),.ct_destroy_sch_table_width td:nth-of-type(6){
+            width: 8%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(7),.ct_destroy_sch_table_width td:nth-of-type(7){
+            width: 8%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(8),.ct_destroy_sch_table_width td:nth-of-type(8){
+            width: 8%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(9),.ct_destroy_sch_table_width td:nth-of-type(9){
+        }
+
+        .ct_search_form_wrap{
+            border-bottom: 1px solid #e5e5e5;
+            padding: 10px 0 25px 10px;
+        }
+        .ct_search_form_wrap .ct_field{
+            display: inline-block;
+            margin: 0 5px;
+        }
+
+        .ct_search_form_wrap .ct_field label{
+            font-size: 14px;
+        }
+
+        .ct_search_form_wrap .ct_field input{
+            width: 110px;
+        }
+
+        .ct_search_form_wrap .ct_field select{
+            width: auto;
+            min-width: 100px;
+        }
+
+        .ct_search_form_wrap .uk-button{
+            padding: 0 14px;
+        }
+
+        .ct_search_form_wrap .uk-button i{
+            vertical-align: middle;
+            margin-top: -2px;
+            margin-right: 7px;
+        }
+
+        .ct_table_wrap{
+            font-size: 14px;
+            height: calc(100% - 77px);
+        }
+
+        .t_body_wrap{
+            height: calc(100% - 41px);
+            overflow: auto;
+            position: relative;
+        }
+
+        .ct_field.ct_field_bottom{
+            vertical-align: bottom;
+            font-size: 12px;
+            margin-left: 0;
+        }
+    </style>
+</head>
+
+<body>
+<div class="loading">
+    <div uk-spinner></div>
+</div>
+<div class="ct_page" style="display: none;">
+    <h3 class="uk-heading-line uk-heading-bullet"><span>临加明细统计</span></h3>
+    <div class="ct_cont" >
+        <div class="ct_search_form_wrap">
+            <form>
+                <div class="ct_field">
+                    <label>公司：
+                        <select class="uk-select" name="gsBm_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>分公司：
+                        <select class="uk-select" name="fgsBm_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>线路：
+                        <select class="uk-select" name="lineCode_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>日期：
+                        <input class="uk-input" name="rq" style="width: 220px;">
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
+                </div>
+                <div class="ct_field ct_field_bottom">
+                    <button class="uk-button uk-button-text export_excel" style="padding: 0 5px;">导出数据</button>
+                </div>
+                <div class="ct_field ct_field_bottom">
+                    <span uk-icon="icon: question" title="不统计进出场和2点间空驶" uk-tooltip="pos: bottom"></span>
+                </div>
+            </form>
+        </div>
+        <div class="ct_table_wrap day">
+            <table class="uk-table uk-table-small ct_destroy_sch_table_width" style="margin-bottom: 0;">
+                <thead>
+                <tr>
+                    <th>日期</th>
+                    <th>线路</th>
+                    <th>车号</th>
+                    <th>司机</th>
+                    <th>售票员</th>
+                    <th>班次</th>
+                    <th>烂班公里</th>
+                    <th>烂班时间</th>
+                    <th>备注</th>
+                </tr>
+                </thead>
+            </table>
+            <div class="t_body_wrap">
+                <table class="uk-table uk-table-divider uk-table-hover uk-table-small ct_destroy_sch_table ct_destroy_sch_table_width">
+                    <tbody>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script id="destroy_sch_list_temp" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td>{{obj.rq}}</td>
+        <td>{{obj.lineName}}</td>
+        <td>{{obj.nbbm}}</td>
+        <td>{{obj.jGh}}</td>
+        <td>{{obj.sGh}}</td>
+        <td><a style="text-decoration: underline;">{{obj.size}}</a></td>
+        <td>{{obj.mileage}}</td>
+        <td>{{obj.timeStr}}</td>
+        <td>{{obj.remark}}</td>
+    </tr>
+    {{/each}}
+</script>
+
+<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
+<!-- flatpickr -->
+<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
+<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
+<script>
+
+    var f = $('form', '');
+    //var page=0, pageSize=120;
+
+    var ep = EventProxy.create('query_comps', 'query_lines', function () {
+        $('[name=gsBm_eq]', f).trigger('change');//公司change
+        query();
+
+        $('.loading').remove();
+        $('.ct_page').show();
+    });
+
+    //点击搜索
+    $('button.search', f).on('click', query);
+
+    function query() {
+        $('button.search', f).attr('disabled', 'disabled');
+        var data = f.serializeJSON();
+        $('.ct_destroy_sch_table tbody').html('');
+        //开始结束时间
+        data.rq_ge = data.rq.substr(0, 10);
+        data.rq_le = data.rq.substr(13);
+        //data.order='t';
+        delete data.rq;
+
+        $.get('/summary/temp_sch/all', data, function (rs) {
+            $('button.search', f).removeAttr('disabled');
+            if(!rs || rs.length==0)
+                return UIkit.notification('没有搜索到相关数据！！', 'danger');
+            $.each(rs, function () {
+                this.timeStr=moment(this.t).format('HH:mm')
+            });
+
+            var htmlStr = template('destroy_sch_list_temp', {list: rs});
+            $('.ct_destroy_sch_table tbody').html(htmlStr);
+            $('.t_body_wrap').perfectScrollbar('update');
+        });
+    }
+
+
+    //日期选择框
+    var fs='YYYY-MM-DD'
+            , ets=moment().subtract(1, 'days').format(fs)
+            , sts=moment().subtract(3, 'days').format(fs);
+    flatpickr('.ct_search_form_wrap [name=rq]', {
+        mode: "range", dateFormat: "Y-m-d","locale": "zh", defaultDate: [sts, ets]
+    });
+    var comps;
+    //构建公司级联下拉框
+    $.get('/user/companyData', function (rs) {
+        comps = rs;
+        var opts = '';
+        for(var i=0,obj;obj=comps[i++];){
+            opts += '<option value="'+obj.companyCode+'">'+obj.companyName+'</option>';
+        }
+        $('[name=gsBm_eq]', f).html(opts);
+        ep.emit('query_comps');
+    });
+
+    var lineMapps;
+    //加载线路信息
+    $.get('/line/all', {'destroy_eq': 0}, function (rs) {
+        rs.sort(function (a, b) {
+            return a.name.localeCompare(b.name);
+        });
+        lineMapps={};
+        var k;
+        $.each(rs, function () {
+            k = this.company+'_'+this.brancheCompany;
+            if(!lineMapps[k])
+                lineMapps[k]=[];
+            lineMapps[k].push(this);
+        });
+
+        ep.emit('query_lines');
+    });
+
+    $('[name=gsBm_eq]', f).on('change', function () {
+        var code = $(this).val(), subs=[];
+        $.each(comps, function () {
+            if(this.companyCode==code)
+                subs=this.children;
+        });
+
+        var opts='';
+        $.each(subs, function () {
+            opts += '<option value="'+this.code+'">'+this.name+'</option>';
+        });
+        $('[name=fgsBm_eq]', f).html(opts).trigger('change');
+    });
+
+    $('[name=fgsBm_eq]', f).on('change', function () {
+        var k = $('[name=gsBm_eq]', f).val() + '_' + $(this).val();
+        var array = lineMapps[k];
+        var opts = '<option value="">全部</option>';
+        if(array){
+            $.each(array, function () {
+                opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
+            });
+        }
+        $('[name=lineCode_eq]', f).html(opts);
+    });
+
+    //
+    //滚动条
+    $('.t_body_wrap').perfectScrollbar({suppressScrollX: true});
+
+    $(document).on('submit', 'form', function () {
+        return false;
+    });
+
+    /**
+     * 导出
+     */
+    $('.export_excel').on('click', function () {
+        var data = f.serializeJSON();
+        data.rq_ge = data.rq.substr(0, 10);
+        data.rq_le = data.rq.substr(13);
+        data.order='t';
+        delete data.rq;
+
+        window.open('/summary/temp_sch/excel?' + $.param(data));
+    });
+
+</script>
+</body>
+</html>
 \ No newline at end of file
@@ -22,6 +22,6 @@
     background: rgb(15, 220, 220) !important;
 }
-.ct_table>.ct_table_body{
+.schedule-body .ct_table>.ct_table_body{
     border-bottom: 1px solid #000000 !important;
 }
@@ -98,6 +98,14 @@
 .line-schedule-table dl dt:nth-of-type(3), .line-schedule-table dl dd:nth-of-type(3) {
     width: calc(2% + 66px);
+    position: relative;
+}
+.line-schedule-table dl dd:nth-of-type(3)>i{
+    position: absolute;
+    color: #313030;
+    top: 1px;
+    right: 3px;
+    text-shadow: 0 -1px 0 rgba(0,0,0,.2);
 }
 .line-schedule-table dl dt:nth-of-type(4), .line-schedule-table dl dd:nth-of-type(4) {
@@ -545,7 +553,7 @@ dl.relevance-active.intimity dd:nth-child(n+2) {
 dl.relevance-active.intimity dd:nth-child(n+2) a {
     color: white !important;
 }
-
+/*
 dl.relevance-active dd.tl-qrlb,
 dl.relevance-active.intimity dd.tl-qrlb{
     background: linear-gradient(to right, #a9a911, #808000, #8baabf) !important;
@@ -587,7 +595,7 @@ dl.relevance-active.intimity dd.tl-xxrd {
 dl.relevance-active dd.tl-xxfc,
 dl.relevance-active.intimity dd.tl-xxfc {
     background: linear-gradient(to right, #8baabf, rgb(43, 185, 185), rgb(0,255,255)) !important;
-}
+}*/
 dl.relevance-active.intimity dd span.fcsj-diff {
     color: #616060;
 input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button{
+input::-webkit-inner-spin-button {
     display: none;
 }
@@ -7,9 +7,11 @@ input::-webkit-calendar-picker-indicator {
     display: none;
 }
-input::-webkit-datetime-edit { padding: 1px; }
+input::-webkit-datetime-edit {
+    padding: 1px;
+}
-.ps-container > .ps-scrollbar-y-rail{
+.ps-container > .ps-scrollbar-y-rail {
     z-index: 1 !important;
 }
@@ -18,6 +20,7 @@ input::-webkit-datetime-edit { padding: 1px; }
     opacity: 0.6 !important;
     padding: 0 !important;
 }
+
 /* ^_^ baidu map hide logo */
 .anchorBL, .anchorBL, .amap-logo, .amap-copyright {
     display: none;
@@ -298,7 +301,7 @@ svg.line-chart g.merge-item text {
 .tooltip.multi-tooltip {
     width: 160px;
     display: inline-block;
-    padding: 10px 0 10px 15px;
+    padding: 10px 0 10px 12px;
     border-right: 1px solid #eeeeee;
     border-bottom: 1px solid #eeeeee;
 }
@@ -749,8 +752,8 @@ li.map-panel {
 }
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(4), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(4) {
-     width: 10%;
- }
+    width: 10%;
+}
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(5), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(5) {
     width: 21%;
@@ -764,9 +767,6 @@ li.map-panel {
     width: 14%;
 }
-
-
-
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(1), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(1) {
     width: 5%;
     border-left: 1px solid #dedede;
@@ -816,59 +816,57 @@ li.map-panel {
     border-top: 1px solid #ffe2b9;
 }
-#cache_data_manage-modal .uk-table td{
+#cache_data_manage-modal .uk-table td {
     vertical-align: bottom;
 }
 #cache_data_manage-modal .uk-table td,
-#cache_data_manage-modal .uk-table th{
+#cache_data_manage-modal .uk-table th {
     padding: 8px 8px 6px;
 }
-
-.ps-help-panel{
+.ps-help-panel {
     color: grey;
     padding: 5px 2px;
 }
-.ps-help-panel small{
+.ps-help-panel small {
     display: block;
 }
-
-svg text.offline{
+svg text.offline {
     fill: #6f6a6a !important;
 }
-svg rect.offline{
+svg rect.offline {
     stroke: #dbdada !important;
     fill: #dbdada !important;
 }
-.tooltip .tooltip-container .title a>.abnormal-text{
+.tooltip .tooltip-container .title a > .abnormal-text {
     font-size: 14px;
     color: #ff5e5e;
     font-weight: 600;
 }
-#addChildTaskBtn{
+#addChildTaskBtn {
     margin-left: 5px;
     color: #36729b;
     padding: 1px 5px 1px 6px;
 }
-#addChildTaskBtn:hover{
+#addChildTaskBtn:hover {
     box-shadow: 2px 1px 3px 0 rgba(0, 0, 0, 0.2), 0px 3px 8px 0 rgba(0, 0, 0, 0.19);
 }
-.edit-icon{
+.edit-icon {
     color: #aba9a9;
     font-size: 12px;
     margin-left: 5px;
     display: none;
 }
-.operation-real-text{
+.operation-real-text {
     position: absolute;
     top: 9px;
     width: 100%;
@@ -877,7 +875,7 @@ svg rect.offline{
     pointer-events: none;
 }
-.operation-real-text span{
+.operation-real-text span {
     padding: 15px;
     background: #ff4f4f;
     color: white;
@@ -885,75 +883,76 @@ svg rect.offline{
     border-radius: 1px 1px 4px 4px;
 }
-#oil_station-modal.ct-form-modal form.uk-form-horizontal .uk-form-label{
+#oil_station-modal.ct-form-modal form.uk-form-horizontal .uk-form-label {
     width: 120px;
 }
-#oil_station-modal.ct-form-modal form.uk-form-horizontal .uk-form-controls{
+#oil_station-modal.ct-form-modal form.uk-form-horizontal .uk-form-controls {
     margin-left: 125px;
 }
-#oil_station-modal .uk-form-icon>[class*=uk-icon-]{
+#oil_station-modal .uk-form-icon > [class*=uk-icon-] {
     right: 23px;
 }
-#oil_station-modal .uk-form-icon:not(.uk-form-icon-flip)>input{
+#oil_station-modal .uk-form-icon:not(.uk-form-icon-flip) > input {
     padding-left: 10px !important;
 }
-#oil_station-modal .uk-form-icon{
+#oil_station-modal .uk-form-icon {
     width: calc(100% - 145px);
 }
-#oil_station-modal .uk-icon-mile:before{
+#oil_station-modal .uk-icon-mile:before {
     content: '公里';
 }
-#oil_station-modal .uk-icon-minute:before{
+#oil_station-modal .uk-icon-minute:before {
     content: '分钟';
 }
-option.oil_station_opt{
+option.oil_station_opt {
     color: red;
 }
-#oil_station-modal .uk-modal .uk-form.fv-form{
+#oil_station-modal .uk-modal .uk-form.fv-form {
     margin-bottom: 0 !important;
 }
-#gb_wait_modal .uk-modal-spinner{
+#gb_wait_modal .uk-modal-spinner {
     top: 25px;
-    -webkit-transform: translate(-50%,0);
-    transform: translate(-50%,0);
+    -webkit-transform: translate(-50%, 0);
+    transform: translate(-50%, 0);
 }
-#gb_wait_modal .wait-modal-text{
+#gb_wait_modal .wait-modal-text {
     text-align: center;
     margin-top: 35px;
     font-size: 15px;
     color: #635e5e;
 }
-.park-and-station-wrap{
+.park-and-station-wrap {
     margin-top: 9px;
     border: 1px solid #3dce69;
     width: 580px;
     padding: 12px;
     border-radius: 5px;
 }
-.park-and-station-wrap select{
+
+.park-and-station-wrap select {
     width: auto !important;
 }
 /** 安全驾驶相关css */
-.safe_driv_pop_wrap{
+.safe_driv_pop_wrap {
     position: absolute;
     right: 12px;
     bottom: 12px;
     z-index: 99;
 }
-.safe_driv_pop{
+.safe_driv_pop {
     background: #d44b4b;
     font-size: 15px;
     padding: 9px 10px 0;
@@ -965,14 +964,14 @@ option.oil_station_opt{
     color: #f2f2f2;
 }
-.safe_driv_pop:hover{
+.safe_driv_pop:hover {
     background: #bc2a2a;
 }
-.safe_driv_pop .title{
+.safe_driv_pop .title {
 }
-.safe_driv_pop .desc{
+.safe_driv_pop .desc {
     display: block;
     font-size: 12px;
     color: #ff9d9d;
@@ -985,24 +984,26 @@ option.oil_station_opt{
     width: 10px;
     background-color: #F5F5F5;
 }
+
 #formFragmentModal::-webkit-scrollbar-thumb {
     background-color: #000000;
 }
+
 #formFragmentModal::-webkit-scrollbar-track {
     border: 0;
     background-color: #F5F5F5;
     border-radius: 0;
 }
-#formFragmentModal::-webkit-scrollbar-thumb{
+#formFragmentModal::-webkit-scrollbar-thumb {
     border: 5px solid rgb(226, 122, 122);
 }
-#schedule-addsch_oil-modal select{
+#schedule-addsch_oil-modal select {
     height: 30px !important;
 }
-#oil_station-modal .input_clear_icon{
+#oil_station-modal .input_clear_icon {
     position: absolute;
     top: 6px;
     right: 108px;
@@ -1015,26 +1016,25 @@ option.oil_station_opt{
     cursor: pointer;
 }
-#oil_station-modal .input_clear_icon:hover{
+#oil_station-modal .input_clear_icon:hover {
     color: #de2020;
 }
-#oil_station-modal .input_clear_icon:before{
+#oil_station-modal .input_clear_icon:before {
     display: block;
     font-family: FontAwesome;
     content: "\f057";
 }
-#oil_station-modal input.readonly{
+#oil_station-modal input.readonly {
     background: #dddddd;
 }
-
-.ct_tags{
+.ct_tags {
     margin-bottom: 12px;
 }
-.ct_tags>span{
+.ct_tags > span {
     padding: 3px 7px;
     background: #e8e8e8;
     color: #3a3939;
@@ -1042,21 +1042,21 @@ option.oil_station_opt{
     margin-right: 5px;
 }
-.ct_tags>span.active{
+.ct_tags > span.active {
     background: #62a9e1;
     color: white;
     box-shadow: 0 0 4px rgba(0, 0, 0, 0.35);
 }
-.ct_tags>span.active:before{
+.ct_tags > span.active:before {
     content: "\f00c";
     font-family: FontAwesome;
     margin-right: 2px;
     font-size: 13px;
 }
-.ct_tags>span:hover{
- box-shadow: 0 0 4px rgba(0,0,0,.3);
+.ct_tags > span:hover {
+    box-shadow: 0 0 4px rgba(0, 0, 0, .3);
 }
 span.late-badge {
@@ -1067,48 +1067,51 @@ span.late-badge {
     margin-left: 2px;
 }
-dl.intimity span.late-badge{
+dl.intimity span.late-badge {
     color: #fbfbfb;
 }
 /** badge tooltip */
 .uk-badge.c_task:hover,
-.uk-badge.sch_region:hover{
+.uk-badge.sch_region:hover {
     background-image: none;
     background: #38b3e1;
     border: 1px solid #7ebad1;
 }
-.uk-badge.out:hover{
+.uk-badge.out:hover {
     background-image: none;
     background: #8fc650;
     border: 1px solid #949f86;
 }
-.uk-badge.in:hover{
+.uk-badge.in:hover {
     background-image: none;
     background: #fabc64;
     border: 1px solid #a68c67;
 }
-.qtip.sch-badge-tip{
-    max-width: 500px;
+.qtip.sch-badge-tip {
+    max-width: 700px;
 }
 .tip_task_list {
-    width: 460px;
+    width: 530px;
     margin-bottom: -10px;
 }
-.tip_task_list dl{
+
+.tip_task_list dl {
     font-size: 0;
     border-bottom: 1px solid #e6e6e6;
     margin: 0;
 }
-.tip_task_list dl:last-child{
+
+.tip_task_list dl:last-child {
     border-bottom: none;
 }
+
 .tip_task_list dl dt,
-.tip_task_list dl dd{
+.tip_task_list dl dd {
     display: inline-block;
     font-size: 13px;
     white-space: nowrap;
@@ -1118,55 +1121,72 @@ dl.intimity span.late-badge{
     line-height: 24px;
 }
-.tip_task_list dl dt:nth-of-type(1), .tip_task_list dl dd:nth-of-type(1){
-    width: 19%;
+.tip_task_list dl dt:nth-of-type(1), .tip_task_list dl dd:nth-of-type(1) {
+    width: 38px;
+    border-right: 1px solid #c8c8c8;
 }
-.tip_task_list dl dt:nth-of-type(2), .tip_task_list dl dd:nth-of-type(2){
-    width: 12%;
+
+.tip_task_list dl dt:nth-of-type(2), .tip_task_list dl dd:nth-of-type(2) {
+    width: 18%;
+    text-indent: 5px;
 }
-.tip_task_list dl dt:nth-of-type(3), .tip_task_list dl dd:nth-of-type(3){
-    width: 28%;
+
+.tip_task_list dl dt:nth-of-type(3), .tip_task_list dl dd:nth-of-type(3) {
+    width: 11%;
 }
-.tip_task_list dl dt:nth-of-type(4), .tip_task_list dl dd:nth-of-type(4){
-    width: 28%;
+
+.tip_task_list dl dt:nth-of-type(4), .tip_task_list dl dd:nth-of-type(4) {
+    width: 25%;
 }
-.tip_task_list dl dt:nth-of-type(5), .tip_task_list dl dd:nth-of-type(5){
-    width: 13%;
+
+.tip_task_list dl dt:nth-of-type(5), .tip_task_list dl dd:nth-of-type(5) {
+    width: 25%;
+}
+
+.tip_task_list dl dt:nth-of-type(6), .tip_task_list dl dd:nth-of-type(6) {
+
 }
-.tip_task_list dl.service{
+.tip_task_list dl dd:nth-of-type(1) a {
+    color: #3c3c3c;
+    text-decoration: underline;
+    font-size: 12px;
+}
+
+.tip_task_list dl.service {
     color: blue;
 }
-.tip_task_list dl.service.destroy{
+
+.tip_task_list dl.service.destroy {
     color: red;
 }
-.tip_task_list dl.service.temp_add{
+.tip_task_list dl.service.temp_add {
     color: #9C27B0;
 }
-.tip_task_list dl span{
+.tip_task_list dl span {
     margin: 0;
     width: auto;
 }
-ul.left_tabs_lg{
+ul.left_tabs_lg {
     border: 1px solid #efeded;
     height: 100%;
     background: #fafafa;
 }
-ul.left_tabs_lg li{
+ul.left_tabs_lg li {
     line-height: 40px;
     font-size: 15px;
 }
-#schedule-addsch-modal .uk-modal-footer{
+#schedule-addsch-modal .uk-modal-footer {
     border-top: none;
     background: none;
 }
-.ct_line_lp_badge{
+.ct_line_lp_badge {
     float: left;
     margin-top: 6px;
     background: #e0e0e0;
@@ -1174,94 +1194,111 @@ ul.left_tabs_lg li{
     border-radius: 3px;
 }
-.uk-badge.sch_ldks{
+.uk-badge.sch_ldks {
     background: #8c8c8c;
-    background-image: linear-gradient(to bottom,#a7a7a7,#8c8c8c);
+    background-image: linear-gradient(to bottom, #a7a7a7, #8c8c8c);
 }
-.ct_layer_modal{
+.ct_layer_modal {
     background: #e5e5e5;
     height: 100%;
     width: 100%;
     overflow: auto;
 }
-.layui-layer-setwin{
+.layui-layer-setwin {
 }
-.device_config_table dl dt:nth-of-type(1), .device_config_table dl dd:nth-of-type(1){
+.device_config_table dl dt:nth-of-type(1), .device_config_table dl dd:nth-of-type(1) {
     width: 7%;
     text-indent: 10px;
 }
-.device_config_table dl dt:nth-of-type(2), .device_config_table dl dd:nth-of-type(2){
+
+.device_config_table dl dt:nth-of-type(2), .device_config_table dl dd:nth-of-type(2) {
     width: 7%;
 }
-.device_config_table dl dt:nth-of-type(3), .device_config_table dl dd:nth-of-type(3){
+
+.device_config_table dl dt:nth-of-type(3), .device_config_table dl dd:nth-of-type(3) {
     width: 8%;
 }
-.device_config_table dl dt:nth-of-type(4), .device_config_table dl dd:nth-of-type(4){
+
+.device_config_table dl dt:nth-of-type(4), .device_config_table dl dd:nth-of-type(4) {
     width: 5%;
 }
-.device_config_table dl dt:nth-of-type(5), .device_config_table dl dd:nth-of-type(5){
+
+.device_config_table dl dt:nth-of-type(5), .device_config_table dl dd:nth-of-type(5) {
     width: 4%;
 }
-.device_config_table dl dt:nth-of-type(6), .device_config_table dl dd:nth-of-type(6){
+
+.device_config_table dl dt:nth-of-type(6), .device_config_table dl dd:nth-of-type(6) {
     width: 4%;
 }
-.device_config_table dl dt:nth-of-type(7), .device_config_table dl dd:nth-of-type(7){
+
+.device_config_table dl dt:nth-of-type(7), .device_config_table dl dd:nth-of-type(7) {
     width: 4%;
 }
-.device_config_table dl dt:nth-of-type(8), .device_config_table dl dd:nth-of-type(8){
+
+.device_config_table dl dt:nth-of-type(8), .device_config_table dl dd:nth-of-type(8) {
     width: 5%;
 }
-.device_config_table dl dt:nth-of-type(9), .device_config_table dl dd:nth-of-type(9){
+
+.device_config_table dl dt:nth-of-type(9), .device_config_table dl dd:nth-of-type(9) {
     width: 5%;
 }
-.device_config_table dl dt:nth-of-type(10), .device_config_table dl dd:nth-of-type(10){
+
+.device_config_table dl dt:nth-of-type(10), .device_config_table dl dd:nth-of-type(10) {
     width: 8%;
 }
-.device_config_table dl dt:nth-of-type(11), .device_config_table dl dd:nth-of-type(11){
+
+.device_config_table dl dt:nth-of-type(11), .device_config_table dl dd:nth-of-type(11) {
     width: 5%;
 }
-.device_config_table dl dt:nth-of-type(12), .device_config_table dl dd:nth-of-type(12){
+
+.device_config_table dl dt:nth-of-type(12), .device_config_table dl dd:nth-of-type(12) {
     width: 5%;
 }
-.device_config_table dl dt:nth-of-type(13), .device_config_table dl dd:nth-of-type(13){
+
+.device_config_table dl dt:nth-of-type(13), .device_config_table dl dd:nth-of-type(13) {
     width: 4%;
 }
-.device_config_table dl dt:nth-of-type(14), .device_config_table dl dd:nth-of-type(14){
+
+.device_config_table dl dt:nth-of-type(14), .device_config_table dl dd:nth-of-type(14) {
     width: 4%;
 }
-.device_config_table dl dt:nth-of-type(15), .device_config_table dl dd:nth-of-type(15){
+
+.device_config_table dl dt:nth-of-type(15), .device_config_table dl dd:nth-of-type(15) {
     width: 4%;
 }
-.device_config_table dl dt:nth-of-type(16), .device_config_table dl dd:nth-of-type(16){
+
+.device_config_table dl dt:nth-of-type(16), .device_config_table dl dd:nth-of-type(16) {
     width: 3%;
 }
-.device_config_table dl dt:nth-of-type(17), .device_config_table dl dd:nth-of-type(17){
+
+.device_config_table dl dt:nth-of-type(17), .device_config_table dl dd:nth-of-type(17) {
     width: 4%;
 }
-.device_config_table dl dt:nth-of-type(18), .device_config_table dl dd:nth-of-type(18){
+
+.device_config_table dl dt:nth-of-type(18), .device_config_table dl dd:nth-of-type(18) {
     width: 13%;
 }
-.uk-tooltip{
+.uk-tooltip {
     z-index: 29999999 !important;
 }
 .device_config_table.ct_table dl dd,
-.device_config_table.ct_table dl dt{
+.device_config_table.ct_table dl dt {
     border-right: 1px solid #dedede !important;
 }
-.device_configs_manager .search_form{
+.device_configs_manager .search_form {
     text-indent: 12px;
     margin-bottom: 0;
     padding: 18px 5px;
 }
-.sub_task_form_v2{
+.sub_task_form_v2 {
     background: #f9f9f9;
     padding: 12px 15px;
     border-radius: 5px 0 5px 5px;
@@ -1270,7 +1307,7 @@ ul.left_tabs_lg li{
     margin-bottom: 20px;
 }
-.task_form_close_icon{
+.task_form_close_icon {
     background: #f9f9f9;
     padding: 0px 4px;
     position: absolute;
@@ -1285,41 +1322,41 @@ ul.left_tabs_lg li{
     transition: all .03s;
 }
-.task_form_close_icon:hover{
+.task_form_close_icon:hover {
     border: 1px solid #ff1515;
     border-left: none;
     border-bottom: none;
     color: #e03e3e;
 }
-.sub_task_form_v2:hover::after{
+.sub_task_form_v2:hover::after {
     color: #5f5b5b;
 }
-.sub_task_form_v2.uk-form-horizontal .uk-form-label{
+.sub_task_form_v2.uk-form-horizontal .uk-form-label {
     width: 80px;
 }
-.sub_task_form_v2.uk-form-horizontal .uk-form-controls{
+.sub_task_form_v2.uk-form-horizontal .uk-form-controls {
     margin-left: 85px;
 }
 .sub_task_form_v2.uk-form-horizontal .uk-form-controls input[type=text],
 .sub_task_form_v2.uk-form-horizontal .uk-form-controls input[type=time],
-.sub_task_form_v2.uk-form-horizontal .uk-form-controls select{
+.sub_task_form_v2.uk-form-horizontal .uk-form-controls select {
     width: 100%;
 }
-#add-sub-task-main-modal .uk-modal-footer{
+#add-sub-task-main-modal .uk-modal-footer {
     background: none;
     border-top: none;
 }
-#add-sub-task-main-modal .uk-grid+.uk-grid{
+#add-sub-task-main-modal .uk-grid + .uk-grid {
     margin-top: 12px;
 }
-#add-sub-task-main-modal .plus_icon_span{
+#add-sub-task-main-modal .plus_icon_span {
     font-size: 26px;
     color: #b2b2b2;
     padding: 10px 64px;
@@ -1330,26 +1367,26 @@ ul.left_tabs_lg li{
     cursor: pointer;
 }
-#add-sub-task-main-modal .uk-animation-fade{
+#add-sub-task-main-modal .uk-animation-fade {
     animation-duration: .3s;
 }
-#add-sub-task-main-modal .forms{
-    max-height: 488px;
+#add-sub-task-main-modal .forms {
+    max-height: 642px;
     overflow-y: auto;
     overflow-x: hidden;
     padding: 8px 8px 0 0;
 }
-.add_custom_wrap .forms .sub_task_form_v2:last-child{
+.add_custom_wrap .forms .sub_task_form_v2:last-child {
     margin-bottom: 0;
 }
-.sub_task_form_v2.destroy_form{
+.sub_task_form_v2.destroy_form {
     background-color: #fff5f4 !important;
 }
-.uk-form>.half_change_car_box{
+.uk-form > .half_change_car_box {
     margin: -10px 0 15px;
     padding: 3px 5px;
     display: inline-block;
@@ -1357,29 +1394,29 @@ ul.left_tabs_lg li{
     color: #918f8f;
 }
-.half_change_car_box input[type=checkbox]{
+.half_change_car_box input[type=checkbox] {
     vertical-align: top;
 }
-.uk-form>.half_change_car_box.active{
+.uk-form > .half_change_car_box.active {
     background: #4CAF50;
     color: #fff;
 }
-.uk-form>.half_change_car_box.active input[type=checkbox]{
+.uk-form > .half_change_car_box.active input[type=checkbox] {
     background: #4caf50;
     border-color: #4caf50;
 }
-.uk-form>.half_change_car_box.active input[type=checkbox]:before{
+.uk-form > .half_change_car_box.active input[type=checkbox]:before {
     color: #ffffff;
 }
-.sub_task_form_v2.change_car{
+.sub_task_form_v2.change_car {
     z-index: 99;
 }
-.st_range_top_form{
+.st_range_top_form {
     padding: 0 0 15px 5px;
     border: 1px solid #c4bb76;
     background: #e5e1c1;
@@ -1387,46 +1424,46 @@ ul.left_tabs_lg li{
     box-shadow: 0px 4px 3px 0 rgba(142, 138, 138, 0.2), 0px 4px 5px 0 rgba(157, 156, 156, 0.19);
 }
-.st_range_top_form .uk-form-row{
+.st_range_top_form .uk-form-row {
     margin-top: 20px;
 }
-.uk-form-horizontal.st_range_top_form .uk-form-label{
+.uk-form-horizontal.st_range_top_form .uk-form-label {
     width: 80px;
 }
-.uk-form-horizontal.st_range_top_form .uk-form-controls{
+.uk-form-horizontal.st_range_top_form .uk-form-controls {
     margin-left: 84px;
 }
-.uk-form-horizontal.st_range_top_form .uk-form-controls select{
+.uk-form-horizontal.st_range_top_form .uk-form-controls select {
     width: calc(100% - 2px);
 }
-.sub_task_form_v2.service_st_form{
+.sub_task_form_v2.service_st_form {
     background: #f4faff;
 }
-.uk-modal  .uk-form.fv-form.sub_task_form_v2{
+.uk-modal .uk-form.fv-form.sub_task_form_v2 {
     margin-bottom: 20px !important;
 }
-.sub_task_table_wrap .ct_table>.ct_table_body{
+.sub_task_table_wrap .ct_table > .ct_table_body {
     border-bottom: none;
 }
-.err_panel{
+.err_panel {
     font-size: 12px;
     color: #7e7d7d;
     font-family: 微软雅黑;
     margin-top: 5px;
 }
-#schedule-lp_change-modal .ct_table dl{
+#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{
+#schedule-lp_change-modal .ct_table dl dd, #schedule-lp_change-modal .ct_table dl dt {
     line-height: 35px;
 }
@@ -1442,7 +1479,7 @@ ul.left_tabs_lg li{
     font-weight: 600;
 }*/
-.sub_task_form_v2:before{
+.sub_task_form_v2:before {
     position: absolute;
     top: -7px;
     font-size: 12px;
@@ -1451,19 +1488,19 @@ ul.left_tabs_lg li{
     line-height: 14px;
 }
-.sub_task_form_v2.destroy_form:before{
+.sub_task_form_v2.destroy_form:before {
     content: '烂班' !important;
     color: #f14235 !important;
     background: #ffffff !important;
 }
-.sub_task_form_v2.service_form:before{
+.sub_task_form_v2.service_form:before {
     content: '营运';
     color: #2196F3;
     background: #ffffff;
 }
-.sub_task_form_v2.service_form.temp_service:before{
+.sub_task_form_v2.service_form.temp_service:before {
     content: '营运 (临加)';
     color: #9C27B0;
     background: #ffffff;
@@ -1473,13 +1510,13 @@ ul.left_tabs_lg li{
     background: #faf0fd;
 }
-.sub_task_form_v2.empty_form:before{
+.sub_task_form_v2.empty_form:before {
     content: '空驶';
     color: #928f92;
     background: #ffffff;
 }
-.sub_task_form_v2.service_form{
+.sub_task_form_v2.service_form {
     background: #f4faff;
 }
@@ -1490,52 +1527,52 @@ ul.left_tabs_lg li{
 .sub_task_form_v2.repeat_main{
     background: #f4faff;
 }*/
-.footer_tools{
+.footer_tools {
     position: absolute;
     left: 235px;
     bottom: 19px;
 }
-.footer_mileage_count{
+.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{
+.footer_mileage_count > span {
     padding: 2px 5px;
 }
-.footer_mileage_count>span.service_sum{
+.footer_mileage_count > span.service_sum {
     color: #2196F3;
 }
-.footer_mileage_count>span.empty_sum{
+.footer_mileage_count > span.empty_sum {
     color: #636363;
 }
-.footer_mileage_count>span.destroy_sum{
+.footer_mileage_count > span.destroy_sum {
     color: #f5574b;
 }
-.station_to_park_link{
+.station_to_park_link {
     display: inline-block;
     margin-left: 15px;
     vertical-align: bottom;
     font-size: 12px;
 }
-.station_to_park_link>a{
+.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{
+#station_to_park-modal.ct-form-modal form select {
     width: auto;
 }
-.s_2_park_form_wrap{
+.s_2_park_form_wrap {
     background: #fafafa;
     border: 1px solid #e5e5e5;
     padding: 7px 16px;
@@ -1543,7 +1580,7 @@ ul.left_tabs_lg li{
     position: relative;
 }
-.s_2_park_form_wrap .ct_close{
+.s_2_park_form_wrap .ct_close {
     position: absolute;
     top: -12px;
     padding: 0 4px;
@@ -1554,42 +1591,42 @@ ul.left_tabs_lg li{
     cursor: pointer;
 }
-.s_2_park_form_wrap .ct_close:hover{
+.s_2_park_form_wrap .ct_close:hover {
     background: #e5e5e5;
     color: #fd6e6e;
 }
-.s_2_park_form_wrap label{
+.s_2_park_form_wrap label {
     color: #666;
     font-size: 13px;
 }
-#station_to_park-modal.ct-form-modal form input[readonly]{
+#station_to_park-modal.ct-form-modal form input[readonly] {
     background: #fafafa;
 }
-.s_2_park_form_wrap .bottom_label{
+.s_2_park_form_wrap .bottom_label {
     margin-top: 25px;
     display: block;
 }
-.s_2_park_form_wrap .bottom_label_2{
+.s_2_park_form_wrap .bottom_label_2 {
     margin-top: 4px;
     display: block;
 }
-.ct_describe{
+.ct_describe {
     font-size: 12px;
     color: #909090;
     font-family: FontAwesome;
 }
-.ct_describe:before{
+.ct_describe:before {
     content: "\f059";
     margin-right: 3px;
 }
-#add-sub-task-main-modal abbr{
+#add-sub-task-main-modal abbr {
     display: inline-block;
     font-size: 12px;
     margin-left: 25px;
@@ -1597,15 +1634,17 @@ ul.left_tabs_lg li{
     color: #929292;
 }
-#all-devices-modal .search-form input[type=text]{
+#all-devices-modal .search-form input[type=text] {
     width: 100px;
 }
-#all-devices-modal .auto-refresh{
-    vertical-align: middle;margin-left: 5px;color: grey;
+#all-devices-modal .auto-refresh {
+    vertical-align: middle;
+    margin-left: 5px;
+    color: grey;
 }
-#all-devices-modal .auto-refresh.active{
+#all-devices-modal .auto-refresh.active {
     color: #405dff;
 }
@@ -1613,7 +1652,7 @@ ul.left_tabs_lg li{
     margin-top: 0 !important;
 }
-#history-sch-maintain-modal .add_lp_link{
+#history-sch-maintain-modal .add_lp_link {
     display: inline-block;
     vertical-align: bottom;
     margin-left: 15px;
@@ -1621,107 +1660,107 @@ ul.left_tabs_lg li{
     font-size: 13px;
 }
-#schedule-tzrc-modal input[type=checkbox]{
+#schedule-tzrc-modal input[type=checkbox] {
     margin-right: 9px;
 }
-#schedule-tzrc-modal span.ct_zt_yzx{
+#schedule-tzrc-modal span.ct_zt_yzx {
     color: #2196F3;
     font-size: 12px;
 }
-#schedule-tzrc-modal span.ct_zt_lb{
+#schedule-tzrc-modal span.ct_zt_lb {
     color: red;
     font-size: 12px;
 }
-#schedule-tzrc-modal span.ct_zt_zzzx{
+#schedule-tzrc-modal span.ct_zt_zzzx {
     font-size: 12px;
     color: #38ad3c;
 }
-#schedule-tzrc-modal .tzrc_form{
+#schedule-tzrc-modal .tzrc_form {
     padding: 20px;
     border: 1px solid #f0eded;
-    box-shadow: 0px -3px 15px rgba(0,0,0,0.08);
+    box-shadow: 0px -3px 15px rgba(0, 0, 0, 0.08);
     background: #f9f9f9;
 }
-.uk-panel.ct_search_panel{
+.uk-panel.ct_search_panel {
     padding: 15px;
     border: 1px solid #f0eded;
-    box-shadow: 0px 3px 15px rgba(0,0,0,0.08);
+    box-shadow: 0px 3px 15px rgba(0, 0, 0, 0.08);
     background: #f9f9f9;
 }
 .sch-tzrc-table.ct_table dl.active,
-.sch-tzrc-table.ct_table>.ct_table_body dl.active:hover{
+.sch-tzrc-table.ct_table > .ct_table_body dl.active:hover {
     background: #5bd460;
     color: white;
 }
-#schedule-tzrc-modal dl.active span.ct_zt_yzx{
+#schedule-tzrc-modal dl.active span.ct_zt_yzx {
     color: #545252;
 }
-#schedule-tzrc-modal dl.active span.ct_zt_lb{
+#schedule-tzrc-modal dl.active span.ct_zt_lb {
     color: #d64949;
 }
-#schedule-tzrc-modal dl.active span.ct_zt_zzzx{
+#schedule-tzrc-modal dl.active span.ct_zt_zzzx {
     color: white;
 }
-#schedule-tzrc-modal dl.active input[type=checkbox]{
+#schedule-tzrc-modal dl.active input[type=checkbox] {
     border: 0;
 }
-#schedule-tzrc-modal dl.active input[type=checkbox]:before{
+#schedule-tzrc-modal dl.active input[type=checkbox]:before {
     color: #ffffff;
 }
-.sch-search-autocom input{
+.sch-search-autocom input {
     padding: 0 !important;
     height: 100% !important;
 }
-label.blue_checkbox{
+label.blue_checkbox {
     margin-left: 12px;
 }
-label.blue_checkbox>input{
+label.blue_checkbox > input {
     width: 17px !important;
     height: 17px !important;
 }
-label.blue_checkbox>input:checked:before,
-label.blue_checkbox>input:indeterminate:before{
+label.blue_checkbox > input:checked:before,
+label.blue_checkbox > input:indeterminate:before {
     line-height: 15px !important;
 }
-dd.disabled{
+dd.disabled {
     color: #b5b3b3;
 }
-dl.active>dd.disabled{
+dl.active > dd.disabled {
     color: #ececec;
 }
-#change_user_options-modal .user_info{
+#change_user_options-modal .user_info {
     width: 360px;
     margin: auto;
 }
-.display_hide{
+.display_hide {
     display: none;
 }
-.ct_eye_icon{
+.ct_eye_icon {
     font-size: 16px;
     cursor: pointer;
 }
-.ct_eye_icon.active{
+.ct_eye_icon.active {
     color: #444;
 }
@@ -1730,7 +1769,7 @@ dl.active&gt;dd.disabled{
     height: 16px;
 }
-.range_2_normal_tt{
+.range_2_normal_tt {
     margin-bottom: 15px;
     border-top: 1px dashed #c7c7c7;
     color: #a6a6a6;
@@ -1738,7 +1777,7 @@ dl.active&gt;dd.disabled{
     padding-bottom: 5px;
 }
-.cancel_link{
+.cancel_link {
     font-size: 12px;
     margin-left: 15px;
     vertical-align: bottom;
@@ -1748,7 +1787,7 @@ dl.active&gt;dd.disabled{
     right: 0;
 }
-.edit_link{
+.edit_link {
     font-size: 12px;
     margin-left: 15px;
     vertical-align: bottom;
@@ -1769,7 +1808,7 @@ dl.active&gt;dd.disabled{
     min-height: 40px;
 }
-.c_b_abnorm_notice:before{
+.c_b_abnorm_notice:before {
     content: "-超速报警-";
     color: #000000;
     font-size: 12px;
@@ -1790,14 +1829,201 @@ dl.active&gt;dd.disabled{
     cursor: pointer;
 }
-.c_b_abnorm_notice>.c_b_item:first-child{
+.c_b_abnorm_notice > .c_b_item:first-child {
     margin-top: 20px;
 }
-.c_b_item.over{
+.c_b_item.over {
     color: grey;
 }
-.c_b_item>span.c_b_over{
+.c_b_item > span.c_b_over {
     float: right;
+}
+
+.mileage_elec_panel {
+    position: absolute;
+    width: 100%;
+    /*height: 90px;*/
+    z-index: 1;
+    background: white;
+    bottom: 0px;
+    box-shadow: 1px 0px 15px rgba(90, 90, 90, 0.48);
+    padding: 9px 15px;
+    border-radius: 0 5px;
+    color: #000;
+
+    display: none;
+}
+
+.mileage_elec_panel ._title {
+    margin: 5px 3px;
+    font-size: 15px;
+}
+
+.mileage_elec_panel .LD_item {
+    margin: 5px 0;
+    font-family: 微软雅黑;
+}
+
+.mileage_elec_panel .LD_item > span {
+    padding: 3px;
+    display: inline-block;
+    width: 85px;
+}
+
+.mileage_elec_panel .lp_name {
+    padding: 0 5px;
+    background: #f2f2f2;
+    border-radius: 15px
+}
+
+.mileage_elec_panel .LD_item > span > a {
+    color: #000;
+}
+
+.mileage_elec_panel .LD_item > span:nth-of-type(1) > a {
+    color: blue;
+}
+
+/*.mileage_elec_panel .LD_item>span:nth-of-type(2)>a{
+    color: #fa3a2c;
+}
+
+.mileage_elec_panel .LD_item>span:nth-of-type(3)>a{
+    color: #515151;
+}*/
+
+.mileage_elec_panel hr {
+    height: 1px;
+    border: none;
+    border-top: 1px dashed #b5b5b5;
+}
+
+#edit-sub-task-main-modal .sub_task_form_v2.uk-form-horizontal .uk-form-label {
+    width: 70px;
+}
+
+#edit-sub-task-main-modal .sub_task_form_v2.uk-form-horizontal .uk-form-controls {
+    margin-left: 75px;
+}
+
+#edit-sub-task-main-modal .sub_task_form_v2 .uk-grid + .uk-grid,
+#edit-sub-task-main-modal .sub_task_form_v2 .uk-grid-margin,
+#edit-sub-task-main-modal .sub_task_form_v2 .uk-grid > * > .uk-panel + .uk-panel {
+    margin-top: 22px;
+}
+
+.c_task_mileage_abnormal,
+.c_task_mileage_abnormal .ct_table > .ct_table_head dl,
+.c_task_mileage_abnormal .ct_table dl {
+    background: #ffe7e7 !important;
+}
+
+.tip_task_count_dl {
+    width: calc(100% + 22px) !important;
+    margin-left: -11px !important;
+    border-top: 1px solid #e6e6e6 !important;
+}
+
+.tip_task_count_dl > dd:last-child {
+    width: calc(100% - 50px) !important;
+    border-right: 0 !important;
+    height: 35px !important;
+    background: #f3f3f3;
+    margin-bottom: -3px;
+}
+
+.tip_task_count_dl > dd:nth-of-type(1) {
+    text-align: center;
+    border-right: 0 !important;
+    width: 48px !important;
+}
+
+.tip_task_count_dl > dd:nth-of-type(1) > i {
+    padding: 6px;
+    cursor: pointer;
+}
+
+.tip_task_count_dl > dd:nth-of-type(1) > i:hover {
+    background: #ebebeb;
+}
+
+.tip_task_count_dl.c_task_error > dd:last-child {
+    background: #ff8a81;
+}
+
+.tip_task_count_dl > dd > span {
+    font-size: 13px;
+    color: #000;
+    height: 55px;
+    display: inline-block;
+    padding: 7px 0;
+    border-radius: 0;
+    text-indent: 12px;
+}
+
+.tip_task_list > dl:nth-last-child(2) {
+    border-bottom: 0 !important;
+}
+
+.c_task_mileage_error {
+    border: 1px solid rgba(218, 13, 13, 0.2);
+    border-bottom-color: rgba(213, 37, 37, 0.3);
+    background-image: -webkit-linear-gradient(top, #ff6155, #F44336);
+}
+
+.uk-badge.c_task.c_task_mileage_error:hover:hover {
+    background-image: none;
+    background: #ff6155;
+    border: 1px solid rgba(213, 37, 37, 0.3);
+}
+
+.grey_link {
+    color: #adabab;
+}
+
+#sch_car_info_all-modal tr.ct_active {
+    -moz-animation: twinkle_bg .9s ease-in-out;
+    -webkit-animation: twinkle_bg .9s ease-in-out;
+}
+
+#sch_car_info_all-modal .uk-table-hover tr:hover{
+    background: #dddddd;
+}
+
+@-moz-keyframes twinkle_bg {
+    0% {
+        background: rgba(254, 235, 69, 0.38);
+    }
+    25% {
+        background: rgba(254, 235, 69, 0.7);
+    }
+    50% {
+        background: rgba(254, 235, 69, 0.3);
+    }
+    75% {
+        background: rgba(254, 235, 69, 0.7);
+    }
+    100% {
+        background: rgba(254, 235, 69, 0.38);
+    }
+}
+
+@-webkit-keyframes twinkle_bg {
+    0% {
+        background: rgba(254, 235, 69, 0.38);
+    }
+    25% {
+        background: rgba(254, 235, 69, 0.7);
+    }
+    50% {
+        background: rgba(254, 235, 69, 0.3);
+    }
+    75% {
+        background: rgba(254, 235, 69, 0.7);
+    }
+    100% {
+        background: rgba(254, 235, 69, 0.38);
+    }
 }
 \ No newline at end of file
@@ -3,6 +3,7 @@
         <div class="tl-tip-panel">
             <div class="tip_task_list">
                 <dl>
+                    <dt>操作</dt>
                     <dt>类型</dt>
                     <dt>里程</dt>
                     <dt>起点</dt>
@@ -11,6 +12,7 @@
                 </dl>
                 {{each tasks as t i}}
                 <dl class="{{t.mileageType}} {{if t.destroy}}destroy{{/if}} {{if t.type1=='临加'}}temp_add{{/if}}">
+                    <dd><a data-line="{{sch.xlBm}}" data-id="{{t.id}}" data-schid="{{sch.id}}" class="tip_task_edit_link">编辑</a></dd>
                     <dd>
                         {{if t.mileageType=="service"}}
                             营运
@@ -35,6 +37,14 @@
                     <dd title="{{t.remarks}}">{{t.remarks}}</dd>
                 </dl>
                 {{/each}}
+                <dl class="tip_task_count_dl {{if sch.c_t_mileage_status==-1}}c_task_error{{/if}}" >
+                    <dd><i class="uk-icon-plus badge_tip_add_icon" data-line="{{sch.xlBm}}" data-schid="{{sch.id}}"></i></dd>
+                    <dd>
+                        <span>计划：{{sch.jhlcOrig}}</span>
+                        <span>营运+烂班：{{serviceCount}}</span>
+                        <span>空驶：{{emptyCount}}</span>
+                    </dd>
+                </dl>
             </div>
         </div>
     </script>
+<div class="uk-modal ct_move_modal" id="sch_car_info_all-modal">
+    <div class="uk-modal-dialog" style="width: 1080px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+
+        <div class="uk-modal-header">
+            <h2>1006路 -全部车辆</h2></div>
+
+        <table class="uk-table uk-table-hover" style="table-layout: fixed;">
+            <thead>
+                <tr>
+                    <th style="width: 10%;">车辆</th>
+                    <th style="width: 10%;">设备号</th>
+                    <th style="width: 16%;">位置</th>
+                    <th style="width: 14%;">车载线路编码</th>
+                    <th style="width: 13%;">当前执行任务</th>
+                    <th style="width: 7%;">状态</th>
+                    <th style="width: 19%">最后gps时间</th>
+                    <th>请求出场</th>
+                </tr>
+            </thead>
+            <tbody>
+            </tbody>
+        </table>
+    </div>
+
+    <script id="sch_car_info_all-temp" type="text/html">
+        {{each list as obj i}}
+            <tr data-nbbm="{{obj.nbbm}}">
+                <td>{{obj.nbbm}}</td>
+                <td>{{obj.device}}</td>
+                <td>{{obj.loc}}</td>
+                <td>{{obj.lineCodeRealStr}}</td>
+                <td><a class="exec_sch_link" data-id="{{obj.schId}}">{{obj.exec}}</a></td>
+                <td><a class="{{if obj.status!='在线'}}grey_link{{/if}}">{{obj.status}}</a></td>
+                <td class="{{if obj.status!='在线'}}grey_link{{/if}}">
+                    {{obj.timeStr}}
+
+                    {{if obj.formNow!=null}}
+                        <small>（{{obj.formNow}}）</small>
+                    {{/if}}
+                </td>
+                <td>{{obj.qqccTimeStr}}</td>
+            </tr>
+        {{/each}}
+    </script>
+    <script>
+        (function () {
+            var modal = '#sch_car_info_all-modal', lineCode, nbbm;
+
+            $(modal).on('init', function(e, data) {
+                e.stopPropagation();
+                lineCode = data.lineCode;
+                nbbm = data.nbbm;
+
+                jsDoQuery(function () {
+                    var $cell = $('tr[data-nbbm='+nbbm+']', modal);
+                    //定位到行
+                    $(modal).animate({
+                        scrollTop: $cell.offset().top - $(modal).offset().top + $(modal).scrollTop()
+                    }, 500, function () {
+                        $cell.addClass('ct_active');
+                    });
+                    timer = setTimeout(fixedRefreshData, t + 500);
+                });
+            });
+
+            var timer, t = 12*1000;
+            var fixedRefreshData = function () {
+                (function () {
+                    var f = arguments.callee;
+                    jsDoQuery(function () {
+                        timer = setTimeout(f, t);
+                    });
+                })();
+            };
+
+            $(modal).on('hide.uk.modal', function () {
+                clearTimeout(timer);
+                timer = null;
+            });
+
+            var jsDoQuery = function (cb) {
+                gb_common.$get('/gps/allCarsByLine', {lineCode: lineCode}, function (rs) {
+                    $.each(rs.list, function () {
+                        if(this['lineCodeReal'])
+                            this['lineCodeRealStr'] = this['lineCodeReal'] + '/' + gb_data_basic.lineCode2NameAll()[this['lineCodeReal']];
+                        else
+                            this['lineCodeRealStr'] = '';
+                        if(this['gpsTs']){
+                            this['timeStr'] = moment(this['gpsTs']).format('MM/DD HH:mm:ss');
+                            this['formNow'] = moment(this['gpsTs']).fromNow();
+                        }
+                        if(this['qqcc'])
+                            this['qqccTimeStr'] = moment(this['qqcc']).format('HH:mm');
+                    });
+
+                    rs.list.sort(function (a, b) {
+                        if(!a.nbbm)
+                            return -1;
+                        if(!b.nbbm)
+                            return 1;
+                        return a.nbbm.localeCompare(b.nbbm);
+                    });
+                    var htmlStr = template('sch_car_info_all-temp', {list: rs.list});
+
+                    $('table>tbody', modal).html(htmlStr);
+
+                    cb && cb();
+                });
+            };
+
+            $(modal).on('click', 'a.exec_sch_link', function () {
+                var id = $(this).data('id');
+                if(!id)
+                    return;
+                gb_schedule_table.scroToDl({id: id, xlBm:lineCode});
+            });
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -205,29 +205,6 @@
                         notify_err("当前操作需要选择调整原因！");
                         return;
                     }
-
-                    //里程有修改
-                    //if(data.jhlc != sch.jhlc && data.jhlc != 0){
-
-                        /*var confHtml = '<h4 style="color: #c04c4c;margin-bottom: 9px;">确认要将班次里程由'+sch.jhlc+' 修改为'+data.jhlc+' </h4><small>备注：</small>';
-                        UIkit.modal.prompt(confHtml, data.remarks, function(remarks){
-                            if(remarks){
-                                //在这里写操作日志
-
-                                //提交
-                                postData(data);
-                            }
-                            else{
-                                notify_err('失败，你必须填写备注！');
-                            }
-                        }, {
-                            labels: {
-                                Ok: '确定修改公里并保存',
-                                Cancel: '取消'
-                            }
-                        });*/
-                    //}
-                    //else
                     postData(data);
                 });
@@ -238,6 +215,8 @@
                         notify_succ('操作成功!');
                         //计算应发未发
                         gb_schedule_table.calc_yfwf_num(sch.xlBm);
+                        //更新路牌公里统计面板
+                        gb_schedule_table.showLpMileageTipBySch(sch);
                     });
                 };
@@ -110,7 +110,7 @@
                 {{/if}}
                 {{if sch.cTasks.length > 0}}
-                <span class="uk-badge uk-badge-notification">{{sch.cTasks.length}}</span>
+                <span class="uk-badge uk-badge-notification {{if sch.c_t_mileage_status==-1}}c_task_mileage_error{{/if}}">{{sch.cTasks.length}}</span>
                 {{/if}}
             </dd>
             <dd>{{sch.zdsj}}</dd>
@@ -153,13 +153,13 @@
     </script>
     <script id="sub_task-fail-status-temp" type="text/html">
-        <div class="child-task-status fail"><i class="uk-icon-times-circle"></i> 营运里程 与主任务不符，请检查子任务
+        <div class="child-task-status fail"><i class="uk-icon-times-circle"></i> 子任务营运公里与计划不平
             <span class="calc-detail">{{calcs}}</span></div>
     </script>
     <script>
         (function () {
-            var modal_opts = {center: false, bgclose: false, modal: false}
+            var modal_opts = {center: false, bgclose: false, modal: false};
             var modal = '#schedule-lj_zrw-modal',
                     f,
                     m_t_body = '.main-schedule-table .ct_table_body',
@@ -274,26 +274,29 @@
                 //检查子任务营运里程
                 $('#childTaskTitle .child-task-status', modal).remove();
-                var i = 0;
+                //var i = 0;
                 if (sch.cTasks.length == 0)
                     return;
-                var sum = 0, calcs = '';
+                var sum = 0, calcs = ' ';
                 $.each(sch.cTasks, function () {
                     if (this.mileageType == 'service') {
                         sum = gb_common.accAdd(sum, this.mileage);
                         calcs += (' + ' + this.mileage);
-                        i++;
+                        //i++;
                     }
                 });
                 //公里与主任务不符合
                 if (sum != sch.jhlcOrig) {
-                    if (i > 1)
-                        calcs += ('=' + sum);
+                    $('.uk-panel-box-secondary', modal).addClass('c_task_mileage_abnormal');
+                    /*if (i > 1)
+                        calcs += ('=' + sum);*/
                     calcs += (' ≠ ' + sch.jhlcOrig);
                     calcs = calcs.substr(3);
                     var htmlStr = template('sub_task-fail-status-temp', {calcs: calcs});
                     $('#childTaskTitle', modal).append(htmlStr);
                 }
+                else
+                    $('.uk-panel-box-secondary', modal).removeClass('c_task_mileage_abnormal');
             };
             //新增临加
@@ -323,10 +326,12 @@
                         gb_schedule_table.updateSchedule(rs.ts);
                         gb_schedule_table.deheteSchedule(rs.delete);
                         $('.main-schedule-table', modal).trigger('refresh');
+                        //更新路牌公里统计面板
+                        gb_schedule_table.showLpMileageTipBySch(sch);
                     });
                 }, '确定删除');
             };
-            //添加自定义子任务
+           /* //添加自定义子任务
             var add_sub_task_other = function () {
                 var sch = getActiveSch();
                 if (!sch)
@@ -376,8 +381,32 @@
                 open_modal(folder + '/sub_task/add_sub_task_range_turn.html', {
                     sch: sch
                 }, modal_opts);
-            };
+            };*/
+
+            //修改子任务
+            var edit_sub_task = function () {
+                var sch = getActiveSch();
+                if (!sch)
+                    return notify_err('无法获取到主任务信息！');
+                var activeDl = $(s_t_body, modal).find('dl.context-menu-active');
+                if (activeDl.length == 0)
+                    return;
+                var id = activeDl.data('id');
+                var cTask;
+                for(var i=0,obj;obj=sch.cTasks[i++];){
+                    if(obj.id==id){
+                        cTask = obj;
+                        break;
+                    }
+                }
+                //打开子任务修改modal
+                open_modal(folder + '/sub_task_v2/edit.html', {
+                    sch: sch,
+                    cTask: cTask
+                }, modal_opts);
+            };
+            
             //删除子任务
             var remove_sub_task = function () {
                 var activeDl = $(s_t_body, modal).find('dl.context-menu-active');
@@ -396,10 +425,12 @@
                             //选中班次
                             selectedDl(rs.t);
                         }, 300);
+                        //更新路牌公里统计面板
+                        gb_schedule_table.showLpMileageTipBySch(rs.t);
                     });
                 }, '确定删除');
             };
-            //加油
+            /*//加油
             var add_oil = function () {
                 var sch = getActiveSch();
                 if (!sch)
@@ -412,7 +443,7 @@
                 open_modal(folder + '/sub_task/add_sub_task_oil.html', {
                     sch: sch
                 }, modal_opts);
-            };
+            };*/
             var add_sub_task = function () {
                 var sch = getActiveSch();
@@ -429,14 +460,15 @@
             var callbackHandler = {
                 add_temp_sch: add_temp_sch,
                 remove_sch: remove_sch,
-                add_sub_task_other: add_sub_task_other,
-                add_sub_task_in: add_sub_task_in,
+                //add_sub_task_other: add_sub_task_other,
+                //add_sub_task_in: add_sub_task_in,
                 remove_sub_task: remove_sub_task,
-                add_sub_task_out: add_sub_task_out,
-                add_sub_task_range_turn: add_sub_task_range_turn,
-                add_oil: add_oil,
+                //add_sub_task_out: add_sub_task_out,
+                //add_sub_task_range_turn: add_sub_task_range_turn,
+                //add_oil: add_oil,
-                add_sub_task: add_sub_task
+                add_sub_task: add_sub_task,
+                edit_sub_task: edit_sub_task
             };
             //右键菜单
@@ -451,24 +483,7 @@
                         name: "临加班次"
                     },
                     "add_sub_task": {
-                        name: "添加子任务"/*,
-                        items: {
-                            'add_oil':{
-                                name: '空驶进出场'
-                            },
-                            'add_sub_task_in': {
-                                name: '进场'
-                            },
-                            'add_sub_task_out': {
-                                name: '出场'
-                            },
-                            'add_sub_task_range_turn': {
-                                name: '区间调头'
-                            },
-                            'add_sub_task_other': {
-                                name: '自定义'
-                            }
-                        }*/
+                        name: "添加子任务"
                     },
                     'remove_sch': {
                         name: '删除'
@@ -484,6 +499,10 @@
                     callbackHandler[key] && callbackHandler[key]();
                 },
                 items: {
+                    "edit_sub_task":{
+                        name: '修改子任务',
+                        icon: 'edit'
+                    },
                     "remove_sub_task": {
                         name: "删除子任务"
                         , icon: "delete"
@@ -44,7 +44,7 @@
                 //班次类型切换
                 if(bcTypeMap[sch.bcType])
-                    $('[name=type2]', f).val(bcTypeMap[sch.bcType])
+                    $('[name=type2]', f).val(bcTypeMap[sch.bcType]);
                 $('[name=type2]', f).trigger('change');
                 //滚动条到底
@@ -89,6 +89,9 @@
                             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();
+
+                            //更新路牌公里统计面板
+                            gb_schedule_table.showLpMileageTipBySch(sch);
                             return;
                         }
                         var data = dataArray[i];
@@ -289,6 +289,9 @@
                             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();
+
+                            //更新路牌公里统计面板
+                            gb_schedule_table.showLpMileageTipBySch(sch);
                             return;
                         }
                         var data = dataArray[i];
@@ -127,6 +127,9 @@
                         if (i >= dataArray.length) {
                             UIkit.modal('#add-sub-task-main-modal').hide();
                             $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: sch});
+
+                            //更新路牌公里统计面板
+                            gb_schedule_table.showLpMileageTipBySch(sch);
                             return;
                         }
                         var data = dataArray[i];
@@ -263,6 +263,9 @@
                             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();
+
+                            //更新路牌公里统计面板
+                            gb_schedule_table.showLpMileageTipBySch(sch);
                             return;
                         }
                         var data = dataArray[i];
+<div class="uk-modal ct_move_modal" id="edit-sub-task-main-modal">
+    <div class="uk-modal-dialog" style="width: 800px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>编辑子任务</h2></div>
+
+        <div class="forms">
+
+        </div>
+
+        <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
+            <a class="delete_link" style="vertical-align: bottom;display: inline-block;color: red;font-size: 13px;margin-right: 10px;">删除子任务</a>
+            <button type="button" class="uk-button uk-modal-close">取消</button>
+            <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+        </div>
+    </div>
+
+    <script id="sub-task-v2-edit-form-temp" type="text/html">
+        <form class="uk-form uk-form-horizontal sub_task_form_v2" style="background:#fff;">
+            <input type="hidden" value="{{sch.id}}" name="schedule.id" sch_id_inp>
+            <input type="hidden" value="正常" name="type1">
+            <input type="hidden" value="{{cTask.id}}" name="id">
+            <div class="uk-grid">
+                <div class="uk-width-1-3">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">班次类型</label>
+                        <div class="uk-form-controls">
+                            <select class="form-control nt-dictionary" data-code="-100" name="type2"
+                                    data-group=ChildTaskType></select>
+                        </div>
+                    </div>
+                </div>
+                <div class="uk-width-1-3">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">起点 </label>
+                        <div class="uk-form-controls">
+                            <select name="startStation" required></select>
+                        </div>
+                    </div>
+                </div>
+                <div class="uk-width-1-3">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">终点</label>
+                        <div class="uk-form-controls">
+                            <select name="endStation" required></select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="uk-grid">
+                <div class="uk-width-1-3">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">开始时间</label>
+                        <div class="uk-form-controls">
+                            <input name="startDate" value="{{cTask.startDate}}" type="time"
+                                   required>
+                        </div>
+                    </div>
+                </div>
+                <div class="uk-width-1-3">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">结束时间</label>
+                        <div class="uk-form-controls">
+                            <input name="endDate" value="{{cTask.endDate}}" type="time" required>
+                        </div>
+                    </div>
+                </div>
+                <div class="uk-width-1-3">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">公里</label>
+                        <div class="uk-form-controls">
+                            <input class="form-control" name="mileage" max=222 data-fv-lessthan-inclusive="false"
+                                   required style="width: 42%;" value="{{cTask.mileage}}">
+                            <select class="form-control nt-dictionary" required name="mileageType"
+                                    data-group="MileageType" style="width: 52%;"></select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="uk-grid">
+                <div class="uk-width-2-3 domains"></div>
+                <div class="uk-width-1-3">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">备注</label>
+                        <div class="uk-form-controls">
+                            <!--<select class="form-control nt-dictionary" required name="remarks"></select>-->
+                            <input class="form-control" value="{{cTask.remarks}}" name="remarks" data-fv-stringlength-max="50" data-fv-stringlength="true">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </script>
+
+    <script id="st-edit-domains-inout-form-temp" type="text/html">
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row" style="padding-top: 5px;">
+                    <label class="uk-form-label"></label>
+                    <div class="uk-form-controls">
+                        <label data-uk-tooltip title="无人售票线路，请忽略这个选项">
+                            <input type="checkbox" value=1 name="noClerk" class="i-cbox"> 无售票员
+                        </label>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2 destroy_reason_wrap">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">进出场原因</label>
+                    <div class="uk-form-controls">
+                        <select class="form-control" name="reason" required>
+                            <option value="">请选择...</option>
+                            {{each inOutExps as exp i}}
+                            <option value="{{exp}}">{{exp}}</option>
+                            {{/each}}
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </script>
+
+    <script id="st-edit-domains-service-form-temp" type="text/html">
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row" style="padding-top: 5px;">
+                    <label class="uk-form-label"></label>
+                    <div class="uk-form-controls">
+                        <label>
+                            <input type="checkbox" value=1 name="destroy" class="i-cbox"> 是否烂班
+                        </label>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2 destroy_reason_wrap" style="display: none;">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">烂班原因</label>
+                    <div class="uk-form-controls">
+                        <select class="form-control" name="reason" required>
+                            <option value="">请选择...</option>
+                            {{each adjustExps as exp i}}
+                            <option value="{{exp}}">{{exp}}</option>
+                            {{/each}}
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </script>
+    <script>
+        (function () {
+            var modal = '#edit-sub-task-main-modal', sch, cTask,
+                    stationRoutes,
+                    parks,
+                    information,
+                    st_park_data;
+
+            $(modal).on('init', function (e, data) {
+                e.stopPropagation();
+                sch = data.sch;
+                cTask = data.cTask;
+
+                //站到场数据
+                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;
+                }), 'directions');
+                //停车场
+                parks = gb_data_basic.simpleParksArray();
+                //线路标准
+                information = gb_data_basic.getLineInformation(sch.xlBm);
+                //停车场排序，常用的放前面
+                parks = sort_parks(parks, information, st_park_data);
+
+                var htmlStr = template('sub-task-v2-edit-form-temp', {sch: sch, cTask: cTask});
+                var f = $(htmlStr);
+                $('.forms', modal).append(f);
+                //字典转换
+                dictionaryUtils.transformDom($('.nt-dictionary', f));
+
+                //设置下拉框默认值
+                $f('type2', f).val(cTask.type2).trigger('change');//班次类型
+                $f('startStation', f).val(cTask.startStation);//起点站
+                $f('endStation', f).val(cTask.endStation);//终点站
+                $f('mileageType', f).val(cTask.mileageType);//里程类型
+                if(cTask.destroy)
+                    $f('destroy', f).trigger('click');//烂班
+                if(cTask.reason)
+                    $f('reason', f).val(cTask.reason);//原因
+                if(cTask.noClerk)
+                    $f('noClerk', f).trigger('click');//无售票员
+
+                f.formValidation({
+                    framework: 'uikit',
+                    locale: 'zh_CN'
+                });
+                $('button[type=submit]', modal).on('click', function () {
+                    f.formValidation('validate');
+                });
+
+                //提交
+                f.on('success.form.fv', function (e) {
+                    e.preventDefault();
+                    $('button[type=submit]', modal).attr('disabled', 'disabled');
+
+                    var data=$.extend(f.serializeJSON(), gb_common.getDisabledVal(f));
+
+                    gb_common.$post('/childTask/update', data, function (rs) {
+                        notify_succ('修改成功！');
+                        gb_schedule_table.updateSchedule(rs.t);
+
+                        UIkit.modal(modal).hide();
+                        $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: sch});
+
+                        //更新路牌公里统计面板
+                        gb_schedule_table.showLpMileageTipBySch(rs.t);
+                    });
+                });
+
+                f.on('err.field.fv', function () {
+                    $('button[type=submit]', modal).removeClass('disabled').removeAttr('disabled');
+                });
+            });
+
+            //班次类型切换事件
+            $(modal).on('change', 'select[name=type2]', reCalcInputs_type);
+            //烂班选项点击事件
+            $(modal).on('change', 'input[name=destroy]', destroyClick);
+            //进出场原因切换
+            $(modal).on('change', 'select[name=reason]', reSynchroReason);
+
+            /**
+             * 根据班次类型切换起终点下拉框
+             */
+            function reCalcInputs_type() {
+                var f = $(this).parents('.sub_task_form_v2');
+                var upDown = sch.xlDir;
+                if($('[name=upDown]', f).length>0)
+                    upDown = $('[name=upDown]', f).val();
+                var routes = stationRoutes[upDown]
+                        , lastCode = routes[routes.length - 1].stationCode
+                        , opts = '', park_opts = '';
+                //station options
+                $.each(routes, function () {
+                    opts += '<option value="' + this.stationCode + '">' + this.stationName + '</option>'
+                });
+                //park options
+                for(var i=0,p;p=parks[i++];)
+                    park_opts += '<option value="' + p.code + '">' + p.name + '</option>';
+                /*for (var code in parks)
+                 park_opts += '<option value="' + code + '">' + parks[code] + '</option>';*/
+
+                var qdz = $f('startStation', f), zdz = $f('endStation', f), mType = $f('mileageType', f);
+                var domainsTemp;
+                switch ($(this).val()) {
+                    case '3'://出场
+                        qdz.html(park_opts).val(information.carPark);
+                        zdz.html(opts).trigger('change');
+                        mType.val('empty').attr('disabled', 'disabled').trigger('change');
+                        domainsTemp = 'st-edit-domains-inout-form-temp';
+                        break;
+                    case '2'://进场
+                        qdz.html(opts);
+                        zdz.html(park_opts).val(information.carPark).trigger('change');
+                        mType.val('empty').attr('disabled', 'disabled').trigger('change');
+                        domainsTemp = 'st-edit-domains-inout-form-temp';
+                        break;
+                    default:
+                        qdz.html(opts);
+                        zdz.html(opts).val(lastCode).trigger('change');
+                        mType.val('service').removeAttr('disabled').trigger('change');
+                        domainsTemp = 'st-edit-domains-service-form-temp';
+                }
+
+                //可变选项区域
+                $('.domains', f).html(template(domainsTemp, {
+                    adjustExps: gb_common.adjustExps,
+                    inOutExps: gb_common.inOutExps
+                }));
+
+                //校验reason
+                f.trigger('add_reason_field');
+            }
+
+
+            function $f(name, f) {
+                return $('[name=' + name + ']', f);
+            }
+
+            /**
+             * 停车场排序
+             * @param parks 停车场 code 2 name
+             * @param information 线路标准
+             * @param st_park_data 站到场
+             */
+            function sort_parks(parks, information, st_park_data) {
+                var array = [], names=[];
+                for(var code in parks){
+                    array.push({code: code, name: parks[code]});
+                }
+
+                if(st_park_data && st_park_data.length > 0){
+                    $.each(st_park_data, function () {
+                        names.push(this.parkName);
+                    });
+                }
+
+                //debugger
+                array.sort(function (a, b) {
+                    if(a.code==information.carPark)
+                        return -1;
+                    if(b.code==information.carPark)
+                        return 1;
+
+                    var ai = names.indexOf(a.name),
+                            bi = names.indexOf(b.name);
+
+                    if(ai!=-1 && bi==-1)
+                        return -1;
+                    else if(ai==-1 && bi!=-1)
+                        return 1;
+                    else
+                        return a.name.localeCompare(b.name);
+                });
+                return array;
+            }
+
+            function destroyClick() {
+                var f = $(this).parents('.sub_task_form_v2');
+                if (this.checked) {
+                    $('.destroy_reason_wrap', f).show();
+                    f.attr('destroy', true);//.addClass('destroy_form');
+                }
+                else {
+                    $('.destroy_reason_wrap', f).hide();
+                    f.removeAttr('destroy');//.removeClass('destroy_form');
+                }
+                //reCalcMileageCount();
+            }
+
+            /**
+             * 切换原因
+             */
+            function reSynchroReason() {
+                var f = $(this).parents('.sub_task_form_v2'),
+                        reason = $(this).val(),
+                        remInput = $('[name=remarks]', f);
+
+                if(remInput.val()==reason + ',')
+                    return;
+                remInput.val(remInput.val() + reason + ',');
+            }
+
+
+            $('.delete_link', modal).on('click', function () {
+                var id = cTask.id;
+                if(!id){
+                    notify_err('无法获取标识键！');
+                    return;
+                }
+
+                var str = '<h3>确定要删除这条子任务？</h3>';
+                alt_confirm(str, function () {
+                    gb_common.$del('/childTask/' + id, function (rs) {
+                        gb_schedule_table.updateSchedule(rs.t);
+
+                        UIkit.modal(modal).hide();
+                        $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: sch});
+
+                        //更新路牌公里统计面板
+                        gb_schedule_table.showLpMileageTipBySch(rs.t);
+                    });
+                }, '确定删除');
+            });
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -155,7 +155,7 @@
                 <div class="uk-form-row" style="padding-top: 5px;">
                     <label class="uk-form-label"></label>
                     <div class="uk-form-controls">
-                        <label data-uk-tooltip title="如是无人售票线路，忽略这个选项">
+                        <label data-uk-tooltip title="无人售票线路，请忽略这个选项">
                             <input type="checkbox" value=1 name="noClerk" class="i-cbox"> 无售票员
                         </label>
                     </div>
@@ -150,6 +150,10 @@
                     }catch (e){
                         console.log(e);}
                     UIkit.modal('#schedule-addsch-modal').hide();
+                    //更新路牌公里统计面板
+                    gb_schedule_table.showLpMileageTipBySch(rs.t);
+                }, function () {
+                    enable_submit_btn(nf);
                 });
             });
             $('.ct_line_lp_badge', nf).html(sch.xlName + '，&nbsp;'+sch.lpName);
@@ -154,6 +154,10 @@
                     }catch (e){
                         console.log(e);}
                     UIkit.modal('#schedule-addsch-modal').hide();
+                    //更新路牌公里统计面板
+                    gb_schedule_table.showLpMileageTipBySch(rs.t);
+                }, function () {
+                    enable_submit_btn(nf);
                 });
             });
             $('.ct_line_lp_badge', nf).html(sch.xlName + '，&nbsp;'+sch.lpName);
@@ -315,6 +315,8 @@
                             }catch (e){
                                 console.log(e);}
                             UIkit.modal('#schedule-addsch-modal').hide();
+                            //更新路牌公里统计面板
+                            gb_schedule_table.showLpMileageTipBySch(last);
                             return;
                         }
                         submitFun(dataArray[i], function (rs) {
@@ -323,6 +325,8 @@
                             upArr.push(rs.t);
                             i++;
                             f();
+                        }, function () {
+                            $('[type=submit]', wrap).removeClass('disabled').removeAttr('disabled');
                         });
                     })();
                 }
@@ -310,7 +310,7 @@
             /**
              * 提交表单
              */
-            function submit_temp_schedule_form(data, cb) {
+            function submit_temp_schedule_form(data, cb, err) {
                 data.xlBm = sch.xlBm;
                 data.xlName = sch.xlName;
                 data.lpName = sch.lpName;
@@ -336,7 +336,7 @@
                 gb_common.$post('/realSchedule', data, function (rs) {
                     notify_succ('新增临加班次成功');
                     cb && cb(rs);
-                });
+                }, err);
             }
         })();
     </script>
@@ -11,9 +11,11 @@
                     <div class="card-panel"></div>
                 </div>
             </div>
-            <div class="uk-width-1-6" style="height: calc(100% - 1px);">
+            <div class="uk-width-1-6" style="height: calc(100% - 1px);position: relative;">
                 <div class="card-panel sys-mailbox" style="overflow: auto;">
                 </div>
+                <div class="mileage_elec_panel">
+                </div>
             </div>
         </div>
@@ -82,7 +82,7 @@
                                     <span class="uk-badge uk-badge-danger">临加</span>
                                     {{/if}}
                                     {{if sch.cTasks.length > 0}}
-                                    <span class="uk-badge uk-badge-notification c_task">{{sch.cTasks.length}}</span>
+                                    <span class="uk-badge uk-badge-notification c_task {{if sch.c_t_mileage_status==-1}}c_task_mileage_error{{/if}}">{{sch.cTasks.length}}</span>
                                     {{/if}}
                                 </dd>
                                 <dd data-sort-val={{sch.dfsjT}} dbclick dbclick-type="dfsj" dbclick-val="{{sch.dfsj}}">
@@ -136,7 +136,7 @@
             <span class="uk-badge uk-badge-danger">临加</span>
             {{/if}}
             {{if cTasks.length > 0}}
-            <span class="uk-badge uk-badge-notification c_task">{{cTasks.length}}</span>
+            <span class="uk-badge uk-badge-notification c_task {{if c_t_mileage_status==-1}}c_task_mileage_error{{/if}}">{{cTasks.length}}</span>
             {{/if}}
         </dd>
     </script>
@@ -182,4 +182,17 @@
             <span class="_badge">{{zdsj}}/{{zdsjActual}}</span>
         </div>
     </script>
+
+    <script id="sch-lp-mileage-tip-temp" type="text/html">
+        {{each data as obj i}}
+            {{if i > 0}}<hr>{{/if}}
+
+            <h5 class="_title"> <span class="lp_name">{{lpName}}</span>&nbsp;&nbsp;<a>{{obj.key}}</a></h5>
+            <div class="LD_item">
+                <span>营运：<a>{{obj.serviceMileage}}</a></span>
+                <span>烂班：<a>{{obj.destroyMileage}}</a></span>
+                <span>空驶：<a>{{obj.emptyMileage}}</a></span>
+            </div>
+        {{/each}}
+    </script>
 </div>
@@ -95,13 +95,13 @@ var gb_common = (function () {
         });
     };
-    var $post = function (url, data, successFun) {
+    var $post = function (url, data, successFun, errFun) {
         $.ajax({
             url: url,
             method: 'POST',
             data: data,
             complete: function (xhr, ts) {
-                ajaxComplete(xhr, ts, successFun);
+                ajaxComplete(xhr, ts, successFun, errFun);
             }
         });
     };
@@ -126,7 +126,7 @@ var gb_common = (function () {
     var errorHead = '<span style="color:red;">异常：</span>';
-    function successHandle(json, handle) {
+    function successHandle(json, handle, err) {
         var status = json.status;
         if (status == 407) {
             location.href = '/login.html';
@@ -142,18 +142,20 @@ var gb_common = (function () {
             UIkit.modal.alert(errorHead + (json.msg ? json.msg : '未知异常'), {labels: {Ok: '确定'}});
             //关闭wait窗口
             hide_wait_modal();
+            err && err();
         }
         else
             handle && handle(json);
     }
-    function ajaxComplete(xhr, ts, succ) {
+    function ajaxComplete(xhr, ts, succ, err) {
         if (ts == 'success') {
-            successHandle(JSON.parse(xhr.responseText), succ);
+            successHandle(JSON.parse(xhr.responseText), succ, err);
         } else if (ts == 'error') {
             UIkit.modal.alert(errorHead + xhr.responseText, {labels: {Ok: '确定'}});
             //关闭wait窗口
             hide_wait_modal();
+            err && err();
         }
     }
@@ -14,9 +14,6 @@ var gb_data_gps = (function () {
             refreshEventCallbacks.push(cb);
     };
-    //超速数据回调
-    //var overspeedEventCallbacks = [];
-
     var refresh = function (cb) {
         $.ajax({
             url: '/gps/real/line',
@@ -25,8 +22,6 @@ var gb_data_gps = (function () {
             success: function (rs) {
                 //用定时的gps来检测session断开
                 if(rs.status && rs.status==407){
-                    //解除退出页面的提示框
-                    window.removeEventListener("beforeunload", gb_beforeunload_fun);
                     location.href = '/login.html';
                     return;
                 }
@@ -18,7 +18,6 @@ var gb_schedule_badge_tootip = (function () {
         },
         events: {
             hidden: function(event, api) {
-                //destroy dom
                 $(this).qtip('destroy', true);
             }
         }
@@ -44,25 +43,32 @@ var gb_schedule_badge_tootip = (function () {
             show: _opts.show,
             content: {
                 text: function() {
-                    var sch = getSch(this);
+                    var sch = getSch(this),
+                        serviceCount=0,
+                        emptyCount=0;
                     //子任务排序
                     $.each(sch.cTasks, function () {
                         if(this.mileageType=='service'){
+                            serviceCount = gb_common.accAdd(serviceCount, this.mileage);
                             if(this.type1=='正常')
                                 this.order_no=0;
                             else
                                 this.order_no=1;
-                            if(this.destroy)
+                            if(this.destroy){
                                 this.order_no=2;
+                            }
                         }
-                        else
+                        else{
                             this.order_no=this.type2 + 1;
+                            emptyCount = gb_common.accAdd(emptyCount, this.mileage);
+                        }
                     });
                     var array = sch.cTasks.sort(function (a, b) {
                         return a.order_no - b.order_no;
                     });
-                    return temps['sch-table-task-tootip-temp']({tasks: array});
+                    return temps['sch-table-task-tootip-temp'](
+                        {tasks: array, sch: sch, serviceCount: serviceCount, emptyCount: emptyCount});
                 }
             },
             position: _opts.position,
@@ -74,6 +80,45 @@ var gb_schedule_badge_tootip = (function () {
         });
     });
+    /**
+     * 子任务编辑
+     */
+    $(document).on('click', 'a.tip_task_edit_link', function () {
+        var schId = $(this).data('schid'),
+            taskId = $(this).data('id'),
+            lineCode = $(this).data('line');
+
+        var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
+
+        var cTask;
+        for(var i=0,obj;obj=sch.cTasks[i++];){
+            if(obj.id==taskId){
+                cTask = obj;
+                break;
+            }
+        }
+
+        $('#edit-sub-task-main-modal').remove();
+        //打开子任务修改modal
+        open_modal('/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/edit.html', {
+            sch: sch,
+            cTask: cTask
+        }, {center: false, bgclose: false});
+    });
+
+    /**
+     * 新增子任务
+     */
+    $(document).on('click', 'i.badge_tip_add_icon', function () {
+        var schId = $(this).data('schid'),
+            lineCode = $(this).data('line');
+
+        var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
+        open_modal('/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/main.html', {
+            sch: sch
+        }, {center: false, bgclose: false});
+    });
+
     //区间 tootip
     $(document).on('mouseenter', _badge+'.sch_region', function() {
         $(this).qtip({
@@ -319,15 +319,15 @@ var gb_schedule_context_menu = (function () {
             'fcxxwt': {
                 name: '发车信息微调'
             },
+            'sep3': '---------',
             'lj_zrw': {
                 name: '临加/子任务'
             },
-            'sep3': '---------',
             'add_temp_sch': {
-                name: '添加临加班次'
+                name: '新增临加班次'
             },
             'add_sub_task': {
-                name: '添加子任务'
+                name: '新增子任务'
             },
             'sep4': '---------',
             'tzrc': {
@@ -93,8 +93,18 @@ var gb_schedule_table_dbclick = (function() {
         });
     };
+    var carCellClick = function (elem) {
+        elem.dblclick(function () {
+            var nbbm = $(this).data('nbbm');
+            var lineCode = $('.north-tabs>ul>li.tab-line.uk-active').data('code');
+
+            open_modal('/real_control_v2/fragments/line_schedule/car_info_all.html', {nbbm:nbbm,lineCode:lineCode});
+        });
+    };
+
     return {
         init: init,
-        sfsjCellClick:sfsjCellClick
+        sfsjCellClick:sfsjCellClick,
+        carCellClick: carCellClick
     };
 })();
+
+/**
+ * 统计班次公里
+ * @type {{}}
+ */
+var gb_sch_mileage_count = (function () {
+
+
+    var isInOut = function (sch) {
+        return sch.bcType=='out' || sch.bcType=='in';
+    };
+
+    return {
+        serviceMileage: function (array) {
+            var sum = 0;
+            var cts;
+
+            for(var i=0,sch;sch=array[i++];){
+                if (sch.status == -1)
+                    continue;
+
+                if (isInOut(sch) || sch.bcType=='ldks')
+                    continue;
+
+                cts = sch['cTasks'];
+
+                //有子任务
+                if (cts && cts.length > 0) {
+                    for(var j=0,ct;ct=cts[j++];){
+                        if (ct.mileageType=="service" && !ct.destroy)
+                            sum = gb_common.accAdd(sum, ct.mileage);
+                    }
+                }
+                else if(!sch.fcsjActual || !sch.zdsjActual)
+                    continue;
+                else
+                    sum = gb_common.accAdd(sum, sch.jhlc);
+            }
+
+            return sum;
+        },
+        destroyMileage: function (array) {
+            var sum = 0;
+            var cts;
+
+            for(var i=0,sch;sch=array[i++];){
+                if (isInOut(sch) || sch.bcType=='ldks' || sch.sflj)
+                    continue;
+
+                cts = sch['cTasks'];
+
+                //有子任务
+                if (cts && cts.length > 0) {
+                    for(var j=0,ct;ct=cts[j++];){
+                        if (ct.destroy && ct.mileageType=="service")
+                            sum = gb_common.accAdd(sum, ct.mileage);
+                    }
+                }else if (sch.status == -1)
+                    sum = gb_common.accAdd(sum, sch.jhlcOrig);
+            }
+
+            return sum;
+        },
+        emptyMileage: function (array) {
+            var sum = 0;
+            var cts;
+
+            for(var i=0,sch;sch=array[i++];){
+
+                cts = sch['cTasks'];
+
+                //有子任务
+                if (cts && cts.length > 0) {
+                    for(var j=0,ct;ct=cts[j++];){
+                        if (!ct.destroy && ct.mileageType=="empty")
+                            sum = gb_common.accAdd(sum, ct.mileage);
+                    }
+                }
+                else if(!sch.fcsjActual || !sch.zdsjActual)
+                    continue;
+                else if ((isInOut(sch) || sch.bcType=="ldks") && sch.status != -1)
+                    sum = gb_common.accAdd(sum, sch.jhlc);
+            }
+
+            return sum;
+        }
+    }
+})();
 \ No newline at end of file