update...

潘钊
1 parent 3385ffa4
Showing 21 changed files with 718 additions and 274 deletions
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/data/gpsdata_v2/GpsRealData.java
src/main/java/com/bsth/data/gpsdata_v2/entity/GpsEntity.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/real_control_v2/css/handicapped_style.css
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/badge_tooltip.html
src/main/resources/static/real_control_v2/fragments/line_schedule/car_info_all.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/edit.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/js/data/data_gps.js
src/main/resources/static/real_control_v2/js/line_schedule/badge_tooltip.js
src/main/resources/static/real_control_v2/js/line_schedule/dbclick.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/north/tabs.js
@@ -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);
+    }
 }
@@ -135,14 +135,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<>();
@@ -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;
+	}
 }
@@ -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();
@@ -970,7 +970,6 @@ public class DayOfSchedule {
                 //删除班次数据
                 removeRealSch(lineCode, rq);
-                //删除相关班次修正记录
             }
             rs.put("status", ResponseCode.SUCCESS);
@@ -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,9 +7,11 @@ 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;
@@ -1174,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;
@@ -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) {
 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,31 +1067,31 @@ 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{
+.qtip.sch-badge-tip {
     max-width: 700px;
 }
@@ -1099,16 +1099,19 @@ dl.intimity span.late-badge{
     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,66 +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){
+.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){
+
+.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){
+
+.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){
+
+.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){
+
+.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 dt:nth-of-type(6), .tip_task_list dl dd:nth-of-type(6) {
 }
-.tip_task_list dl dd:nth-of-type(1) a{
+.tip_task_list dl dd:nth-of-type(1) a {
     color: #3c3c3c;
     text-decoration: underline;
     font-size: 12px;
 }
-.tip_task_list dl.service{
+.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;
@@ -1185,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;
@@ -1281,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;
@@ -1296,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;
@@ -1341,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{
+#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;
@@ -1368,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;
@@ -1398,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;
 }
@@ -1453,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;
@@ -1462,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;
@@ -1484,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;
 }
@@ -1501,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;
@@ -1554,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;
@@ -1565,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;
@@ -1608,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;
 }
@@ -1624,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;
@@ -1632,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;
 }
@@ -1741,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;
@@ -1749,7 +1777,7 @@ dl.active&gt;dd.disabled{
     padding-bottom: 5px;
 }
-.cancel_link{
+.cancel_link {
     font-size: 12px;
     margin-left: 15px;
     vertical-align: bottom;
@@ -1759,7 +1787,7 @@ dl.active&gt;dd.disabled{
     right: 0;
 }
-.edit_link{
+.edit_link {
     font-size: 12px;
     margin-left: 15px;
     vertical-align: bottom;
@@ -1780,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;
@@ -1801,19 +1829,19 @@ 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{
+.mileage_elec_panel {
     position: absolute;
     width: 100%;
     /*height: 90px;*/
@@ -1828,33 +1856,33 @@ dl.active&gt;dd.disabled{
     display: none;
 }
-.mileage_elec_panel ._title{
+.mileage_elec_panel ._title {
     margin: 5px 3px;
     font-size: 15px;
 }
-.mileage_elec_panel .LD_item{
+.mileage_elec_panel .LD_item {
     margin: 5px 0;
     font-family: 微软雅黑;
 }
-.mileage_elec_panel .LD_item>span{
+.mileage_elec_panel .LD_item > span {
     padding: 3px;
     display: inline-block;
     width: 85px;
 }
-.mileage_elec_panel .lp_name{
+.mileage_elec_panel .lp_name {
     padding: 0 5px;
     background: #f2f2f2;
     border-radius: 15px
 }
-.mileage_elec_panel .LD_item>span>a{
+.mileage_elec_panel .LD_item > span > a {
     color: #000;
 }
-.mileage_elec_panel .LD_item>span:nth-of-type(1)>a{
+.mileage_elec_panel .LD_item > span:nth-of-type(1) > a {
     color: blue;
 }
@@ -1866,8 +1894,10 @@ dl.active&gt;dd.disabled{
     color: #515151;
 }*/
-.mileage_elec_panel hr{
-    height:1px;border:none;border-top:1px dashed #b5b5b5;
+.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 {
@@ -1878,33 +1908,52 @@ dl.active&gt;dd.disabled{
     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 + .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{
+#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{
+.c_task_mileage_abnormal .ct_table > .ct_table_head dl,
+.c_task_mileage_abnormal .ct_table dl {
     background: #ffe7e7 !important;
 }
-.tip_task_count_dl{
+.tip_task_count_dl {
     width: calc(100% + 22px) !important;
     margin-left: -11px !important;
     border-top: 1px solid #e6e6e6 !important;
 }
-.tip_task_count_dl>dd{
-    width: 100% !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>span{
+.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;
@@ -1914,6 +1963,67 @@ dl.active&gt;dd.disabled{
     text-indent: 12px;
 }
-.tip_task_list>dl:nth-last-child(2){
+.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
@@ -12,7 +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="{{lineCode}}" data-id="{{t.id}}" data-schid="{{sch_id}}" class="tip_task_edit_link">编辑</a></dd>
+                    <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"}}
                             营运
@@ -37,9 +37,10 @@
                     <dd title="{{t.remarks}}">{{t.remarks}}</dd>
                 </dl>
                 {{/each}}
-                <dl class="tip_task_count_dl" >
+                <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>计划：{{jhlc}}</span>
+                        <span>计划：{{sch.jhlcOrig}}</span>
                         <span>营运+烂班：{{serviceCount}}</span>
                         <span>空驶：{{emptyCount}}</span>
                     </dd>
+<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
@@ -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>
@@ -274,7 +274,7 @@
                 //检查子任务营运里程
                 $('#childTaskTitle .child-task-status', modal).remove();
-                var i = 0;
+                //var i = 0;
                 if (sch.cTasks.length == 0)
                     return;
                 var sum = 0, calcs = ' ';
@@ -282,7 +282,7 @@
                     if (this.mileageType == 'service') {
                         sum = gb_common.accAdd(sum, this.mileage);
                         calcs += (' + ' + this.mileage);
-                        i++;
+                        //i++;
                     }
                 });
                 //公里与主任务不符合
@@ -9,6 +9,7 @@
         </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>
@@ -352,6 +353,28 @@
                     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
@@ -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>
@@ -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);
             }
         }
@@ -69,8 +68,7 @@ var gb_schedule_badge_tootip = (function () {
                         return a.order_no - b.order_no;
                     });
                     return temps['sch-table-task-tootip-temp'](
-                        {tasks: array, sch_id: sch.id, lineCode: sch.xlBm, jhlc: sch.jhlc,
-                            serviceCount: serviceCount, emptyCount: emptyCount});
+                        {tasks: array, sch: sch, serviceCount: serviceCount, emptyCount: emptyCount});
                 }
             },
             position: _opts.position,
@@ -100,11 +98,25 @@ var gb_schedule_badge_tootip = (function () {
             }
         }
+        $('#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, modal: false});
+        }, {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
@@ -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
     };
 })();
@@ -25,33 +25,6 @@ var gb_schedule_table = (function () {
         return diff!=0?diff:typeOrder(s1['bcType'])-typeOrder(s2['bcType']);
     };
-
-
-    /**
-     * 检查是否存在重复班次
-     * @param list
-     */
-    var isRepeatData = function (list) {
-        try {
-            var map = {}, reps = [];
-            for(var i = 0,sch;sch=list[i++];){
-                if(map[sch.id]){
-                    reps.push(sch.clZbh);
-                }
-                map[sch.id] = sch;
-            }
-
-            //通知服务端数据有异常
-            $.each(reps, function () {
-                $.post('/anomalyCheck/schRepeat', {nbbm: this});
-            });
-        }catch (e){
-            return list;
-        }
-
-        return gb_common.get_vals(map);
-    };
-
     var show = function (cb) {
         //从服务器获取班次数据
         $.get('/realSchedule/lines', {
@@ -59,8 +32,6 @@ var gb_schedule_table = (function () {
         }, function (rs) {
             for (var lineCode in rs) {
                 line2Schedule[lineCode] = {};
-                //------是否有重复班次 #临时代码，为服务端提供诊断信息已解决这个问题
-                rs[lineCode] = isRepeatData(rs[lineCode]);
                 //排序
                 rs[lineCode].sort(schedule_sort);
@@ -68,6 +39,8 @@ var gb_schedule_table = (function () {
                 $.each(rs[lineCode], function () {
                     calc_sch_real_shift(this);
                     line2Schedule[lineCode][this.id] = this;
+                    //子任务公里是否与计划平
+                    this.c_t_mileage_status = calcCTaskMileageStatus(this);
                 });
                 //计算应发未发
                 calc_yfwf_num(lineCode);
@@ -82,7 +55,6 @@ var gb_schedule_table = (function () {
             }));
         });
-
         var ep = EventProxy.create("data", "temp", function (data, temp) {
             temps = temp;
             var lineCode, dirData, htmlStr;
@@ -120,11 +92,63 @@ var gb_schedule_table = (function () {
             gb_schedule_table_dbclick.init();
             //双击实发
             gb_schedule_table_dbclick.sfsjCellClick($('dd.fcsjActualCell'));
+            //双击车辆
+            gb_schedule_table_dbclick.carCellClick($('.ct_table_body dd[data-nbbm]'));
             //搜索框初始化
             gb_sch_search.init();
+
+            //监听gps车辆信息
+            gb_data_gps.registerCallback(renderCarRemark);
             cb && cb();
         });
     };
+    
+    var renderCarRemark = function () {
+        try{
+            var $activeTab = $('.north-tabs>ul>li.tab-line.uk-active');//.data('code');
+            if($activeTab.length==0)
+                return;
+            var lineCode = $activeTab.data('code');
+            var array = gb_common.get_vals(line2Schedule[lineCode]);
+            var nbbms = {};
+            for(var i=0,sch;sch=array[i++];){
+                nbbms[sch.clZbh]=1;
+            }
+
+            var $activeWrap = $('#main-tab-content .line_schedule.uk-active .schedule-wrap .schedule-body');
+            var gps, e;
+            for(var nbbm in nbbms){
+                gps = gb_data_gps.findGpsByNbbm(nbbm);
+                e = $('.ct_table_body dl>dd[data-nbbm='+nbbm+']', $activeWrap);
+                $('i', e).remove();
+
+                if(gps && gps['planCode']!=lineCode && gps.remark)
+                    $(e).append('<i class="uk-icon-exclamation-circle" data-uk-tooltip title="'+gps.remark+'"></i>');
+            }
+        }catch (e){
+            console.log(e);
+        }
+    };
+
+    /**
+     * 计算子任务公里是否和计划平
+     * @param sch
+     */
+    var calcCTaskMileageStatus = function (sch) {
+        if(!sch.cTasks || sch.cTasks.length==0)
+            return 0;
+        var sum = 0;
+        $.each(sch.cTasks, function () {
+            if (this.mileageType == 'service') {
+                sum = gb_common.accAdd(sum, this.mileage);
+            }
+        });
+
+        if (sum != sch.jhlcOrig) {
+            return -1;
+        }
+        return 0;
+    };
     //重置序号
@@ -138,7 +162,7 @@ var gb_schedule_table = (function () {
     var calc_sch_real_shift = function (sch) {
         if (sch['fcsjActualTime']){
             var diff = sch['fcsjActualTime'] - sch['dfsjT'], fcsj_diff;
-            fcsj_diff = parseInt(diff / 60000);
+            fcsj_diff = parseInt(diff / 60000, 10);
             if(diff % 60000 != 0){
                 /*if(fcsj_diff > 0)
                     fcsj_diff ++;
@@ -284,10 +308,10 @@ var gb_schedule_table = (function () {
         //var tMaps = {};
         $.each(schArr, function () {
             try {
+                //子任务公里是否与计划平
+                this.c_t_mileage_status = calcCTaskMileageStatus(this);
                 line2Schedule[this.xlBm][this.id] = this;
                 updateDom(this);
-                //线路_车辆 过滤重复数据
-                //tMaps[this.xlBm + '_' + this.clZbh] = 1;
             }catch(e){}
         });
@@ -321,6 +345,8 @@ var gb_schedule_table = (function () {
         //车辆自编号
         $(dds[2]).replaceWith(temps['line-schedule-nbbm-temp'](sch));
+        //车辆双击
+        gb_schedule_table_dbclick.carCellClick($(dds[2]));
         $(dds[3]).text(sch.qdzArrDatejh ? sch.qdzArrDatejh : '');
         $(dds[4]).text(sch.qdzArrDatesj ? sch.qdzArrDatesj : '');
@@ -346,6 +372,8 @@ var gb_schedule_table = (function () {
         //班次是车辆的最后一班
         if (dl.hasClass('dl-last-sch'))
             markerLastSch([sch]);
+
+        renderCarRemark();
     };
     //单击实发单元格显示详细信息
@@ -785,6 +813,7 @@ var gb_schedule_table = (function () {
         refreshAll: refreshAll,
         getNextNormalSch: getNextNormalSch,
         findNbbmByLineCode:findNbbmByLineCode,
-        showLpMileageTipBySch: showLpMileageTipBySch
+        showLpMileageTipBySch: showLpMileageTipBySch,
+        renderCarRemark: renderCarRemark
     };
 })();
@@ -61,6 +61,7 @@ var gb_tabs = (function() {
         }
         else{
             gb_svg_chart.refreshByVisible();//刷新模拟图
+            gb_schedule_table.renderCarRemark();
         }
     });
@@ -260,7 +260,7 @@ var gb_sch_websocket = (function () {
     });
     //80不同意
-    $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button.reject', function () {
+    $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button.reject', function (e) {
         e.stopPropagation();
         $(this).attr('disabled', 'disabled');
         var panel = $(this).parents('.sys-note-80')