Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents 712b4761 680915c2
Showing 20 changed files with 336 additions and 36 deletions
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/utils/ListFilterUtils.java
src/main/java/com/bsth/data/utils/ListPageQueryUtils.java
src/main/java/com/bsth/entity/directive/D80.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/SheetServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/statisticsDaily.html
src/main/resources/static/real_control_v2/alone_page/home/home_wrap.html
src/main/resources/static/real_control_v2/alone_page/map/alone_wrap.html
src/main/resources/static/real_control_v2/css/home.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/dftz.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sys_mailbox.html
src/main/resources/static/real_control_v2/fragments/north/nav/report_80.html
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
@@ -78,6 +78,12 @@ public class PilotReport {
             //d80MultiMap.put(d80.getData().getLineId().toString(), d80);
             String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
+            //上报时，在执行的班次
+            if(StringUtils.isNotEmpty(nbbm)){
+                ScheduleRealInfo sch = dayOfSchedule.executeCurr(nbbm);
+                if(null != sch)
+                    d80.setSchId(sch.getId());
+            }
             //处理
             switch (d80.getData().getRequestCode()) {
                 //出场请求
@@ -111,6 +117,11 @@ public class PilotReport {
             //推送到页面
             sendUtils.send80ToPage(d80);
+
+            //反射搜索用 瞬时字段
+            d80.setLineId(d80.getData().getLineId());
+            d80.setNbbm(d80.getData().getNbbm());
+            d80.setRequestCode(d80.getData().getRequestCode());
         } catch (Exception e) {
             logger.error("", e);
         }
+package com.bsth.data.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 集合搜索过滤
+ * Created by panzhao on 2017/8/2.
+ */
+public class ListFilterUtils {
+
+    static Logger logger = LoggerFactory.getLogger(ListFilterUtils.class);
+
+    public static List filter(Collection all, Map<String, Object> map, Class clazz) {
+        List rs = new ArrayList();
+        Field[] fields = clazz.getDeclaredFields();
+
+        //参与过滤的字段
+        List<Field> fs = new ArrayList<>();
+        for (Field f : fields) {
+            f.setAccessible(true);
+            if (map.containsKey(f.getName()))
+                fs.add(f);
+        }
+
+        //过滤数据
+        for (Object obj : all) {
+            if (fieldEquals(fs, obj, map))
+                rs.add(obj);
+        }
+        return rs;
+    }
+
+    public static boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map) {
+        try {
+            for (Field f : fs) {
+                if (StringUtils.isEmpty(map.get(f.getName()).toString()))
+                    continue;
+
+                if (f.get(obj) == null || f.get(obj).toString().indexOf(map.get(f.getName()).toString()) == -1)
+                    return false;
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            return false;
+        }
+        return true;
+    }
+}
+package com.bsth.data.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 集合分页工具
+ * Created by panzhao on 2017/8/2.
+ */
+public class ListPageQueryUtils {
+
+    public static List paging(List all, int page, int pageSize) {
+        List rs = new ArrayList(pageSize);
+
+        int s = page * pageSize;
+        int e = (page + 1) * pageSize;
+
+        int size = all.size();
+
+        if (e > size)
+            e = size;
+
+        if (s > size)
+            return rs;
+
+        for (; s < e; s++) {
+            rs.add(all.get(s));
+        }
+        return rs;
+    }
+}
 package com.bsth.entity.directive;
 import com.bsth.entity.directive.DC0.DC0Data;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
 import java.util.Date;
@@ -62,7 +63,53 @@ public class D80 {
 	private Date handleTime;
 	private String remarks;
-	
+
+	private Long schId;
+
+	@Transient
+	@JsonIgnore
+	private String lineId;
+
+	@Transient
+	@JsonIgnore
+	private String nbbm;
+
+	@Transient
+	@JsonIgnore
+	private Short requestCode;
+
+	public Long getSchId() {
+		return schId;
+	}
+
+	public void setSchId(Long schId) {
+		this.schId = schId;
+	}
+
+	public String getLineId() {
+		return data.lineId;
+	}
+
+	public String getNbbm() {
+		return data.nbbm;
+	}
+
+	public void setLineId(String lineId) {
+		this.lineId = lineId;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public Short getRequestCode() {
+		return requestCode;
+	}
+
+	public void setRequestCode(Short requestCode) {
+		this.requestCode = requestCode;
+	}
+
 	@Embeddable
 	public static class D80Data {
@@ -11,6 +11,8 @@ import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.utils.ListFilterUtils;
+import com.bsth.data.utils.ListPageQueryUtils;
 import com.bsth.entity.directive.*;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.SysUser;
@@ -110,8 +112,11 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 logger.warn("烂班不允许发送调度指令....");
                 return -1;
             }
+
+            //待发应到时间
+            String dfsj = fmtHHmm.print(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
             String text = "您已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
-                    + sch.getQdzName() + "发往" + sch.getZdzName() ;
+                    + sch.getQdzName() + "发往" + sch.getZdzName() + ";应到 " + dfsj;
             if(sch.getBcType().equals("venting")){
                 text += " (直放)";
@@ -445,7 +450,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     @Override
     public Map<String, Object> findAll80(Map<String, Object> map, int page, int size) {
-        List<D80> d80s = new ArrayList<>();
+        /*List<D80> d80s = new ArrayList<>();
         Object nbbm = map.get("nbbm");
         if (null != nbbm && StringUtils.isNotEmpty(nbbm.toString())) {
@@ -489,8 +494,25 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         Map<String, Object> rsMap = new HashMap<>();
         rsMap.put("list", rs);
         rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
-        rsMap.put("page", page);
+        rsMap.put("page", page);*/
+        List all = ListFilterUtils.filter(pilotReport.findAll(), map, D80.class);
+        //排序
+        Collections.sort(all, new Comparator<D80>() {
+            @Override
+            public int compare(D80 o1, D80 o2) {
+                return (int) (o2.getTimestamp() - o1.getTimestamp());
+            }
+        });
+        List<D80> d80s = ListPageQueryUtils.paging(all, page, size);
+        //时间格式化
+        for (D80 d80 : d80s) {
+            d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
+        }
+        Map<String, Object> rsMap = new HashMap<>();
+        rsMap.put("list", d80s);
+        rsMap.put("totalPages", all.size() % size == 0 ? all.size() / size - 1: all.size() / size);
+        rsMap.put("page", page);
         return rsMap;
     }
@@ -958,6 +958,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(tsSet.contains(schedule2.getId()) || schedule2.getBcType().toString().equals("in") || schedule2.getBcType().toString().equals("out")){
 						fcsj2 = schedule1.getZdsjT();
 					}
+					if(fcsj2 < fcsj1)
+						fcsj2 += 1440l;
 					if(sfqr == 1 && time1 > fcsj1){
 						jhyysj += fcsj2 - time1;
 					}else if(sfqr == 1 && time2 < fcsj2){
@@ -966,7 +968,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						jhyysj += fcsj2 - fcsj1;
 					}
 					if(jhyysj < 0){
-						System.out.println(fcsj2 + " - " + fcsj1);
+						System.out.println(fcsj2 + " - " + fcsj1 + " = " + (fcsj2 - fcsj1));
 					}
 					jhyysj1 += fcsj2 - fcsj1;
 				}
@@ -1010,7 +1012,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					List<ChildTaskPlan> cTasks = cMap.get(schedule.getId());
 					for(ChildTaskPlan childTaskPlan : cTasks){
 						Map<String, Object> temp = new HashMap<String, Object>();
-						if(childTaskPlan.getMileageType().equals("empty") || childTaskPlan.isDestroy()){
+						if(!childTaskPlan.getMileageType().equals("service") || childTaskPlan.isDestroy()
+								|| !childTaskPlan.getType1().equals("正常") || childTaskPlan.getCcId() != null){
 							temp.put("lc", null);
 							temp.put("fcsj", null);
 							temp.put("zdsj", null);
@@ -1071,6 +1074,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				} else if(i == keyList.size() - 1){
 					fcsj2 = Long.valueOf(m2.get("zdsj").toString());
 				}
+				if(fcsj2 < fcsj1){
+					fcsj2 += 1440l;
+				}
 				if(sfqr == 1 && time1 > fcsj1){
 					sjyysj += fcsj2 - time1;
 				}else if(sfqr == 1 && time2 < fcsj2){
@@ -60,6 +60,9 @@ import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.*;
 import com.bsth.websocket.handler.SendUtils;
+import com.github.stuxuhai.jpinyin.PinyinException;
+import com.github.stuxuhai.jpinyin.PinyinFormat;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -2464,6 +2467,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> map = new HashMap<String, Object>();
     	if(list.size()>0){
 	        map.put("xlName", list.get(0).getXlName());
+	        try {
+				map.put("xlNamePy", PinyinHelper.convertToPinyinString(list.get(0).getXlName(), "" , PinyinFormat.WITHOUT_TONE));
+			} catch (PinyinException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 	        double jhyygl=culateService.culateJhgl(list);//计划营运公里
 	        double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
 	        map.put("jhlc", jhyygl);
@@ -2480,8 +2489,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	        map.put("sjzgl", Arith.add(zyygl, zksgl));
 	        map.put("sjgl",zyygl);
 	        map.put("sjksgl", zksgl);
-	
-	        map.put("ssgl", culateService.culateLbgl(list));
+	        double ssgl= culateService.culateLbgl(list);
+	        map.put("ssgl", ssgl);
+	        
+	        //计划+临加-少驶=实驶
+	        double jl=Arith.add(jhyygl, ljgl);
+	        if(Arith.sub(jl, ssgl)==sjyygl){
+	        	map.put("zt", 0);
+	        }else{
+	        	map.put("zt", 1);
+	        }
+	        
 	        map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
 	        map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
 	        map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
@@ -2568,7 +2586,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
         }
-
+        
+        Collections.sort(lMap,new AccountXlbm());
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("xlName", "合计");
         double jhyygl=culateService.culateJhgl(list);//计划营运公里
@@ -2587,7 +2606,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("sjzgl", Arith.add(zyygl, zksgl));
         map.put("sjgl",zyygl);
         map.put("sjksgl", zksgl);
-        map.put("ssgl", culateService.culateLbgl(list));
+        
+        double ssgl= culateService.culateLbgl(list);
+        map.put("ssgl", ssgl);
+        //计划+临加-少驶=实驶
+        double jl=Arith.add(jhyygl, ljgl);
+        if(Arith.sub(jl, ssgl)==sjyygl){
+        	map.put("zt", 0);
+        }else{
+        	map.put("zt", 1);
+        }
         map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
         map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
         map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
@@ -3270,7 +3298,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleRealInfo sch = dayOfSchedule.get(id);
             if (sch != null) {
                 sch.setBcType(bcType);
-                sch.addRemarks(remarks);
+                sch.setRemarks(remarks);
                 rs.put("status", ResponseCode.SUCCESS);
                 rs.put("t", sch);
@@ -4942,3 +4970,14 @@ class AccountMap2 implements Comparator&lt;Map&lt;String, Object&gt;&gt;{
 			return  o2.get("clZbh").toString().compareTo(o1.get("clZbh").toString());
 		}
 }
+
+class AccountXlbm implements Comparator<Map<String, Object>>{
+	 @Override
+		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+			// TODO Auto-generated method stub
+//		 PinyinHelper.convertToPinyinString(ppy.getName(),
+//		 "" , PinyinFormat.WITHOUT_TONE)
+			return  o1.get("xlNamePy").toString().compareTo(
+					o2.get("xlNamePy").toString());
+		}
+}
@@ -593,7 +593,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							while (it.hasNext()) {
 								ChildTaskPlan childTaskPlan = it.next();
 								if (childTaskPlan.getMileageType().equals("service")
-										&& "正常".equals(childTaskPlan.getType1())) {
+										&& "正常".equals(childTaskPlan.getType1())
+										&& childTaskPlan.getCcId()==null) {
 									if (!childTaskPlan.isDestroy()) {
 										Float jhgl = childTaskPlan.getMileage() == null ? 0
 												: childTaskPlan.getMileage();
@@ -769,7 +770,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				xxkzgf=0,xxkwgf=0,xxm=0,xxmzgf=0,xxmwgf=0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo s=lists.get(i);
-			if(s.getFcsjActual()!=null){
+			if(s.getFcsjActual()!=null && !s.isCcService()
+					&& !isInOut(s)){
 				String xlDir=s.getXlDir();
 				String fcsjs=s.getFcsj();
 				String[] fcsjStr = fcsjs.split(":");
@@ -779,7 +781,6 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				long fcsjActual = Long.parseLong(fcsjActualsStr[0]) * 60 + Long.parseLong(fcsjActualsStr[1]);
 				if("0".equals(xlDir)){
-					
 					if(fcsj-fcsjActual>1){
 						sxk++;
 						if(fcsj>zgf1&&fcsj<zgf2)
@@ -881,7 +882,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
             else if(isInOut(sch))
                 continue;
             //主任务烂班
-            else if(sch.getStatus() == -1){
+            else if(sch.getStatus() == -1 && !sch.isCcService()){
                 if(sch.getAdjustExps().equals(item) ||
                         (StringUtils.isEmpty(sch.getAdjustExps()) && item.equals("其他"))){
                     sum = Arith.add(sum, sch.getJhlcOrig());
@@ -80,6 +80,9 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		if(s.getBcType().equals("ldks")){
 			fage=true;
 		}
+		if(s.isCcService()){
+			fage=true;
+		}
 		return fage;
 	}
@@ -427,7 +427,7 @@
 				layer.msg("请选择时间");
 				return;
 			}
-			$("#xlmc").html(xlName);
+			$("#xlmc").html(xlName+" "+date+" ");
 // 			$("#ddrbBody").height($(window).height()-300);
 			$("c").html("全日");
 			$("#export").removeAttr("disabled");
@@ -316,7 +316,7 @@
 </script>
 <script type="text/html" id="statisticsDaily">
 	{{each list as obj i}}
-		<tr>
+		<tr {{if obj.zt==1}}style='color: red'{{/if}}>
 			<td>{{obj.xlName}}</td>
 			<td>{{obj.jhzlc}}</td>
 			<td>{{obj.jhlc}}</td>
@@ -44,6 +44,7 @@
         #main-tab-content{
             padding: 0 !important;
+            list-style: none;
         }
         .home-panel{
@@ -99,6 +100,8 @@
 <script src="/assets/js/d3.min.js"></script>
 <!-- EventProxy  -->
 <script src="/assets/js/eventproxy.js"></script>
+<!-- Geolib -->
+<script src="/real_control_v2/geolib/geolib.js" merge="plugins"></script>
 <script>
@@ -42,13 +42,23 @@
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/themes/airbnb.css" merge="plugins"/>
     <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
+
+    <style>
+        .main-container .map-panel{
+            position: absolute;
+            top:0;
+            left: 0;
+            width: 20px;
+            z-index: 999;
+            height: 20px;
+        }
+    </style>
 </head>
 <body>
 <div class="main-container" style="height: 100%;">
     <span style="position: absolute;left: calc(50% - 35px);top: calc(45% - 35px);">加载中...</span>
 </div>
-
 <!-- 地图相关 -->
 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
 <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
@@ -108,6 +118,8 @@
         //嵌入地图页面
         $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {
             $('.map-system-msg.flex-left').remove();
+
+            $(this).append('<span class="map-panel"></span>');//判断里有JS判定这个容器是否显示
         });
     });
@@ -125,6 +125,7 @@
     line-height: 25px;
     font-size: 13px;
     padding: 0 0 3px;
+    position: relative;
 }
 .data-wrap .data-title span.data-title-text {
@@ -326,4 +327,13 @@ span.signal-state-speed-limit{
 #send-phrase-multi-modal .tools>span{
     cursor: pointer;
     margin-left: 12px;
+}
+
+.device_list_filter_icon{
+    position: absolute;
+    right: 15px;
+}
+
+.device_list_filter_icon.online{
+
 }
 \ No newline at end of file
@@ -42,9 +42,9 @@
         <div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
-                    <label class="uk-form-label" for="form-s-t">备注<small class="font-danger">（不超过20个字符）</small></label>
+                    <label class="uk-form-label" for="form-s-t">备注<small class="font-danger">（不超过50个字符）</small></label>
                     <div class="uk-form-controls">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="20" >{{remarks}}</textarea>
+                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="50" >{{remarks}}</textarea>
                     </div>
                 </div>
             </div>
@@ -164,11 +164,10 @@
                 $('[name=bcType]', modal).on('change', function(){
                     var type = $(this).val();
-                    if(sch.bcType != 'normal')
+                    if(sch.bcType == 'in' || sch.bcType == 'out')
                         return;
-                    //重置类型，等待调整界面触发刷新事件
-                    $(this).val(sch.bcType);
+
                     var url, detailModal;
                     if(type=='venting'){
                         url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_venting.html';
@@ -181,6 +180,8 @@
                     else
                         return;
+                    //重置类型，等待调整界面触发刷新事件
+                    $(this).val(sch.bcType);
                     $.get(url, function(htmlStr){
                         $(document.body).append(htmlStr);
@@ -188,6 +189,18 @@
                         $(detailModal).trigger('init', {sch: sch, parentModal: modal, _dfsj: $('[name=dfsj]', modal).val()});
                     })
                 });
+
+                /**
+                 * 相同选项 也触发 onchange
+                 */
+                $('[name=bcType]', modal).mousedown(function () {
+                    this.sindex = $(this)[0].selectedIndex;
+                    $(this)[0].selectedIndex = -1;
+                }).mouseout(function () {
+                    if ($(this)[0].selectedIndex === -1) {
+                        $(this)[0].selectedIndex = this.sindex;
+                    }
+                });
             });
         })();
     </script>
@@ -267,20 +267,22 @@
                 $('select[name=bcType]', modal).on('change', function(){
                     var type = $(this).val();
-                    if(sch.bcType != 'normal')
+                    if(sch.bcType == 'in' || sch.bcType == 'out')
                         return;
-                    //重置类型，等待调整界面触发刷新事件
-                    $(this).val(sch.bcType);
                     var url, detailModal;
                     if(type=='venting'){
                         url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_venting.html';
                         detailModal='#bctype-venting-modal';
                     }
-                    else{
+                    else if(type=='major'){
                         detailModal='#bctype-major-modal';
                         url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_major.html';
                     }
+                    else return;
+
+                    //重置类型，等待调整界面触发刷新事件
+                    $(this).val(sch.bcType);
                     $.get(url, function(htmlStr){
                         $(document.body).append(htmlStr);
@@ -289,6 +291,18 @@
                         $(detailModal).trigger('init', {sch: sch, parentModal: modal});
                     })
                 });
+
+                /**
+                 * 相同选项 也触发 onchange
+                 */
+                $('select[name=bcType]', modal).mousedown(function () {
+                    this.sindex = $(this)[0].selectedIndex;
+                    $(this)[0].selectedIndex = -1;
+                }).mouseout(function () {
+                    if ($(this)[0].selectedIndex === -1) {
+                        $(this)[0].selectedIndex = this.sindex;
+                    }
+                });
             });
             function validation_s_e_Time(data) {
@@ -5,8 +5,9 @@
                 <h4 class="uk-panel-title">{{data.nbbm}} {{text}}</h4>
                 <code>{{dateStr}}</code>
                 <div class="uk-button-group">
-                    <a class="uk-button uk-button-mini uk-button-primary">同意</a>
-                    <a class="uk-button uk-button-mini reject">不同意</a>
+                    <button class="uk-button uk-button-mini uk-button-primary">同意</button>
+                    <button class="uk-button uk-button-mini reject">不同意</button>
+                    <a class="edit_link" data-id="{{schId}}" data-line="{{data.lineId}}" >编辑</a>
                 </div>
             </div>
         </div>
@@ -12,8 +12,12 @@
                     </legend>
                     <span class="horizontal-field">请求代码</span>
                     <select name="requestCode">
-                        <option value="-1">全部</option>
+                        <option value="">全部</option>
                     </select>
+                    <span class="horizontal-field">线路</span>
+                    <div class="uk-autocomplete uk-form autocomplete-line" >
+                        <input type="text" name="lineId" placeholder="线路">
+                    </div>
                     <span class="horizontal-field">车辆</span>
                     <div class="uk-autocomplete uk-form autocomplete-cars" >
                         <input type="text" name="nbbm" placeholder="车辆自编号">
@@ -84,9 +88,9 @@
                 }
                 $('[name=requestCode]', modal).append(opt);
                 //车辆 autocomplete
-                $.get('/basic/cars', function(rs) {
-                    gb_common.carAutocomplete($('.autocomplete-cars', modal), rs);
-                });
+                gb_common.carAutocomplete($('.autocomplete-cars', modal), gb_data_basic.carsArray());
+                //线路 autocomplete
+                gb_common.lineAutocomplete($('.autocomplete-line', modal));
                 query();
             });
@@ -102,6 +106,12 @@
                 var data = form.serializeJSON();
                 data.page = page;
                 data.size = pageSize;
+                //线路转换成编码
+                if(data.lineId){
+                    var lineCode = gb_data_basic.findCodeByLinename(data.lineId);
+                    if(lineCode)
+                        data.lineId=lineCode;
+                }
                 $.get('/directive/findAll80', data, function(rs) {
                     $.each(rs.list, function(){
                         //命令字转中文
@@ -122,7 +132,7 @@
                     if (resetPagination)
                         pagination(rs.totalPages + 1, rs.page);
                 })
-            }
+            };
             var resetPagination = true;
             var pagination = function(pages, currentPage) {
@@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-11-01',
-        text: '<h5>1、修正了XP系统下主页滚动条的显示问题（Windows XP sp3 + chrome 49.0.2623.112）。</h5>'
+        date: '2017-11-02',
+        text: '<h5>1、修正二次放站时，需要先将班次切回正常班次的问题。</h5><h5>2、驾驶员请求信使上，添加“编辑”链接，可弹出对应班次的发车信息微调框。</h5>'
     };
     var storage = window.localStorage
@@ -235,8 +235,10 @@ var gb_sch_websocket = (function () {
         dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
     });
+
     //80同意
     $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button-primary', function () {
+        $(this).attr('disabled', 'disabled');
         var panel = $(this).parents('.sys-note-80')
             , id = panel.data('id');
@@ -245,6 +247,7 @@ var gb_sch_websocket = (function () {
     //80不同意
     $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button.reject', function () {
+        $(this).attr('disabled', 'disabled');
         var panel = $(this).parents('.sys-note-80')
             , id = panel.data('id');
@@ -329,6 +332,24 @@ var gb_sch_websocket = (function () {
         gb_schedule_context_menu.dftz(nextSch);
     });
+    /**
+     * 信使 sys-note-80 编辑
+     */
+    $(document).on('click', '.sys-note-80 .edit_link', function () {
+        var id = $(this).data('id'),
+            lineCode = $(this).data('line');
+
+        var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
+        if(!sch)
+            return;
+
+        gb_schedule_context_menu.fcxxwt(sch);
+        var dl = gb_schedule_table.scroToDl(sch);
+        //高亮
+        gb_schedule_table.reset_drag_active_all(dl);
+        dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
+    });
+
     return {
         sock: function () {
             return schSock;