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

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents 98365b36 478adfaf
Showing 23 changed files with 332 additions and 60 deletions
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/calc/ReCalcDataController.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/gps/entity/DeviceChange.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/fatso/start.js
src/main/resources/static/pages/control/lineallot_v2/main.html
src/main/resources/static/pages/home.html
src/main/resources/static/pages/permission/authorize_all/authorize.html
src/main/resources/static/pages/permission/authorize_all/user_auth.html
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/car_info_all.html
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
src/main/resources/static/real_control_v2/fragments/north/tabs.html
src/main/resources/static/real_control_v2/js/data/data_basic.js
src/main/resources/static/real_control_v2/js/utils/svg_chart.js
src/main/resources/static/real_control_v2/mapmonitor/css/real.css
@@ -84,7 +84,7 @@ public class GpsController {
     @RequestMapping(value = "/gpsHistory/multiple")
     public List<Map<String, Object>> gpsHistory(@RequestParam String[] nbbmArray, @RequestParam Long st,
                                                 @RequestParam Long et) {
-        return gpsService.history(nbbmArray, st, et);
+        return (List<Map<String, Object>>) gpsService.history(nbbmArray, st, et).get("list");
     }
 	/*@RequestMapping(value = "/analyse/ram")
+package com.bsth.controller.realcontrol.calc;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.util.HttpClientUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 重新统计（数据汇总）
+ * Created by panzhao on 2018/1/25.
+ */
+@RestController
+@RequestMapping("/sch/reCalc")
+public class ReCalcDataController {
+
+    private static String reCalcUrl = "http://10.10.150.24:30571/reCalc/scheduleDetail";
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    /**
+     * 重新统计班次明细
+     * @param date
+     * @param line
+     * @return
+     */
+    @RequestMapping(value = "/scheduleDetail", method = RequestMethod.POST)
+    public Map<String, Object> reCalcScheduleDetail(@RequestParam String date, @RequestParam String line){
+        Map<String, Object> rs = new HashMap();
+        try{
+            HttpClientUtils.post(reCalcUrl + "?rq=" + date + "&lineCode=" + line, "");
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+        return rs;
+    }
+}
@@ -21,7 +21,7 @@ import java.util.List;
 @Component
 public class SafeDrivDataLoadThread extends Thread{
-    private final static String url = "http://180.166.5.82:9005/bsth-safedriving/Crlcxb/realtimeInterface.do";
+    private final static String url = "http://180.166.5.82:9007/bsth-safedriving/Crlcxb/realtimeInterface.do";
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -164,7 +164,7 @@ public class Line implements Serializable {
 	/**
 	 * 逻辑删除标记 为 1：标识已删除
 	 */
-	private Integer remove;
+	private Integer remove = 0;
 	public Integer getSpacGrade() {
 		return spacGrade;
@@ -13,7 +13,7 @@ public interface GpsService {
 	List<Map<String, Object>> history(String device, Long startTime, Long endTime, int directions);
-	List<Map<String, Object>> history(String[] nbbmArray, Long st, Long et);
+	Map<String, Object> history(String[] nbbmArray, Long st, Long et);
 	Map<String, Object> findBuffAeraByCode(String code, String type);
@@ -168,10 +168,12 @@ public class GpsServiceImpl implements GpsService {
     private static DateTimeFormatter fmtyyyy = DateTimeFormat.forPattern("yyyy");
     @Override
-    public List<Map<String, Object>> history(String[] nbbmArray, Long st, Long et) {
+    public Map<String, Object> history(String[] nbbmArray, Long st, Long et) {
+        Map<String, Object> rsMap = new HashMap<>();
         List<Map<String, Object>> list = new ArrayList<>();
+        rsMap.put("list", list);
         if (et - st > GPS_RANGE)
-            return list;
+            return rsMap;
         st = st * 1000;
         et = et * 1000;
@@ -193,6 +195,7 @@ public class GpsServiceImpl implements GpsService {
             dc.setDevice(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
             dc.setSt(st);
             dc.setEt(et);
+            dc.setType(1);
             dcs.add(dc);
         }
@@ -223,7 +226,7 @@ public class GpsServiceImpl implements GpsService {
             if(i == len - 1)
                 sql.append(" ORDER BY device_id,ts,stop_no");
             else
-                sql.append(" UNION");
+                sql.append(" UNION ");
         }
         logger.info("轨迹回放 nbbm: " + nbbm + " -st: " + st + " -et: " + et + " -sql: " + sql.toString());
@@ -302,7 +305,10 @@ public class GpsServiceImpl implements GpsService {
                 return (int) (Long.parseLong(o1.get("ts").toString()) - Long.parseLong(o2.get("ts").toString()));
             }
         });
-        return list;
+
+        rsMap.put("list", list);
+        rsMap.put("dcs", dcs);
+        return rsMap;
     }
     private String map_get_str(Map<String, Object> map, String key){
@@ -339,7 +345,7 @@ public class GpsServiceImpl implements GpsService {
             }
             for(DeviceChange dc : dcs){
-                if(dc.getEt() > st)
+                if(dc.getEt() > st || dc.getEt()==0)
                     rs.add(dc);
             }
         }catch (Exception e){
@@ -379,9 +385,9 @@ public class GpsServiceImpl implements GpsService {
                     " where weeks_year in ("+sWeekOfYear+", "+eWeekOfYear+") and device_id='"+dc.getDevice()+"' and ts > "+t1+" and ts < " + t2);
             if(i == len - 1)
-                sql.append(" ORDER BY device_id,ts,stop_no");
+                sql.append(" ORDER BY device_id,ts,stop_no ");
             else
-                sql.append(" UNION");
+                sql.append(" UNION ");
         }
         JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource());
@@ -606,7 +612,7 @@ public class GpsServiceImpl implements GpsService {
         try {
             //获取历史gps 数据
-            List<HistoryGps_DTO> list = HistoryGps_DTO.craete(history(new String[]{nbbm}, st, et));
+            List<HistoryGps_DTO> list = HistoryGps_DTO.craete((List<Map<String, Object>>) history(new String[]{nbbm}, st, et).get("list"));
             if (list != null && list.size() > 0) {
                 //获取路段信息
                 String sql = "select ID, ST_AsText(GROAD_VECTOR) as GROAD_VECTOR,ROAD_CODE,ROAD_NAME,SPEED from bsth_c_road where road_code in(select section_code from bsth_c_sectionroute where line_code=? and destroy=0)";
@@ -655,7 +661,8 @@ public class GpsServiceImpl implements GpsService {
         try {
             //获取历史gps 数据
-            List<HistoryGps_DTOV3> list = HistoryGps_DTOV3.craete(history(new String[]{nbbm}, st, et));
+            Map<String, Object> gpsMap = history(new String[]{nbbm}, st, et);
+            List<HistoryGps_DTOV3> list = HistoryGps_DTOV3.craete((List<Map<String, Object>>) gpsMap.get("list"));
             if (list != null && list.size() > 0) {
                 //关联路段名称
                 Map<String, String> sectionCode2Name = GeoCacheData.sectionCode2NameMap();
@@ -696,6 +703,7 @@ public class GpsServiceImpl implements GpsService {
             rs.put("speedList", speedList);
             rs.put("outboundList", outboundList);
             rs.put("sumMileage", new DecimalFormat(".##").format(sum / 1000));
+            rs.put("dcs", gpsMap.get("dcs"));
         } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
@@ -707,7 +715,7 @@ public class GpsServiceImpl implements GpsService {
     @Override
     public void trailExcel(String nbbm, long st, long et, HttpServletResponse resp) {
         //获取历史gps 数据
-        List<HistoryGps_DTOV3> list = HistoryGps_DTOV3.craete(history(new String[]{nbbm}, st, et));
+        List<HistoryGps_DTOV3> list = HistoryGps_DTOV3.craete((List<Map<String, Object>>) history(new String[]{nbbm}, st, et).get("list"));
         if (list != null && list.size() > 0) {
             //关联路段名称
             Map<String, String> sectionCode2Name = GeoCacheData.sectionCode2NameMap();
@@ -11,6 +11,9 @@ public class DeviceChange {
     private long st;
     private long et;
+    //为1 表示没有设备变更记录，直接从车辆信息上关联的设备号
+    private int type=0;
+
     public String getNbbm() {
         return nbbm;
     }
@@ -42,4 +45,12 @@ public class DeviceChange {
     public void setEt(long et) {
         this.et = et;
     }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
 }
@@ -1234,7 +1234,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleModifyLogger.sftz(sch, fcsjActual, remarks);
             sch.setFcsjActualAll(fcsjActual);
-            sch.setRemark(remarks);
+            sch.setRemarks(remarks);
             sch.calcStatus();
             //if(sch.isLate2()){
                 //取消应发未到标记
@@ -16,7 +16,7 @@ var platform = process.platform;
 var iswin = platform=='win32';
 var sp = platform=='win32'?'\\':'/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission'+sp+'authorize_all', 'summary', 'history_sch' ,'report'+sp+'oil','base'+sp+'geo_data_edit']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission'+sp+'authorize_all', 'summary', 'history_sch' ,'report'+sp+'oil','base'+sp+'geo_data_edit', 'forms', 'report']
 	,ep = new EventProxy()
 	,pName = 'bsth_control'
 	,path = process.cwd()
@@ -123,6 +123,14 @@
         .uk-button-default{
             background: #e0e0e0 !important;
         }
+
+        .line_list_all_wrap > .item.destroy{
+            color: #f64242;
+        }
+
+        .checked_list > .item.destroy{
+            background: #ff5c5c;
+        }
     </style>
 </head>
@@ -169,7 +177,7 @@
 <script id="line_list_items_temp" type="text/html">
     {{each list as obj i}}
-    <span class="item" data-id="{{obj.lineCode}}" data-gsbm="{{obj.company}}_{{obj.brancheCompany}}">{{obj.name}}</span>
+    <span class="item {{obj.destroy==1?'destroy':''}}" data-id="{{obj.lineCode}}" data-gsbm="{{obj.company}}_{{obj.brancheCompany}}">{{obj.name}}</span>
     {{/each}}
 </script>
@@ -258,7 +266,7 @@
     /**
      * 查询所有线路
      */
-    $.get('/line/all', {destroy_eq: 0}, function (list) {
+    $.get('/line/all', {remove_ne: 1}, function (list) {
         ep.emit('all_lines', list);
     });
@@ -283,7 +291,7 @@
         }
         else {
             $(this).addClass('active');
-            var span = $('<span data-id="'+lineCode+'" class="item uk-card uk-card-default uk-animation-slide-bottom">'+name+'</span>')
+            var span = $('<span data-id="'+lineCode+'" class="item uk-card uk-card-default uk-animation-slide-bottom '+($(this).hasClass('destroy')?"destroy":"")+'">'+name+'</span>')
                     .one('webkitAnimationEnd', function () {
                         $(this).removeClass('uk-animation-slide-bottom');
                     });
@@ -63,31 +63,29 @@
         <li><span class="label s_c_add">新增</span>1、新增站点间双路段生成功能。</li>
         <li><span class="label s_c_change">修复</span>2、修复一个bug，在线路编辑页面初始化线路的系统规划功能，百度地图上缺少的线路会显示一直加载。</li>
         <li><span class="label s_c_change">修复</span>3、修复一个bug，在修改站点时选择取消，不点击站点树状图，直接选择上/下行操作里的修改站点，会出现没有可修改站点的bug。</li>
-        <li><span class="label s_c_change">修复</span>4、线路跨版本更新修复。</li>
-        <li><span class="label s_c_change">修复</span>5、线路、线路版本、停车场查询列表显示公司。</li>
-        <li><span class="label s_c_add">新增</span>6、新增线路删除功能，可以删除已撤销的线路，仅用于剔除录入错误的数据，如出现误操作，请联系管理员恢复数据。</li>
+        <li><span class="label s_c_add">新增</span>4、新增线路删除功能，可以删除已撤销的线路，仅用于剔除录入错误的数据，如出现误操作，请联系管理员恢复数据。</li>
         <li class="sub_title"><h6>用油和报表</h6></li>
-        <li><span class="label s_c_add">新增</span>7、油量，电量记录操作日志。</li>
-        <li><span class="label s_c_change">修复</span>8、修正获取加存油信息特殊情况下获取不到前一天的进场值。</li>
-        <li><span class="label s_c_change">修复</span>9、行车路单批量导出，由之前导出成多个压缩文件改为导出成一个文件</li>
-        <li><span class="label s_c_add">新增</span>10、新增班次准点率统计导出。</li>
-        <li><span class="label s_c_change">修复</span>11、修复一个bug，这个bug导致在更换设备号后，驾驶员请求台账出现车辆字段为空的情况。</li>
+        <li><span class="label s_c_add">新增</span>5、油量，电量记录操作日志。</li>
+        <li><span class="label s_c_change">修复</span>6、修正获取加存油信息特殊情况下获取不到前一天的进场值。</li>
+        <li><span class="label s_c_change">修复</span>7、行车路单批量导出，由之前导出成多个压缩文件改为导出成一个文件</li>
+        <li><span class="label s_c_add">新增</span>8、新增班次准点率统计导出。</li>
+        <li><span class="label s_c_change">修复</span>9、修复一个bug，这个bug导致在更换设备号后，驾驶员请求台账出现车辆字段为空的情况。</li>
         <li class="sub_title"><h6>计划调度</h6></li>
-        <li><span class="label s_c_add">新增</span>12、时刻表自动生成，根据时间间隔自动时刻表生成，导出生成的时刻表数据。</li>
-        <li><span class="label s_c_add">新增</span>13、时刻表版本导入，导入时刻表可选版本，编辑时间表带版本。</li>
-        <li><span class="label s_c_add">新增</span>14、添加车辆报废功能，释放报废的车辆所持有的设备编号。</li>
-        <li><span class="label s_c_change">修复</span>15、车辆设备管理，启用日期精确到时间分钟。</li>
+        <li><span class="label s_c_add">新增</span>10、时刻表自动生成，根据时间间隔自动时刻表生成，导出生成的时刻表数据。</li>
+        <li><span class="label s_c_add">新增</span>11、时刻表版本导入，导入时刻表可选版本，编辑时间表带版本。</li>
+        <li><span class="label s_c_add">新增</span>12、添加车辆报废功能，释放报废的车辆所持有的设备编号。</li>
+        <li><span class="label s_c_change">修复</span>13、车辆设备管理，启用日期精确到时间分钟。</li>
         <li class="sub_title"><h6>线调</h6></li>
-        <li><span class="label s_c_change">修复</span>16、修复一个轨迹回放的bug，这个bug导致在车辆更换设备号之后，无法回放更换设备之前的数据。</li>
-        <li><span class="label s_c_change">修复</span>17、修复驾驶员请求信使，无法点击不同意的问题。</li>
-        <li><span class="label s_c_add">新增</span>18、新增异常提示，当子任务公里与计划不等时，子任务 badge 将会显示为红色，相等则为绿色。</li>
-        <li><span class="label s_c_add">新增</span>19、新增子任务修改功能。</li>
-        <li><span class="label s_c_add">新增</span>20、新增点击路牌单元格时，信使框下方弹出tip，显示路牌公里。</li>
-        <li><span class="label s_c_add">新增</span>21、新增车辆状态标记，如果车辆在套跑其他线路班次，在车辆单元格右上角会出现一个 icon 显示车辆当前执行的线路。</li>
-        <li><span class="label s_c_add">新增</span>22、新增双击车辆单元格展开全部车辆面板，显示所有的计划用车和实际的车载信号。</li>
-        <li><span class="label s_c_add">新增</span>23、新增超速提醒，地图模块左下角。</li>
-        <li><span class="label s_c_remove">删除</span>24、移除了表格渐变色。</li>
-        <li><span class="label s_c_add">新增</span>25、模拟图车辆展开的tip上，显示司售信息。</li>
-        <li><span class="label s_c_add">新增</span>26、轨迹回放窗口打开时，点击班次，会自动将班次车辆时间写入轨迹搜索表单。</li>
+        <li><span class="label s_c_change">修复</span>14、修复一个轨迹回放的bug，这个bug导致在车辆更换设备号之后，无法回放更换设备之前的数据。</li>
+        <li><span class="label s_c_change">修复</span>15、修复驾驶员请求信使，无法点击不同意的问题。</li>
+        <li><span class="label s_c_add">新增</span>16、新增异常提示，当子任务公里与计划不等时，子任务 badge 将会显示为红色，相等则为绿色。</li>
+        <li><span class="label s_c_add">新增</span>17、新增子任务修改功能。</li>
+        <li><span class="label s_c_add">新增</span>18、新增点击路牌单元格时，信使框下方弹出tip，显示路牌公里。</li>
+        <li><span class="label s_c_add">新增</span>19、新增车辆状态标记，如果车辆在套跑其他线路班次，在车辆单元格右上角会出现一个 icon 显示车辆当前执行的线路。</li>
+        <li><span class="label s_c_add">新增</span>20、新增双击车辆单元格展开全部车辆面板，显示所有的计划用车和实际的车载信号。</li>
+        <li><span class="label s_c_add">新增</span>21、新增超速提醒，地图模块左下角。</li>
+        <li><span class="label s_c_remove">删除</span>22、移除了表格渐变色。</li>
+        <li><span class="label s_c_add">新增</span>23、模拟图车辆展开的tip上，显示司售信息。</li>
+        <li><span class="label s_c_add">新增</span>24、轨迹回放窗口打开时，点击班次，会自动将班次车辆时间写入轨迹搜索表单。</li>
     </ul>
 </div>
@@ -181,6 +181,15 @@
             font-size: 14px;
             font-family: 微软雅黑;
         }
+
+        .sub_lines>span.line_btn.destroy{
+            background: #ff5c5c;
+        }
+
+        .sub_lines>span.line_btn.destroy:hover{
+            background: #ff7373;
+        }
+
         .sub_lines>span.line_btn:hover{
             background: #2dd7ed;
         }
@@ -251,6 +260,23 @@
             background: #1e87f0;
             color: #fff;
         }
+
+        .line_checkbox_list>.btn.destroy,
+        .line_checkbox_list>.btn.destroy>input{
+            border-color: #ff9595;
+            color: #ff5c5c;
+        }
+
+        .line_checkbox_list>.btn.destroy.active{
+            background: #ff5c5c;
+            color: #fff;
+        }
+
+        .line_checkbox_list>.btn.destroy.active>input{
+            background-color: #ff5c5c !important;
+            border-color: #ff5c5c !important;
+        }
+
         #role_authorize_wrap .ztree *{
             font-size: 14px;
         }
@@ -267,6 +293,10 @@
         .loading circle{
             stroke: red;
         }
+
+        #select_line_modal .uk-checkbox:checked {
+            background-color: #1e87f0;
+        }
     </style>
 </head>
@@ -455,7 +485,7 @@
     });
     //query all line
-    $.get('/line/all', {'destroy_eq': 0}, function (rs) {
+    $.get('/line/all', {'remove_ne': 1}, function (rs) {
         ep.emit('query_line', rs);
     });
@@ -86,6 +86,14 @@
             <h2 class="uk-modal-title">添加线路权限</h2>
             <div>
                 <form>
+                    <div class="ct_field" style="width: 140px;">
+                        <label>状态</label>
+                        <select class="uk-select" id="modal_type_select" style="width: 94px;">
+                            <option value="-1">全部</option>
+                            <option value="0">营运</option>
+                            <option value="1">撤销</option>
+                        </select>
+                    </div>
                     <div class="ct_field">
                         <label>公司</label>
                         <select class="uk-select" id="modal_company_select"></select>
@@ -115,7 +123,7 @@
             <h5>{{t.fgsName}}</h5>
             <div class="sub_lines">
             {{each t.list as obj j}}
-                <span class="line_btn">{{obj.name}}</span>
+                <span title="{{obj.lineCode}}" class="line_btn {{obj.destroy==1?'destroy':''}}">{{obj.name}}</span>
             {{/each}}
             </div>
         {{/each}}
@@ -128,7 +136,7 @@
     <script id="authorize-modal-lines-temp" type="text/html">
         {{each list as obj i}}
-            <label class="btn" data-gs="{{obj.company}}" data-fgs="{{obj.brancheCompany}}" title="{{obj.name}}" data-code="{{obj.lineCode}}">
+            <label class="btn {{obj.destroy==1?'destroy':''}}" data-gs="{{obj.company}}" data-fgs="{{obj.brancheCompany}}" title="{{obj.name}}" data-code="{{obj.lineCode}}">
                 <input class="uk-checkbox" type="checkbox" >{{obj.name}}
             </label>
         {{/each}}
@@ -240,7 +248,7 @@
                 $('#modal_line_input', modal).focus();
             });
             function render_line_select_modal() {
-                var htmlStr = template('authorize-modal-lines-temp', {list: all_lines});
+                var htmlStr = template('authorize-modal-lines-temp', {list: all_lines, destroy: $('.modal_type_select',modal).val()});
                 $('.line_checkbox_list').html(htmlStr);
                 //选中线路
                 var codeArray=[];
@@ -274,6 +282,7 @@
                     filter_modal_lines();
                 });
                 $('#modal_sub_company_select', modal).on('change', filter_modal_lines);
+                $('#modal_type_select', modal).on('change', filter_modal_lines);
             }
             $('#modal_line_input', modal).on('input', function () {
@@ -296,22 +305,29 @@
             });
             function filter_modal_lines() {
+                console.log('filter_modal_lines');
                 var company=$('#modal_company_select', modal).val(),//公司代码
-                        sub_company=$('#modal_sub_company_select', modal).val();//分公司代码
+                        sub_company=$('#modal_sub_company_select', modal).val(),//分公司代码
+                        type = $('#modal_type_select', modal).val();//线路状态
                 var array = $('.line_checkbox_list>label.btn').css('display', 'none'),s_dom=[];
-                if(!company && !sub_company){
+                if(!company && !sub_company && type==-1){
                     array.css('display', 'inline-block');
                     return;
                 }
+                var status;
                 array.each(function () {
                     if(company && $(this).data('gs')!=company)
                         return true;
                     if(sub_company && $(this).data('fgs')!=sub_company)
                         return true;
+                    status = $(this).hasClass('destroy')?1:0;
+                    if(type!=-1 && type!=status)
+                        return true;
+
                     s_dom.push(this);
                 });
                 for(var i=0,dom;dom=s_dom[i++];)
@@ -1806,7 +1806,7 @@ dl.active &gt; dd.disabled {
     padding: 7px;
     background: #ffffff;
     box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
-    max-height: 290px;
+    max-height: 125px;
     overflow-y: auto;
     min-height: 40px;
 }
@@ -2035,4 +2035,23 @@ dl.active &gt; dd.disabled {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+}
+
+.tab-line.destroy>a{
+    background: #ff5c5c;
+    color: #fff !important;
+    border-radius: 0;
+}
+
+.tab-line.destroy>a:hover{
+    background: #ff3333 !important;
+    border-color: #ff3333 !important;
+}
+
+.uk-tab>li.uk-active.destroy>a{
+    color: red !important;
+}
+
+.uk-tab>li.uk-active.destroy>a:hover{
+    background: #fff !important;
 }
 \ No newline at end of file
@@ -3,7 +3,7 @@
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-            <h2>1006路 -全部车辆</h2></div>
+            <h2><span class="line_name_span"></span> -全部车辆</h2></div>
         <table class="uk-table uk-table-hover" style="table-layout: fixed;">
             <thead>
@@ -52,6 +52,7 @@
                 lineCode = data.lineCode;
                 nbbm = data.nbbm;
+                $('.line_name_span', modal).html(gb_data_basic.lineCode2NameAll()[lineCode]);
                 jsDoQuery(function () {
                     var $cell = $('tr[data-nbbm='+nbbm+']', modal);
                     //定位到行
@@ -431,7 +431,7 @@
                     $(that).prepend('<i class="uk-icon-spinner uk-icon-spin"></i>');
-                    var reCountEp = EventProxy.create('ylbUpdate', function () {
+                    var reCountEp = EventProxy.create('ylbUpdate', 'calcWaybill', 'scheduleDetail', function () {
                         $('i.uk-icon-spin', that).remove();
                         $(that).removeAttr('disabled');
                         notify_succ('重新统计成功！');
@@ -447,6 +447,11 @@
                         reCountEp.emitLater('ylbUpdate');
                     });
+                    //重新统计班次明细
+                    gb_common.$post('/sch/reCalc/scheduleDetail', {date:rq, line: lineCode}, function () {
+                        reCountEp.emitLater('scheduleDetail');
+                    });
+
                 }, '我确定');
             });
         })();
@@ -4,7 +4,7 @@
         <li class="uk-active" ><a>主页</a></li>
         <li id="north_tabs_map_btn"><a>地图</a></li>
         {{each list as line i}}
-        <li class="tab-line" data-code="{{line.lineCode}}"><a>{{line.name}}（<span id="badge_untreated_num_{{line.lineCode}}">0</span>, <span id="badge_yfwf_num_{{line.lineCode}}">0</span>）</a></li>
+        <li class="tab-line {{line.destroy==1?'destroy':''}}" data-code="{{line.lineCode}}"><a>{{line.name}}（<span id="badge_untreated_num_{{line.lineCode}}">0</span>, <span id="badge_yfwf_num_{{line.lineCode}}">0</span>）</a></li>
         {{/each}}
     </ul>
   </script>
@@ -208,6 +208,8 @@ var gb_data_basic = (function () {
         },
         //是否是环线
         isLoopLine: function (lineCode) {
+            if(!stationRoutes[lineCode])
+                return false;
             var data = gb_common.groupBy(stationRoutes[lineCode], 'directions');
             //下行只有2个站点
             var len = data[0].length;
@@ -55,6 +55,8 @@ var gb_svg_chart = (function () {
         var loopLine = gb_data_basic.isLoopLine(lineCode);
         var routes = gb_data_basic.stationRoutes(lineCode);
+        if(!routes)
+            return;
         var data = gb_svg_data_convert.mergeRoute(JSON.parse(JSON.stringify(routes)), enableAttr, lineCode, loopLine),
             len = data.length;
@@ -1342,7 +1342,7 @@ span.flatpickr-weekday{
     width: 100% !important;
     font-size: 12px;
     color: #747474 !important;
-    border-bottom: 1px dashed #ededed;
+    /*border-bottom: 1px dashed #ededed;*/
 }
 .gps-play-back-panel-v3 .play-back-tools-wrap .top-btn-list{
@@ -1448,4 +1448,68 @@ ul.base_line_list&gt;li:nth-child(even)&gt;a {
 ul.base_line_list>li>a:hover{
     color: #fff !important;
     background: #848686 !important;
+}
+.play-back-form>.dynamic_devices{
+    position: absolute;
+    top: 15px;
+    z-index: 9;
+    right: 83px;
+    font-size: 12px;
+    background: #ffd863;
+    padding: 0 5px;
+    border-radius: 2px;
+    box-shadow: 0px 3px 11px rgba(0,0,0,.08);
+    max-width: 120px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    min-width: 60px;
+    text-align: center;
+    cursor: default;
+}
+
+.dynamic_devices_dropdown{
+    position: absolute;
+    z-index: 10;
+    background: #ffd863;
+    top: 40px;
+    left: 160px;
+    box-shadow: -1px 8px 11px rgba(0,0,0,.08);
+    width: 280px;
+    padding: 7px;
+    display: none;
+    font-size: 12px;
+}
+
+
+.dynamic_devices_dropdown>ul{
+    margin-bottom: 0;
+}
+
+.dynamic_devices_dropdown>ul>li:first-child{
+    margin-bottom: 7px;
+}
+
+.dynamic_devices_dropdown>ul>li{
+    border-bottom: 1px solid #ffeaa9;
+}
+
+.dynamic_devices_dropdown>ul>li:last-child{
+    border-bottom: none;
+}
+
+.dynamic_devices_dropdown.style1{
+    width: 170px;
+    left: 185px;
+    padding: 2px;
+}
+
+.dynamic_devices_dropdown>ul>li>div{
+    display: inline-block;
+    width: 90px;
+    vertical-align: top;
+}
+
+.gps-play-back-panel-v3 .parks_list .uk-form-icon{
+    width: 86%;
 }
 \ No newline at end of file
@@ -118,13 +118,50 @@
         {{/if}}
     </script>
     <script id="pbv3_park_dropdown-temp" type="text/html">
+        <li style="text-align: center;">
+            <form class="uk-form" data-uk-margin>
+                <div class="uk-form-icon">
+                    <i class="uk-icon-search"></i>
+                    <input type="text" placeholder="搜索" >
+                </div>
+            </form>
+        </li>
+        <li class="uk-nav-divider"></li>
         {{each list as p i}}
         <li data-code="{{p.parkCode}}" ><a>{{p.parkName}}</a></li>
-        {{if i == 0}}
-        <li class="uk-nav-divider"></li>
-        {{/if}}
         {{/each}}
     </script>
+
+    <script id="pbv3_park_form_devices-temp" type="text/html">
+        <div class="uk-animation-slide-top dynamic_devices" >
+            <span>{{deviceStr}}</span>
+        </div>
+    </script>
+
+    <script id="pbv3_park_devices_dropdown-temp" type="text/html">
+        {{if dcs.length==1 && dcs[0].type==1}}
+        <div class="dynamic_devices_dropdown style1">
+            <div style="text-align: center;">从车辆基础信息关联设备号</div>
+        </div>
+        {{else}}
+        <div class="dynamic_devices_dropdown">
+            <ul class="uk-list">
+                <li>
+                    <div>设备号</div>
+                    <div>启用时间</div>
+                    <div>停用时间</div>
+                </li>
+                {{each dcs as dc i}}
+                <li>
+                    <div>{{dc.device}}</div>
+                    <div>{{dc.stStr}}</div>
+                    <div>{{dc.etStr}}</div>
+                </li>
+                {{/each}}
+            </ul>
+        </div>
+        {{/if}}
+    </script>
     <script>
         (function () {
             var wrap = '.gps-play-back-panel-v3';
@@ -141,9 +141,9 @@
             createScrollbar();
             //show title
-            UIkit.notify("设备端自身标识为无效的GPS点位，将不会再进入回放通路", {
+            /*UIkit.notify("设备端自身标识为无效的GPS点位，将不会再进入回放通路", {
                 status: 'info'
-            });
+            });*/
         });
         /**
@@ -224,6 +224,23 @@
                         //更新滚动条
                         resetScrollbar();
+
+                        /**
+                         * 显示设备更换信息
+                         */
+                        var deviceStr='', fs='YYYY-MM-DD HH:mm';
+                        for(var i=0,dc;dc=rs.dcs[i++];){
+                            deviceStr+=dc.device + ',';
+                            dc.stStr = moment(dc.st).format(fs);
+                            dc.etStr = dc.et>0?moment(dc.et).format(fs):'';
+                        }
+                        deviceStr=deviceStr.substr(0, deviceStr.length-1);
+
+                        $('.play-back-form>.dynamic_devices', leftWrap).remove();
+                        $('.play-back-form>.dynamic_devices_dropdown', leftWrap).remove();
+                        var htmlStr = template('pbv3_park_form_devices-temp', {deviceStr:deviceStr}),
+                                htmlStr2 = template('pbv3_park_devices_dropdown-temp', {dcs:rs.dcs});
+                        $('.play-back-form', leftWrap).append(htmlStr).append(htmlStr2);
                     });
                 }
             } catch (e) {
@@ -270,6 +287,9 @@
         //车辆 autocomplete
         gb_common.carAutocomplete($('.autocomplete-nbbm', leftWrap), gb_data_basic.carsArray());
+        $('.autocomplete-nbbm', leftWrap).on('input', function () {
+            $('.play-back-form>.dynamic_devices', leftWrap).remove();
+        });
         /**
          * 车辆选择抽屉显示
@@ -458,6 +478,12 @@
             $('.abnormal_table .ct_table_body', leftWrap).html(htmlStr);
         }
+        $(leftWrap).on('mouseover', '.dynamic_devices', function () {
+           $('.dynamic_devices_dropdown', leftWrap).show();
+        }).on('mouseout', function () {
+            $('.dynamic_devices_dropdown', leftWrap).hide();
+        });
+
         return {
             fillTrailTable: fillTrailTable,
             fillArivalStationTable: fillArivalStationTable,
@@ -649,7 +649,7 @@
         (function (lineCode) {
             //从地图模块获取停车场数据
             var parks = gb_map_spatial_data.carparkArray();
-            //将线路标准停车场排在第一个
+           /* //将线路标准停车场排在第一个
             var information = gb_data_basic.getLineInformation(lineCode);
             if(information){
                 var index;
@@ -660,7 +660,7 @@
                     }
                 }
                 parks[index] = parks.splice(0, 1 , parks[index])[0];
-            }
+            }*/
             //渲染
             var htmlStr = template('pbv3_park_dropdown-temp', {list: parks});
             $('.buffer_area_form .parks_list', rightWrap).html(htmlStr);