统计报表-烂班情况分析表中加入抽减，智能调度优化

ljq
1 parent 723348c4
Showing 18 changed files with 102 additions and 124 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/mould/lbStatuAnaly.xls
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
src/main/resources/static/real_control_v2/main.html
src/main/resources/static/real_control_v2/zndd/img/DJG.png
src/main/resources/static/real_control_v2/zndd/img/SFTZ.png
src/main/resources/static/real_control_v2/zndd/img/WD.png
src/main/resources/static/real_control_v2/zndd/img/YCSF.png
src/main/resources/static/real_control_v2/zndd/img/sftz_0.png
src/main/resources/static/real_control_v2/zndd/img/up.png
src/main/resources/static/real_control_v2/zndd/img/up_1.png
src/main/resources/static/real_control_v2/zndd/img/wd_0.png
src/main/resources/static/real_control_v2/zndd/img/ycsf_0.png
src/main/resources/static/real_control_v2/zndd/type/ycsf.html
@@ -1970,29 +1970,30 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				lzbc_ = 0, dmbc_ = 0, gzbc_ = 0,
 				jfbc_ = 0, zsbc_ = 0, qrbc_ = 0,
 				qcbc_ = 0, kxbc_ = 0, qhbc_ = 0,
-				wybc_ = 0, ljpmbc_ = 0, qtbc_ = 0;
+				wybc_ = 0, ljpmbc_ = 0, qtbc_ = 0,cjbc_ = 0;
 		BigDecimal jhlc_ = new BigDecimal("0"), sjlc_ = new BigDecimal("0"),
 				lzlc_ = new BigDecimal("0"), dmlc_ = new BigDecimal("0"),
 				gzlc_ = new BigDecimal("0"), jflc_ = new BigDecimal("0"),
 				zslc_ = new BigDecimal("0"), qrlc_ = new BigDecimal("0"),
 				qclc_ = new BigDecimal("0"), kxlc_ = new BigDecimal("0"),
 				qhlc_ = new BigDecimal("0"), wylc_ = new BigDecimal("0"),
-				ljpmlc_ = new BigDecimal("0"), qtlc_ = new BigDecimal("0");
-		
+				ljpmlc_ = new BigDecimal("0"), qtlc_ = new BigDecimal("0"),
+				cjlc_ = new BigDecimal("0");
 		for(String key : keyList){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			int jhbc = 0, sjbc = 0,
 					lzbc = 0, dmbc = 0, gzbc = 0,
 					jfbc = 0, zsbc = 0, qrbc = 0,
 					qcbc = 0, kxbc = 0, qhbc = 0,
-					wybc = 0, ljpmbc = 0, qtbc = 0;
+					wybc = 0, ljpmbc = 0, qtbc = 0,cjbc=0;
 			BigDecimal jhlc = new BigDecimal("0"), sjlc = new BigDecimal("0"),
 					lzlc = new BigDecimal("0"), dmlc = new BigDecimal("0"),
 					gzlc = new BigDecimal("0"), jflc = new BigDecimal("0"),
 					zslc = new BigDecimal("0"), qrlc = new BigDecimal("0"),
 					qclc = new BigDecimal("0"), kxlc = new BigDecimal("0"),
 					qhlc = new BigDecimal("0"), wylc = new BigDecimal("0"),
-					ljpmlc = new BigDecimal("0"), qtlc = new BigDecimal("0");
+					ljpmlc = new BigDecimal("0"), qtlc = new BigDecimal("0"),
+					cjlc = new BigDecimal("0");
 			String companyName = "", subCompanyName = "";
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
 				if(cts.containsKey(schedule.getId())){
@@ -2061,6 +2062,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 							wybc++;
 						}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路救抛锚") != -1){
 							ljpmbc++;
+						}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("抽减") != -1){
+							cjbc++;
 						} else {
 							qtbc++;
 						}
@@ -2090,9 +2093,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			qhlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "气候"));
 			wylc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "援外"));
 			ljpmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "路救抛锚"));
+			cjlc =  new BigDecimal(culateService.culateCJLC(keyMap.get(key), "抽减"));
 			qtlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "配车")).add(
 					new BigDecimal(culateService.culateCJLC(keyMap.get(key), "保养"))).add(
-					new BigDecimal(culateService.culateCJLC(keyMap.get(key), "抽减"))).add(
 					new BigDecimal(culateService.culateCJLC(keyMap.get(key), "其他")));
  
 			boolean flag = true;
@@ -2146,6 +2149,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("ljpmbc", ljpmbc);
 			tempMap.put("ljpmlc", df.format(ljpmlc.doubleValue()));
 			tempMap.put("ljpmbfb", df.format(jhbc>0?(double)ljpmbc/jhbc*100:0)+"%");
+
+			tempMap.put("cjbc", cjbc);
+			tempMap.put("cjlc", df.format(cjlc.doubleValue()));
+			tempMap.put("cjbfb", df.format(jhbc>0?(double)cjbc/jhbc*100:0)+"%");
+
 			tempMap.put("qtbc", qtbc);
 			tempMap.put("qtlc", df.format(qtlc.doubleValue()));
 			tempMap.put("qtbfb", df.format(jhbc>0?(double)qtbc/jhbc*100:0)+"%");
@@ -2158,6 +2166,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			jfbc_ += jfbc; zsbc_ += zsbc; qrbc_ += qrbc;
 			qcbc_ += qcbc; kxbc_ += kxbc; qhbc_ += qhbc;
 			wybc_ += wybc; ljpmbc_ += ljpmbc; qtbc_ += qtbc;
+			cjbc_ += cjbc;
 			jhlc_ = jhlc_.add(jhlc); sjlc_ = sjlc_.add(sjlc);
 			lzlc_ = lzlc_.add(lzlc); dmlc_ = dmlc_.add(dmlc);
 			gzlc_ = gzlc_.add(gzlc); jflc_ = jflc_.add(jflc);
@@ -2165,6 +2174,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			qclc_ = qclc_.add(qclc); kxlc_ = kxlc_.add(kxlc);
 			qhlc_ = qhlc_.add(qhlc); wylc_ = wylc_.add(wylc);
 			ljpmlc_ = ljpmlc_.add(ljpmlc); qtlc_ = qtlc_.add(qtlc);
+			cjlc_ = cjlc_.add(cjlc);
 		}
  
 		if(resList.size() > 0){
@@ -2216,6 +2226,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			temp.put("ljpmbc", ljpmbc_);
 			temp.put("ljpmlc", df.format(ljpmlc_.doubleValue()));
 			temp.put("ljpmbfb", df.format(jhbc_>0?(double)ljpmbc_/jhbc_*100:0)+"%");
+
+			temp.put("cjbc", cjbc_);
+			temp.put("cjlc", df.format(cjlc_.doubleValue()));
+			temp.put("cjbfb", df.format(jhbc_>0?(double)cjbc_/jhbc_*100:0)+"%");
+
 			temp.put("qtbc", qtbc_);
 			temp.put("qtlc", df.format(qtlc_.doubleValue()));
 			temp.put("qtbfb", df.format(jhbc_>0?(double)qtbc_/jhbc_*100:0)+"%");
@@ -2865,19 +2880,19 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        Map.put("remMileage",culateService.culateLbgl(scheduleRealInfos));
 		        Map.put("addMileage", culateService.culateLjgl(lists));
 				Map<String,Double> remmap = culateService.culateLbgl_yy_ks(lists);
-				map.put("remMileage_yy", remmap.get("remMileage_yy")); //营运烂班公里
-				map.put("remMileage_ks", remmap.get("remMileage_ks")); //空驶烂班公里
+				Map.put("remMileage_yy", remmap.get("remMileage_yy")); //营运烂班公里
+				Map.put("remMileage_ks", remmap.get("remMileage_ks")); //空驶烂班公里
 				Map<String,Double> ljmap = culateService.culateLjgl_yy_ks(lists);
-				map.put("addMileage_yy", ljmap.get("addMileage_yy")); //临加烂班公里
-				map.put("addMileage_ks", ljmap.get("addMileage_ks")); //临加烂班公里
+				Map.put("addMileage_yy", ljmap.get("addMileage_yy")); //临加烂班公里
+				Map.put("addMileage_ks", ljmap.get("addMileage_ks")); //临加烂班公里
 		        double yygl=Arith.add(culateService.culateSjgl(lists),culateService.culateLjgl(lists));
 		        Map.put("yygl", yygl);
 		        double ksgl=Arith.add(culateService.culateKsgl(scheduleRealInfos),culateService.culateJccgl(lists));
 		        Map.put("ksgl",ksgl);
 		        Map.put("realMileage", Arith.add(yygl ,ksgl));
 		        Map.put("jhbc", culateService.culateJhbc(scheduleRealInfos,""));
-		        Map.put("cjbc", culateService.culateLbbc_yy_ks(scheduleRealInfos));
-		        Map.put("ljbc", culateService.culateLjbc_yy_ks(lists, ""));
+		        Map.put("cjbc", culateService.culateLbbc(scheduleRealInfos));
+		        Map.put("ljbc", culateService.culateLjbc(lists, ""));
 		        int sjbc =culateService.culateLjbc(lists, "")+culateService.culateSjbc(lists, "");
 		        Map.put("sjbc", sjbc);
  
@@ -209,4 +209,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, String> getLevelsByLines(List<String> lines);
  
 	List<ScheduleRealInfo> findAllSchDate(String schDate);
+
+
+	ScheduleRealInfo thissch(Integer ids);
 }
@@ -1142,8 +1142,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ksgl", ksgl);
         map.put("realMileage", Arith.add(yygl, ksgl));
         map.put("jhbc", culateMieageService.culateJhbc(scheduleRealInfos, ""));
-        map.put("cjbc", culateMieageService.culateLbbc_yy_ks(scheduleRealInfos));
-        map.put("ljbc", culateMieageService.culateLjbc_yy_ks(lists, ""));
+        map.put("cjbc", culateMieageService.culateLbbc(scheduleRealInfos));
+        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
         int sjbc = culateMieageService.culateLjbc(lists, "") + culateMieageService.culateSjbc(lists, "");
         map.put("sjbc", sjbc);
 //      map=new HashMap<String,Object>();
@@ -1601,6 +1601,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
             ScheduleRealInfo sch = dayOfSchedule.get(id);
  
+            long time = System.currentTimeMillis();//实际时间+2分钟
+            //超过待发时间  实发时间还是null的
+            if (sch.getFcsjT() < time){
+                return rs;
+            }
+
+
+
+
             LineConfig config = lineConfigData.get(sch.getXlBm());
             //小于线路开始运营时间，则默认跨过24点
             if (fcsjActual.compareTo(config.getStartOpt()) < 0) {
@@ -7022,6 +7031,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
         }, 0, 10, TimeUnit.MINUTES);
     }
+
+
+    public  ScheduleRealInfo thissch(Integer ids){
+        return dayOfSchedule.next(dayOfSchedule.get(ids));
+    }
+    
 }
  
 class AccountMap implements Comparator<Map<String, Object>> {
@@ -42,8 +42,9 @@
 						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="7" checked="true"/>客稀 
 						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="8" checked="true"/>气候 
 						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="9" checked="true"/>援外 
-						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="9" checked="true"/>路救抛锚 
-						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="10" checked="true"/>其他 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="10" checked="true"/>路救抛锚
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="11" checked="true"/>抽减
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="12" checked="true"/>其他
 					</div>
 					<div style="margin-top: 5px"></div>
 					<div style="display: inline-block; margin-left: 33px;" id="company1">
@@ -510,7 +511,8 @@
 		{{if reason[8].checked == true}}<th colspan="3">气候</th>{{/if}}
 		{{if reason[9].checked == true}}<th colspan="3">援外</th>{{/if}}
 		{{if reason[10].checked == true}}<th colspan="3">路救抛锚</th>{{/if}}
-		{{if reason[11].checked == true}}<th colspan="3">其他</th>{{/if}}
+		{{if reason[11].checked == true}}<th colspan="3">抽减</th>{{/if}}
+		{{if reason[12].checked == true}}<th colspan="3">其他</th>{{/if}}
 	</tr>
 	<tr>
 		<th class="hidden"></th>
@@ -528,6 +530,7 @@
 		{{if reason[9].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
 		{{if reason[10].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
 		{{if reason[11].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
+		{{if reason[12].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
 	</tr>
 </thead>
 <tbody>
@@ -556,12 +559,13 @@
 			{{if reason[8].checked==true}}<td>{{obj.qhbc}}</td><td>{{obj.qhlc}}</td><td>{{obj.qhbfb}}</td>{{/if}}
 			{{if reason[9].checked==true}}<td>{{obj.wybc}}</td><td>{{obj.wylc}}</td><td>{{obj.wybfb}}</td>{{/if}}
 			{{if reason[10].checked==true}}<td>{{obj.ljpmbc}}</td><td>{{obj.ljpmlc}}</td><td>{{obj.ljpmbfb}}</td>{{/if}}
-			{{if reason[11].checked==true}}<td>{{obj.qtbc}}</td><td>{{obj.qtlc}}</td><td>{{obj.qtbfb}}</td>{{/if}}
+			{{if reason[11].checked==true}}<td>{{obj.cjbc}}</td><td>{{obj.cjlc}}</td><td>{{obj.cjbfb}}</td>{{/if}}
+			{{if reason[12].checked==true}}<td>{{obj.qtbc}}</td><td>{{obj.qtlc}}</td><td>{{obj.qtbfb}}</td>{{/if}}
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="47"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="50"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </tbody>
@@ -2229,14 +2229,12 @@ g.gps-wrap rect.twinkle[updown=&quot;1&quot;] {
     font-size: 1px;
 }
 .popup-msg-content{
-    border-bottom: 1px solid black;
-    padding-bottom: 5px;
-    padding-top: 10px;
+    padding-top: 5px;
 }
  
 .popup-msg-contents{
-
-    text-align: right   ;
+    padding-top: 10px;
+    text-align: right;
 }
  
 .multi_plat_config .timer{
@@ -16,26 +16,21 @@ var gb_dataZndd = (function (){
  
     var timelist = [],interval;
     var dataMap = new Map();
-    var leftTime = 1000 * 10;//剩余的毫秒数
+    var leftTime = 1000 * 20;//剩余的毫秒数
     var timeType = false
     var sop = function (data) {
-        /*//调度智能开关
-        var storage = window.localStorage;
-        var switchmap = storage.getItem("switchmap") != null ? JSON.parse(storage.getItem("switchmap")) : null; ; //智能调度开关  0 关闭 1 开启
-        if (switchmap == null){
-            console.log("智能调度开关未启动！")
-            return;
-        }
-        
-        for (var scp in switchmap){
-            if (data.type.includes(scp)){
-                if(switchmap[scp] == 0)
-                    return;
-            }
-        }*/
  
         //时间格式化
         data.types = codes[data.type];
+        debugger
+        if (data.type == 'YCSF' &&  ycsf_sx(data.lineCode) == false){
+            return
+        }
+        if (data.type == 'SFTZ_1' && ycsf_sx(data.lineCode) == false){
+            return
+        }
+
+
         var stm = moment(new Date());
         data.uuid = data.uuid + "uuid";//会出现纯数字 key取不到
  
@@ -60,16 +55,14 @@ var gb_dataZndd = (function (){
                 //$pop.find('.multi_plat_config:lt(' + (len - max) + ')').remove();
  
             if (!interval){
-                interval  = snt(data.type,data.ids);
+                interval  = snt(data.ids);
             }
             timelist.push({ele:data.uuid,time:leftTime}) //自动调度定时器
             $pop.append(htmlStr);
             var msg ='检测到'+data.lineName+' '+(data.dir==0 ?'上行':'下行')
-                +data.datarq+'出现'+data.types+'事件'+'请尽快处理，否则40秒后自动选择最优方案处理。';
+                +data.datarq+'出现'+data.types+'事件'+'请尽快处理，否则100秒后自动选择最优方案处理。';
  
             //gb_tts.audition(msg, 1.2); //语音播报
-            
-        
         }
  
  
@@ -84,7 +77,19 @@ var gb_dataZndd = (function (){
         $(this).parent().parent().remove();
         if (close)  close = false
     });
-    
+
+
+    //1078路，1135路，南临专线，临港4路，浦东111路，浦东74路，临港13路，申港3路，浦东29路，新芦专线
+    function ycsf_sx(line){
+        var t =['12101','200828','230308','220826','201012','10636','60033','88814','88818','180926','191221','210821','230311','230329','803111'];
+        debugger
+        for (let lines in t){
+            if(line == t[lines])
+                return true;
+        }
+        return  false;
+    }
+
  
     //撤销实发
     $pop.on('click', '.colsebc', function () {
@@ -117,10 +122,12 @@ var gb_dataZndd = (function (){
                 fcsjActual:that.data('fcsj')
  
             }, function (rs) {
-                gb_schedule_table.updateSchedule(rs.ts);
-                notify_succ('实发未发操作成功！');
-                //calc 应发未发
-                that.parent().parent().parent().remove();
+                if(rs.length != 0) {
+                    gb_schedule_table.updateSchedule(rs.ts);
+                    notify_succ('实发未发操作成功！');
+                    //calc 应发未发
+                    that.parent().parent().parent().remove();
+                }
             });
         }, '确认调整实发');
     });
@@ -215,15 +222,15 @@ var gb_dataZndd = (function (){
  
  
     //计时器
-    function snt(type,ids){
-        return setInterval(function(){leftTimer(type,ids);},1000); //开始倒计时
+    function snt(ids){
+        return setInterval(function(){leftTimer(ids);},1000); //开始倒计时
     }
     //定时器
-    function leftTimer(type,ids){
+    function leftTimer(ids){
         for(var i = 0;i < timelist.length; i++) {
             getTimerstring(timelist[i].ele,timelist[i].time ? timelist[i].time -= 1000 : 0);
             if (!timelist[i].time){
-                TimeChick(timelist[i].ele,type);
+                TimeChick(timelist[i].ele);
                 $("#"+timelist[i].ele).parent().remove();
                 if (close)  close = false
                 timelist.splice(i--, 1);
@@ -249,13 +256,13 @@ var gb_dataZndd = (function (){
     }
  
     //定时器自动提交
-    function TimeChick(ele,type){
+    function TimeChick(ele){
         debugger
         var thisall= $("#"+ele).parent();
         var sch = dataMap.get(thisall.data('uuid'));
-        
         if (thisall.length == 0) return;
         var date = returnDate(thisall);
+        var type = date.type;
         if (date == null)
             return
         if (type == "DJG"){
@@ -269,8 +276,7 @@ var gb_dataZndd = (function (){
  
                 gb_schedule_table.refreshAll();
             });
-        }
-        if (type == "YCSF"){
+        }else if (type == "YCSF"){
             gb_common.$post('/realSchedule/revokeRealOutgo_zndd', {
                 id: sch.sch.id,
                 remarks:"_智能调度-异常实发",
@@ -278,9 +284,7 @@ var gb_dataZndd = (function (){
                 gb_schedule_table.updateSchedule(rs.ts);
                 notify_succ('撤销实发操作成功！');
             });  
-        }
-
-        if (type == "SFTZ_1"){
+        } else if (type == "SFTZ_1"){
             debugger
             gb_common.$post('/realSchedule/realOutAdjust_zndd', {
                 id: sch.sch.id,
@@ -290,11 +294,7 @@ var gb_dataZndd = (function (){
                 gb_schedule_table.updateSchedule(rs.ts);
                 notify_succ('实发未发操作成功！');
             });
-            
-            
-        }
-        
-        if (type == "WD"){
+        } else if (type == "WD"){
          /*   var minute = 6;
             gb_common.$post_arr('/realSchedule/lateAdjust', {idx: sch.sch.id, minute: minute}, function (rs) {
                 console.log('误点调整rs', rs);
@@ -316,62 +316,6 @@ var gb_dataZndd = (function (){
  
     }
  
-    //定时器自动提交
-    function TimeChickConfig(){
-        var thisall=  $('.multi_plat_msg_pop_zndd .multi_plat_config #submitTwo');
-        var date = returnDate(thisall);
-        date.selctype = $('#configSelect').val();
-
-        if (date.selctype == 'X1'){
-            var data = {
-                lineCode : date.lineCode,
-                enableYjtk : '1' ,
-                yjtkStart : '00:00',
-                yjtkEnd : '23:59',
-                upStopMinute : 1,
-                downStopMinute : 1
-            };
-
-            gb_common.$post('/lineConfig/yjtkSet', data, function (rs) {
-                conf = rs.conf;
-                //添加记录
-                $.post('/znddLogger/znddConfig', date, function(res) {
-                    //只有一个 直接删除掉
-                    if(res.status != null){
-                        $('.multi_plat_msg_pop_zndd .multi_plat_config').remove();
-                        notify_succ('已启用随到随发(自动)');
-                    }else {
-                        notify_err('随到随发启动失败！(自动)');
-                    }
-                });
-            });
-        }else {
-            //添加记录
-            $.post('/znddLogger/znddConfig', date, function(res) {
-                //只有一个 直接删除掉
-                if(res.status != null){
-                    notify_succ('班次设定成功！(自动)');
-                }else {
-                    notify_err('班次设定失败！(自动)');
-                }
-                $('.multi_plat_msg_pop_zndd .multi_plat_config').remove();
-                if(res.ts && res.ts.length > 0){
-                    gb_schedule_table.updateSchedule(res.ts);
-                    var modal = '#schedule-multi-dftz-modal';
-                    UIkit.modal(modal).hide();
-                    notify_succ('待发调整成功');
-                }
-            });
-        }
-
-        
-        
-        //取消定时器  防止二次提交
-        clearInterval(timeInt);
-        $(".timer").html("");
-        leftTime = 10 * 1000;
-    }
-
     return {
         sop : sop,
     };
@@ -283,7 +283,6 @@
                 <span>{{lineName}} {{xlDir ==0 ?'上行':'下行'}}  {{clzbh}}   {{fcsj}} 出现 {{types}}</span>
                 <span  style="display:{{type == 'WD'?'':'none'}}"> 。{{sch.remark}}后车辆到站 </span>
             </div>
-            <br>
             <div class="popup-msg-contents"  style="display:{{type == 'YCSF'?'':'none'}}">
                 <button class="uk-button uk-button-primary colsebc"  data-fcsj="{{fcsj}}" data-clzbh="{{clzbh}}" data-id="{{id}}">取消实发</button>
             </div>
@@ -261,7 +261,7 @@
         <label class="uk-form-label">检测效率</label>
         <div class="uk-form-controls">
           <i class="icon-user"></i>
-          <input  value="80%"  disabled>
+          <input  value="50%"  disabled>
         </div>
       </div>
     </div>
@@ -287,10 +287,10 @@
     </div>
     <div class="uk-width-1-2">
       <div class="uk-form-row">
-        <label class="uk-form-label">乘客满意度</label>
+        <label class="uk-form-label">响应速度</label>
         <div class="uk-form-controls">
           <i class="icon-user"></i>
-          <input  value="10%" disabled>
+          <input  value="20%" disabled>
         </div>
       </div>
     </div>