Merge branch 'pudong_jdk8' of 192.168.168.201:panzhaov5/bsth_control into pudong_jdk8

娄高锋
2 parents ee1f42dc ebe128ec
Showing 5 changed files with 586 additions and 561 deletions
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/resources/static/pages/summary/destory_sch_detail/list.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/jhlb.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
 package com.bsth.data.gpsdata_v2.handlers;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
@@ -98,11 +99,6 @@ public class InStationProcess {
             flow = false;
         }
-        //进起点 rfid状态复位
-        if (null != sch && ((sch.getQdzCode().equals(gps.getStopNo()) && gps.getInstation() > 0) || sch.getQdzCode().equals(gps.getCarparkNo()))) {
-            resetRfid(sch);
-        }
-
         boolean isEnd = false;
         //进终点
@@ -112,6 +108,12 @@ public class InStationProcess {
             isEnd = true;
         }
+        //进起点 rfid状态复位
+        if (!isEnd && null != sch &&
+                ((sch.getQdzCode().equals(gps.getStopNo()) && gps.getInstation() > 0) || sch.getQdzCode().equals(gps.getCarparkNo()))) {
+            resetRfid(sch);
+        }
+
         GpsCacheData.in(gps, isEnd);
     }
@@ -229,12 +229,13 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 				   "a.station_route_code," +
 				   "b.station_cod," +
 				   "a.distances,"+
-				   "s.station_name," +
+				   "a.station_name," +
 				   "a.directions FROM (SELECT " +
 				   "s.station_mark," +
 				   "s.station_route_code," +
 				   "s.directions," +
 				   "s.distances,"+
+				   "s.station_name,"+
 				   "s.station FROM bsth_c_stationroute s where  s.line = ?1 and s.destroy=0) a " +
 				   "LEFT JOIN bsth_c_station b " +
 				   " on a.station = b.id ORDER BY a.directions ASC ) k ORDER BY k.directions,k.station_route_code ASC", nativeQuery=true)
-<!DOCTYPE html>
-<html lang="zh-cn">
-
-<head>
-    <meta charset="UTF-8">
-    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
-    <!-- flatpickr -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
-    <style>
-        html,body{
-            height: 100%;
-        }
-        .ct_page{
-            padding: 25px 15px;
-            height: 100%;
-            height: calc(100% - 50px);
-        }
-
-        .ct_cont{
-            height: calc(100% - 35px);
-        }
-
-        .ct_cont>div>div.uk-card{
-            height: 99%;
-        }
-
-        .loading{
-            height: 100%;
-            text-align: center;
-        }
-        .loading .uk-spinner{
-            margin-top: 200px;
-        }
-        .loading circle{
-            stroke: red;
-        }
-
-        .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
-            opacity: 0.6 !important;
-            padding: 0 !important;
-        }
-
-        .ct_destroy_sch_table_width th:nth-of-type(1),.ct_destroy_sch_table_width td:nth-of-type(1){
-            width: 9%;
-        }
-        .ct_destroy_sch_table_width th:nth-of-type(2),.ct_destroy_sch_table_width td:nth-of-type(2){
-            width: 9%;
-        }
-        .ct_destroy_sch_table_width th:nth-of-type(3),.ct_destroy_sch_table_width td:nth-of-type(3){
-            width: 9%;
-        }
-        .ct_destroy_sch_table_width th:nth-of-type(4),.ct_destroy_sch_table_width td:nth-of-type(4){
-            width: 9%;
-        }
-        .ct_destroy_sch_table_width th:nth-of-type(5),.ct_destroy_sch_table_width td:nth-of-type(5){
-            width: 9%;
-        }
-        .ct_destroy_sch_table_width th:nth-of-type(6),.ct_destroy_sch_table_width td:nth-of-type(6){
-            width: 9%;
-        }
-        .ct_destroy_sch_table_width th:nth-of-type(7),.ct_destroy_sch_table_width td:nth-of-type(7){
-            width: 8%;
-        }
-        .ct_destroy_sch_table_width th:nth-of-type(8),.ct_destroy_sch_table_width td:nth-of-type(8){
-            width: 8%;
-        }
-        .ct_destroy_sch_table_width th:nth-of-type(9),.ct_destroy_sch_table_width td:nth-of-type(9){
-            width: 8%;
-        }
-        .ct_destroy_sch_table_width th:nth-of-type(10),.ct_destroy_sch_table_width td:nth-of-type(10){
-        }
-
-        .ct_search_form_wrap{
-            border-bottom: 1px solid #e5e5e5;
-            padding: 10px 0 25px 10px;
-        }
-        .ct_search_form_wrap .ct_field{
-            display: inline-block;
-            margin: 0 5px;
-        }
-
-        .ct_search_form_wrap .ct_field label{
-            font-size: 14px;
-        }
-
-        .ct_search_form_wrap .ct_field input{
-            width: 110px;
-        }
-
-        .ct_search_form_wrap .ct_field select{
-            width: auto;
-            min-width: 100px;
-        }
-
-        .ct_search_form_wrap .uk-button{
-            padding: 0 14px;
-        }
-
-        .ct_search_form_wrap .uk-button i{
-            vertical-align: middle;
-            margin-top: -2px;
-            margin-right: 7px;
-        }
-
-        .ct_table_wrap{
-            font-size: 14px;
-            height: calc(100% - 77px);
-        }
-
-        .t_body_wrap{
-            height: calc(100% - 41px);
-            overflow: auto;
-            position: relative;
-        }
-
-        .ct_field.ct_field_bottom{
-            vertical-align: bottom;
-            font-size: 12px;
-            margin-left: 0;
-        }
-    </style>
-</head>
-
-<body>
-<div class="loading">
-    <div uk-spinner></div>
-</div>
-<div class="ct_page" style="display: none;">
-    <h3 class="uk-heading-line uk-heading-bullet"><span style="color: #ff5353;">烂班明细统计</span></h3>
-    <div class="ct_cont" >
-        <div class="ct_search_form_wrap">
-            <form>
-                <div class="ct_field">
-                    <label>公司：
-                        <select class="uk-select" name="gsBm_eq">
-                        </select>
-                    </label>
-                </div>
-                <div class="ct_field">
-                    <label>分公司：
-                        <select class="uk-select" name="fgsBm_eq">
-                        </select>
-                    </label>
-                </div>
-                <div class="ct_field">
-                    <label>线路：
-                        <select class="uk-select" name="lineCode_eq">
-                        </select>
-                    </label>
-                </div>
-                <div class="ct_field">
-                    <label>日期：
-                        <input class="uk-input" name="rq" style="width: 220px;">
-                    </label>
-                </div>
-                <div class="ct_field">
-                    <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
-                </div>
-                <div class="ct_field ct_field_bottom">
-                    <button class="uk-button uk-button-text export_excel" style="padding: 0 5px;">导出数据</button>
-                </div>
-                <div class="ct_field ct_field_bottom">
-                    <span uk-icon="icon: question" title="不统计进出场和2点间空驶" uk-tooltip="pos: bottom"></span>
-                </div>
-            </form>
-        </div>
-        <div class="ct_table_wrap day">
-            <table class="uk-table uk-table-small ct_destroy_sch_table_width" style="margin-bottom: 0;">
-                <thead>
-                <tr>
-                    <th>日期</th>
-                    <th>线路</th>
-                    <th>车号</th>
-                    <th>司机</th>
-                    <th>售票员</th>
-                    <th>原因</th>
-                    <th>班次</th>
-                    <th>烂班公里</th>
-                    <th>烂班时间</th>
-                    <th>备注</th>
-                </tr>
-                </thead>
-            </table>
-            <div class="t_body_wrap">
-                <table class="uk-table uk-table-divider uk-table-hover uk-table-small ct_destroy_sch_table ct_destroy_sch_table_width">
-                    <tbody>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script id="destroy_sch_list_temp" type="text/html">
-    {{each list as obj i}}
-    <tr>
-        <td>{{obj.rq}}</td>
-        <td>{{obj.lineName}}</td>
-        <td>{{obj.nbbm}}</td>
-        <td>{{obj.jGh}}</td>
-        <td>{{obj.sGh}}</td>
-        <td>{{obj.reason}}</td>
-        <td><a style="text-decoration: underline;">{{obj.size}}</a></td>
-        <td>{{obj.mileage}}</td>
-        <td>{{obj.timeStr}}</td>
-        <td>{{obj.remark}}</td>
-    </tr>
-    {{/each}}
-</script>
-
-<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
-<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
-<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
-<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
-<!-- EventProxy  -->
-<script src="/assets/js/eventproxy.js"></script>
-<!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
-<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
-<!-- jquery.serializejson JSON序列化插件 -->
-<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
-<!-- flatpickr -->
-<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
-<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
-<script>
-
-    var f = $('form', '');
-    //var page=0, pageSize=120;
-
-    var ep = EventProxy.create('query_comps', 'query_lines', function () {
-        $('[name=gsBm_eq]', f).trigger('change');//公司change
-        query();
-
-        $('.loading').remove();
-        $('.ct_page').show();
-    });
-
-    //点击搜索
-    $('button.search', f).on('click', query);
-
-    function query() {
-        $('button.search', f).attr('disabled', 'disabled');
-        var data = f.serializeJSON();
-        $('.ct_destroy_sch_table tbody').html('');
-        //开始结束时间
-        data.rq_ge = data.rq.substr(0, 10);
-        data.rq_le = data.rq.substr(13);
-        //data.order='t';
-        delete data.rq;
-
-        $.get('/summary/destroy_detail/all', data, function (rs) {
-            $('button.search', f).removeAttr('disabled');
-            if(!rs || rs.length==0)
-                return UIkit.notification('没有搜索到相关数据！！', 'danger');
-            $.each(rs, function () {
-                this.timeStr=moment(this.t).format('HH:mm')
-            });
-
-            var htmlStr = template('destroy_sch_list_temp', {list: rs});
-            $('.ct_destroy_sch_table tbody').html(htmlStr);
-            $('.t_body_wrap').perfectScrollbar('update');
-        });
-    }
-
-
-    //日期选择框
-    var fs='YYYY-MM-DD'
-            , ets=moment().subtract(1, 'days').format(fs)
-            , sts=moment().subtract(3, 'days').format(fs);
-    flatpickr('.ct_search_form_wrap [name=rq]', {
-        mode: "range", dateFormat: "Y-m-d","locale": "zh", defaultDate: [sts, ets]
-    });
-    var comps;
-    //构建公司级联下拉框
-    $.get('/user/companyData', function (rs) {
-        comps = rs;
-        var opts = '';
-        for(var i=0,obj;obj=comps[i++];){
-            opts += '<option value="'+obj.companyCode+'">'+obj.companyName+'</option>';
-        }
-        $('[name=gsBm_eq]', f).html(opts);
-        ep.emit('query_comps');
-    });
-
-    var lineMapps;
-    //加载线路信息
-    $.get('/line/all', {'destroy_eq': 0}, function (rs) {
-        rs.sort(function (a, b) {
-            return a.name.localeCompare(b.name);
-        });
-        lineMapps={};
-        var k;
-        $.each(rs, function () {
-            k = this.company+'_'+this.brancheCompany;
-            if(!lineMapps[k])
-                lineMapps[k]=[];
-            lineMapps[k].push(this);
-        });
-
-        ep.emit('query_lines');
-    });
-
-    $('[name=gsBm_eq]', f).on('change', function () {
-        var code = $(this).val(), subs=[];
-        $.each(comps, function () {
-            if(this.companyCode==code)
-                subs=this.children;
-        });
-
-        var opts='';
-        $.each(subs, function () {
-            opts += '<option value="'+this.code+'">'+this.name+'</option>';
-        });
-        $('[name=fgsBm_eq]', f).html(opts).trigger('change');
-    });
-
-    $('[name=fgsBm_eq]', f).on('change', function () {
-        var k = $('[name=gsBm_eq]', f).val() + '_' + $(this).val();
-        var array = lineMapps[k];
-        var opts = '<option value="">全部</option>';
-        if(array){
-            $.each(array, function () {
-                opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
-            });
-        }
-        $('[name=lineCode_eq]', f).html(opts);
-    });
-
-    //
-    //滚动条
-    $('.t_body_wrap').perfectScrollbar({suppressScrollX: true});
-
-    $(document).on('submit', 'form', function () {
-        return false;
-    });
-
-    /**
-     * 导出
-     */
-    $('.export_excel').on('click', function () {
-        var data = f.serializeJSON();
-        data.rq_ge = data.rq.substr(0, 10);
-        data.rq_le = data.rq.substr(13);
-        data.order='t';
-        delete data.rq;
-
-        window.open('/summary/destroy_detail/excel?' + $.param(data));
-    });
-
-</script>
-</body>
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
+    <!-- flatpickr -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
+    <style>
+        html,body{
+            height: 100%;
+        }
+        .ct_page{
+            padding: 25px 15px;
+            height: 100%;
+            height: calc(100% - 50px);
+        }
+
+        .ct_cont{
+            height: calc(100% - 35px);
+        }
+
+        .ct_cont>div>div.uk-card{
+            height: 99%;
+        }
+
+        .loading{
+            height: 100%;
+            text-align: center;
+        }
+        .loading .uk-spinner{
+            margin-top: 200px;
+        }
+        .loading circle{
+            stroke: red;
+        }
+
+        .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
+            opacity: 0.6 !important;
+            padding: 0 !important;
+        }
+
+        .ct_destroy_sch_table_width th:nth-of-type(1),.ct_destroy_sch_table_width td:nth-of-type(1){
+            width: 9%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(2),.ct_destroy_sch_table_width td:nth-of-type(2){
+            width: 9%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(3),.ct_destroy_sch_table_width td:nth-of-type(3){
+            width: 9%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(4),.ct_destroy_sch_table_width td:nth-of-type(4){
+            width: 9%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(5),.ct_destroy_sch_table_width td:nth-of-type(5){
+            width: 9%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(6),.ct_destroy_sch_table_width td:nth-of-type(6){
+            width: 9%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(7),.ct_destroy_sch_table_width td:nth-of-type(7){
+            width: 8%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(8),.ct_destroy_sch_table_width td:nth-of-type(8){
+            width: 8%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(9),.ct_destroy_sch_table_width td:nth-of-type(9){
+            width: 8%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(10),.ct_destroy_sch_table_width td:nth-of-type(10){
+        }
+
+        .ct_search_form_wrap{
+            border-bottom: 1px solid #e5e5e5;
+            padding: 10px 0 25px 10px;
+        }
+        .ct_search_form_wrap .ct_field{
+            display: inline-block;
+            margin: 0 5px;
+        }
+
+        .ct_search_form_wrap .ct_field label{
+            font-size: 14px;
+        }
+
+        .ct_search_form_wrap .ct_field input{
+            width: 110px;
+        }
+
+        .ct_search_form_wrap .ct_field select{
+            width: auto;
+            min-width: 100px;
+        }
+
+        .ct_search_form_wrap .uk-button{
+            padding: 0 14px;
+        }
+
+        .ct_search_form_wrap .uk-button i{
+            vertical-align: middle;
+            margin-top: -2px;
+            margin-right: 7px;
+        }
+
+        .ct_table_wrap{
+            font-size: 14px;
+            height: calc(100% - 77px);
+        }
+
+        .t_body_wrap{
+            height: calc(100% - 41px);
+            overflow: auto;
+            position: relative;
+        }
+
+        .ct_field.ct_field_bottom{
+            vertical-align: bottom;
+            font-size: 12px;
+            margin-left: 0;
+        }
+    </style>
+</head>
+
+<body>
+<div class="loading">
+    <div uk-spinner></div>
+</div>
+<div class="ct_page" style="display: none;">
+    <h3 class="uk-heading-line uk-heading-bullet"><span style="color: #ff5353;">烂班明细统计</span></h3>
+    <div class="ct_cont" >
+        <div class="ct_search_form_wrap">
+            <form>
+                <div class="ct_field">
+                    <label>公司：
+                        <select class="uk-select" name="gsBm_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>分公司：
+                        <select class="uk-select" name="fgsBm_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>线路：
+                        <select class="uk-select" name="lineCode_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>原因：
+                        <select class="uk-select" name="reason_eq">
+                            <option value="">全部</option>
+                            <option value="配车">配车</option>
+                            <option value="保养">保养</option>
+                            <option value="故障">故障</option>
+                            <option value="肇事">肇事</option>
+                            <option value="路阻">路阻</option>
+                            <option value="纠纷">纠纷</option>
+                            <option value="缺人">缺人</option>
+                            <option value="客稀">客稀</option>
+                            <option value="缺车">缺车</option>
+                            <option value="气候">气候</option>
+                            <option value="援外">援外</option>
+                            <option value="吊慢">吊慢</option>
+                            <option value="抽减">抽减</option>
+                            <option value="路救">路救</option>
+                            <option value="其他">其他</option>
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>日期：
+                        <input class="uk-input" name="rq" style="width: 220px;">
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
+                </div>
+                <div class="ct_field ct_field_bottom">
+                    <button class="uk-button uk-button-text export_excel" style="padding: 0 5px;">导出数据</button>
+                </div>
+                <div class="ct_field ct_field_bottom">
+                    <span uk-icon="icon: question" title="不统计进出场和2点间空驶" uk-tooltip="pos: bottom"></span>
+                </div>
+            </form>
+        </div>
+        <div class="ct_table_wrap day">
+            <table class="uk-table uk-table-small ct_destroy_sch_table_width" style="margin-bottom: 0;">
+                <thead>
+                <tr>
+                    <th>日期</th>
+                    <th>线路</th>
+                    <th>车号</th>
+                    <th>司机</th>
+                    <th>售票员</th>
+                    <th>原因</th>
+                    <th>班次</th>
+                    <th>烂班公里</th>
+                    <th>烂班时间</th>
+                    <th>备注</th>
+                </tr>
+                </thead>
+            </table>
+            <div class="t_body_wrap">
+                <table class="uk-table uk-table-divider uk-table-hover uk-table-small ct_destroy_sch_table ct_destroy_sch_table_width">
+                    <tbody>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script id="destroy_sch_list_temp" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td>{{obj.rq}}</td>
+        <td>{{obj.lineName}}</td>
+        <td>{{obj.nbbm}}</td>
+        <td>{{obj.jGh}}</td>
+        <td>{{obj.sGh}}</td>
+        <td>{{obj.reason}}</td>
+        <td><a style="text-decoration: underline;">{{obj.size}}</a></td>
+        <td>{{obj.mileage}}</td>
+        <td>{{obj.timeStr}}</td>
+        <td>{{obj.remark}}</td>
+    </tr>
+    {{/each}}
+</script>
+
+<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
+<!-- flatpickr -->
+<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
+<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
+<script>
+
+    var f = $('form', '');
+    //var page=0, pageSize=120;
+
+    var ep = EventProxy.create('query_comps', 'query_lines', function () {
+        $('[name=gsBm_eq]', f).trigger('change');//公司change
+        query();
+
+        $('.loading').remove();
+        $('.ct_page').show();
+    });
+
+    //点击搜索
+    $('button.search', f).on('click', query);
+
+    function query() {
+        $('button.search', f).attr('disabled', 'disabled');
+        var data = f.serializeJSON();
+        $('.ct_destroy_sch_table tbody').html('');
+        //开始结束时间
+        data.rq_ge = data.rq.substr(0, 10);
+        data.rq_le = data.rq.substr(13);
+        //data.order='t';
+        delete data.rq;
+
+        $.get('/summary/destroy_detail/all', data, function (rs) {
+            $('button.search', f).removeAttr('disabled');
+            if(!rs || rs.length==0)
+                return UIkit.notification('没有搜索到相关数据！！', 'danger');
+            $.each(rs, function () {
+                this.timeStr=moment(this.t).format('HH:mm')
+            });
+
+            var htmlStr = template('destroy_sch_list_temp', {list: rs});
+            $('.ct_destroy_sch_table tbody').html(htmlStr);
+            $('.t_body_wrap').perfectScrollbar('update');
+        });
+    }
+
+
+    //日期选择框
+    var fs='YYYY-MM-DD'
+            , ets=moment().subtract(1, 'days').format(fs)
+            , sts=moment().subtract(3, 'days').format(fs);
+    flatpickr('.ct_search_form_wrap [name=rq]', {
+        mode: "range", dateFormat: "Y-m-d","locale": "zh", defaultDate: [sts, ets]
+    });
+    var comps;
+    //构建公司级联下拉框
+    $.get('/user/companyData', function (rs) {
+        comps = rs;
+        var opts = '';
+        for(var i=0,obj;obj=comps[i++];){
+            opts += '<option value="'+obj.companyCode+'">'+obj.companyName+'</option>';
+        }
+        $('[name=gsBm_eq]', f).html(opts);
+        ep.emit('query_comps');
+    });
+
+    var lineMapps;
+    //加载线路信息
+    $.get('/line/all', {'destroy_eq': 0}, function (rs) {
+        rs.sort(function (a, b) {
+            return a.name.localeCompare(b.name);
+        });
+        lineMapps={};
+        var k;
+        $.each(rs, function () {
+            k = this.company+'_'+this.brancheCompany;
+            if(!lineMapps[k])
+                lineMapps[k]=[];
+            lineMapps[k].push(this);
+        });
+
+        ep.emit('query_lines');
+    });
+
+    $('[name=gsBm_eq]', f).on('change', function () {
+        var code = $(this).val(), subs=[];
+        $.each(comps, function () {
+            if(this.companyCode==code)
+                subs=this.children;
+        });
+
+        var opts='<option value="">全部</option>';
+        $.each(subs, function () {
+            opts += '<option value="'+this.code+'">'+this.name+'</option>';
+        });
+        $('[name=fgsBm_eq]', f).html(opts).trigger('change');
+    });
+
+    $('[name=fgsBm_eq]', f).on('change', function () {
+        var k = $('[name=gsBm_eq]', f).val() + '_' + $(this).val();
+        var array = lineMapps[k];
+        var opts = '<option value="">全部</option>';
+        if(array){
+            $.each(array, function () {
+                opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
+            });
+        }
+        $('[name=lineCode_eq]', f).html(opts);
+    });
+
+    //
+    //滚动条
+    $('.t_body_wrap').perfectScrollbar({suppressScrollX: true});
+
+    $(document).on('submit', 'form', function () {
+        return false;
+    });
+
+    /**
+     * 导出
+     */
+    $('.export_excel').on('click', function () {
+        var data = f.serializeJSON();
+        data.rq_ge = data.rq.substr(0, 10);
+        data.rq_le = data.rq.substr(13);
+        data.order='t';
+        delete data.rq;
+
+        window.open('/summary/destroy_detail/excel?' + $.param(data));
+    });
+
+</script>
+</body>
 </html>
 \ No newline at end of file
-<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-jhlb-modal">
-    <div class="uk-modal-dialog" style="width: 370px;">
-        <a href="" class="uk-modal-close uk-close"></a>
-        <div class="uk-modal-header">
-            <h2>计划烂班</h2></div>
-        <form class="uk-form uk-form-horizontal">
-        </form>
-    </div>
-
-    <script id="schedule-jhlb-form-temp" type="text/html">
-        <div class="uk-grid">
-            <div class="uk-width-1-1">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >内部编码</label>
-                    <div class="uk-form-controls">
-                        <input value="{{sch.clZbh}}" disabled/>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="uk-grid">
-            <div class="uk-width-1-1">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >路牌</label>
-                    <div class="uk-form-controls">
-                        <select name="lpName">
-                            {{if lps.length > 1}}
-                            <option value="-100">全部</option>
-                            {{/if}}
-                            {{each lps as lpName i}}
-                            <option value="{{lpName}}">{{lpName}}</option>
-                            {{/each}}
-                        </select>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="uk-grid">
-            <div class="uk-width-1-1">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >班次
-                        <hr>
-                         <label>全选
-                             <input class="i-cbox" name="allCheck" type="checkbox" >
-                         </label>
-                    </label>
-                    <div class="uk-form-controls sch-time-checkbox-list">
-                        {{each list as sch i}}
-                        <label data-lp="{{sch.lpName}}" {{if sch.destroy}}class="destroy-sch"{{/if}}>
-                            <input class="i-cbox" name="ids[]" value="{{sch.id}}" type="checkbox" {{if sch.destroy}}disabled{{/if}}>
-                            {{sch.dfsj}}
-
-                            {{if sch.bcType == "out"}}
-                            <span class="uk-badge uk-badge-success">出场</span>
-                            {{else if sch.bcType == "in"}}
-                            <span class="uk-badge uk-badge-warning">进场</span>
-                            {{else if sch.bcType == "venting"}}
-                            <span class="uk-badge uk-badge-danger">直放</span>
-                            {{else if sch.bcType == "major"}}
-                            <span class="uk-badge uk-badge-danger">放站</span>
-                            {{/if}}
-                            {{if sch.sflj}}
-                            <span class="uk-badge uk-badge-danger">临加</span>
-                            {{/if}}
-                            {{if sch.destroy}}
-                              <small>已烂班</small>
-                            {{/if}}
-                          </label>
-                        {{/each}}
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="uk-grid">
-            <div class="uk-width-1-1">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >调整说明</label>
-                    <div class="uk-form-controls">
-                        <select name="adjustExps" required>
-                          <option value="">请选择..</option>
-                          {{each adjustExps as exp i}}
-                            <option value="{{exp}}">{{exp}}</option>
-                          {{/each}}
-                        </select>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="uk-grid">
-            <div class="uk-width-1-1">
-                <div class="uk-form-row ct-stacked">
-                    <div class="uk-form-controls" style="margin-top: 5px;">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="烂班说明，不超过20个字符"></textarea>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
-            <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>
-    </script>
-
-    <script>
-        (function() {
-            var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
-            var modal = '#schedule-jhlb-modal',
-                sch;
-            $(modal).on('init', function(e, data) {
-                e.stopPropagation();
-                sch = data.sch;
-                //获取车辆所有班次
-                var schArr = gb_common.get_vals(gb_schedule_table.findScheduleByLine(sch.xlBm)).filter(function(item) {
-                    return item.clZbh == sch.clZbh;
-                }).sort(gb_schedule_table.schedule_sort);
-
-                //获取路牌
-                var lps = {};
-                $.each(schArr, function () {
-                    lps[this.lpName]=1;
-                });
-
-                var formHtml = template('schedule-jhlb-form-temp', {
-                    sch: sch,
-                    list: schArr,
-                    adjustExps:adjustExps,
-                    lps: gb_common.get_keys(lps)
-                });
-                $('form', modal).html(formHtml);
-
-                if(!sch.destroy){
-                  //选中班次
-                  var ckbox=$('input[type=checkbox][value='+sch.id+']', f).attr('checked', 'checked');
-                  //滚动到可视区域
-                  var cont=$('.sch-time-checkbox-list', f);
-                  cont.animate({
-                      scrollTop: ckbox.offset().top - cont.offset().top + cont.scrollTop() - 10
-                  }, 500);
-                }
-
-                //submit
-                var f = $('form', modal).formValidation(gb_form_validation_opts);
-                f.on('success.form.fv', function(e) {
-                    e.preventDefault();
-                    var data = $(this).serializeJSON();
-                    if(!data.ids || data.ids.length==0){
-                      UIkit.modal(modal).hide();
-                      return;
-                    }
-                    var idsStr='';
-                    $.each(data.ids, function(){idsStr+=(','+this)});
-                    data.idsStr=idsStr.substr(1);
-                    //提交
-                    gb_common.$post('/realSchedule/destroy', data, function(rs){
-                        gb_schedule_table.updateSchedule(rs.ts);
-                        UIkit.modal(modal).hide();
-                        notify_succ('烂班操作成功！');
-                        //calc 应发未发
-                        gb_schedule_table.calc_yfwf_num(sch.xlBm);
-                    });
-                });
-
-                $('[name=adjustExps]', f).on('change', function(){
-                    var rem=$('[name=remarks]', f);
-                    rem.val(rem.val() + $(this).val() + ',').trigger('input');
-                });
-
-                //路牌切换事件
-                $('[name=lpName]', f).on('change', function () {
-                    var v = $(this).val();
-                    var lbs = $('.sch-time-checkbox-list label', modal);
-                    if(v=='-100'){
-                        //显示全部
-                        lbs.show();
-                    }
-                    else {
-                        lbs.hide().each(function () {
-                            if($(this).data('lp')==v)
-                                $(this).show();
-                            else{
-                                //将隐藏的checkbox取消选中
-                                $(this).find('input[type=checkbox]')[0].checked=false;
-                            }
-                        });
-                    }
-                });
-
-                //全选
-                $('[name=allCheck]', f).on('click', function () {
-                    var cbs = $('.sch-time-checkbox-list label input[type=checkbox]:visible:enabled', modal);
-                    var status = this.checked;
-                    cbs.each(function () {
-                        this.checked = status;
-                    });
-                });
-            });
-        })();
-    </script>
-</div>
+<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-jhlb-modal">
+    <div class="uk-modal-dialog" style="width: 370px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>计划烂班</h2></div>
+        <form class="uk-form uk-form-horizontal">
+        </form>
+    </div>
+
+    <script id="schedule-jhlb-form-temp" type="text/html">
+        <div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row">
+                    <label class="uk-form-label" >内部编码</label>
+                    <div class="uk-form-controls">
+                        <input value="{{sch.clZbh}}" disabled/>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row">
+                    <label class="uk-form-label" >路牌</label>
+                    <div class="uk-form-controls">
+                        <select name="lpName">
+                            {{if lps.length > 1}}
+                            <option value="-100">全部</option>
+                            {{/if}}
+                            {{each lps as lpName i}}
+                            <option value="{{lpName}}">{{lpName}}</option>
+                            {{/each}}
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row">
+                    <label class="uk-form-label" >班次
+                        <hr>
+                         <label>全选
+                             <input class="i-cbox" name="allCheck" type="checkbox" >
+                         </label>
+                    </label>
+                    <div class="uk-form-controls sch-time-checkbox-list">
+                        {{each list as sch i}}
+                        <label data-lp="{{sch.lpName}}" {{if sch.destroy}}class="destroy-sch"{{/if}}>
+                            <input class="i-cbox" name="ids[]" value="{{sch.id}}" type="checkbox" {{if sch.destroy}}disabled{{/if}}>
+                            {{sch.dfsj}}
+
+                            {{if sch.bcType == "out"}}
+                            <span class="uk-badge uk-badge-success">出场</span>
+                            {{else if sch.bcType == "in"}}
+                            <span class="uk-badge uk-badge-warning">进场</span>
+                            {{else if sch.bcType == "venting"}}
+                            <span class="uk-badge uk-badge-danger">直放</span>
+                            {{else if sch.bcType == "major"}}
+                            <span class="uk-badge uk-badge-danger">放站</span>
+                            {{/if}}
+                            {{if sch.sflj}}
+                            <span class="uk-badge uk-badge-danger">临加</span>
+                            {{/if}}
+                            {{if sch.destroy}}
+                              <small>已烂班</small>
+                            {{/if}}
+                          </label>
+                        {{/each}}
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row">
+                    <label class="uk-form-label" >调整说明</label>
+                    <div class="uk-form-controls">
+                        <select name="adjustExps" required>
+                          <option value="">请选择..</option>
+                          {{each adjustExps as exp i}}
+                            <option value="{{exp}}">{{exp}}</option>
+                          {{/each}}
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row ct-stacked">
+                    <div class="uk-form-controls" style="margin-top: 5px;">
+                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="烂班说明，不超过20个字符"></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+            <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>
+    </script>
+
+    <script>
+        (function() {
+            var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '路救', '其他'];
+            var modal = '#schedule-jhlb-modal',
+                sch;
+            $(modal).on('init', function(e, data) {
+                e.stopPropagation();
+                sch = data.sch;
+                //获取车辆所有班次
+                var schArr = gb_common.get_vals(gb_schedule_table.findScheduleByLine(sch.xlBm)).filter(function(item) {
+                    return item.clZbh == sch.clZbh;
+                }).sort(gb_schedule_table.schedule_sort);
+
+                //获取路牌
+                var lps = {};
+                $.each(schArr, function () {
+                    lps[this.lpName]=1;
+                });
+
+                var formHtml = template('schedule-jhlb-form-temp', {
+                    sch: sch,
+                    list: schArr,
+                    adjustExps:adjustExps,
+                    lps: gb_common.get_keys(lps)
+                });
+                $('form', modal).html(formHtml);
+
+                if(!sch.destroy){
+                  //选中班次
+                  var ckbox=$('input[type=checkbox][value='+sch.id+']', f).attr('checked', 'checked');
+                  //滚动到可视区域
+                  var cont=$('.sch-time-checkbox-list', f);
+                  cont.animate({
+                      scrollTop: ckbox.offset().top - cont.offset().top + cont.scrollTop() - 10
+                  }, 500);
+                }
+
+                //submit
+                var f = $('form', modal).formValidation(gb_form_validation_opts);
+                f.on('success.form.fv', function(e) {
+                    e.preventDefault();
+                    var data = $(this).serializeJSON();
+                    if(!data.ids || data.ids.length==0){
+                      UIkit.modal(modal).hide();
+                      return;
+                    }
+                    var idsStr='';
+                    $.each(data.ids, function(){idsStr+=(','+this)});
+                    data.idsStr=idsStr.substr(1);
+                    //提交
+                    gb_common.$post('/realSchedule/destroy', data, function(rs){
+                        gb_schedule_table.updateSchedule(rs.ts);
+                        UIkit.modal(modal).hide();
+                        notify_succ('烂班操作成功！');
+                        //calc 应发未发
+                        gb_schedule_table.calc_yfwf_num(sch.xlBm);
+                    });
+                });
+
+                $('[name=adjustExps]', f).on('change', function(){
+                    var rem=$('[name=remarks]', f);
+                    rem.val(rem.val() + $(this).val() + ',').trigger('input');
+                });
+
+                //路牌切换事件
+                $('[name=lpName]', f).on('change', function () {
+                    var v = $(this).val();
+                    var lbs = $('.sch-time-checkbox-list label', modal);
+                    if(v=='-100'){
+                        //显示全部
+                        lbs.show();
+                    }
+                    else {
+                        lbs.hide().each(function () {
+                            if($(this).data('lp')==v)
+                                $(this).show();
+                            else{
+                                //将隐藏的checkbox取消选中
+                                $(this).find('input[type=checkbox]')[0].checked=false;
+                            }
+                        });
+                    }
+                });
+
+                //全选
+                $('[name=allCheck]', f).on('click', function () {
+                    var cbs = $('.sch-time-checkbox-list label input[type=checkbox]:visible:enabled', modal);
+                    var status = this.checked;
+                    cbs.each(function () {
+                        this.checked = status;
+                    });
+                });
+            });
+        })();
+    </script>
+</div>
@@ -435,7 +435,7 @@ var gb_schedule_table = (function () {
         //车辆rect 闪烁、
         var wrap = $(that).parents('li.line_schedule');
-        var nbbm = $(that).parents('dl').find('dd:eq(2)').data('nbbm');
+        var nbbm = $(that).parents('dl').find('dd:eq(3)').data('nbbm');
         var device = gb_data_basic.nbbm2deviceMap()[nbbm];
         var $rect = $('svg.line-chart g.gps-wrap rect[_id=rct_' + device + ']', wrap);