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

徐烜
2 parents 875889e8 fb086f82
Showing 4 changed files with 120 additions and 26 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lp_change.html
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
@@ -46,6 +46,9 @@ public class InOutStationSignalHandle extends SignalHandle{
  
     private final static int MAX_BEFORE_TIME = 1000 * 60 * 72;
  
+    //最大的班次时间差，防止异常的GPS时间打乱数据
+    private final static int MAX_NORMAL_DIFF = 1000 * 60 * 60 * 12;
+
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
         //忽略掉线信号
@@ -106,8 +109,14 @@ public class InOutStationSignalHandle extends SignalHandle{
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         String qdzCode = sch.getQdzCode();
  
+        int diff = (int) (sch.getDfsjT() - gps.getTimestamp());
+
         //首班出场最多提前1.2小时
-        if(dayOfSchedule.isFirstOut(sch) && sch.getDfsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+        if(dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME)
+            return;
+
+        //正常班次最大时间差
+        if(Math.abs(diff) > MAX_NORMAL_DIFF)
             return;
  
         //起点发车
@@ -169,8 +178,13 @@ public class InOutStationSignalHandle extends SignalHandle{
  
         if(gps.getStopNo().equals(sch.getZdzCode())){
  
+            int diff = (int) (sch.getZdsjT() - gps.getTimestamp());
             //进场最多提前1.2小时
-            if(sch.getBcType().equals("in") && sch.getZdsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+            if(sch.getBcType().equals("in") && diff > MAX_BEFORE_TIME)
+                return;
+
+            //正常班次最大时间差
+            if(Math.abs(diff) > MAX_NORMAL_DIFF)
                 return;
  
             //实达时间不覆盖
@@ -716,28 +716,35 @@ li.map-panel {
 }
  
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(1), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(1) {
-    width: 9%;
+    width: 7%;
     border-left: 1px solid #dedede;
 }
  
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(2), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(2) {
-    width: 30%;
+    width: 25%;
 }
  
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(3), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(3) {
-    width: 28%;
+    width: 20%;
 }
  
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(4), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(4) {
-    width: 17%;
-}
+     width: 10%;
+ }
  
 #schedule-lp_change-modal .sch-list dl dt:nth-of-type(5), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(5) {
+    width: 22%;
+}
+
+#schedule-lp_change-modal .sch-list dl dt:nth-of-type(6), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(6) {
     width: 15%;
 }
  
+
+
+
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(1), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(1) {
-    width: 9%;
+    width: 7%;
     border-left: 1px solid #dedede;
 }
  
@@ -746,15 +753,19 @@ li.map-panel {
 }
  
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(3), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(3) {
-    width: 17%;
+    width: 22%;
 }
  
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(4), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(4) {
-    width: 28%;
+    width: 10%;
 }
  
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(5), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(5) {
-    width: 30%;
+    width: 20%;
+}
+
+#schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(6), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(6) {
+    width: 25%;
 }
  
 #schedule-lp_change-modal .ct_table.sch-list .ct_table_body dl.active {
 <div class="uk-modal" id="schedule-lp_change-modal">
-    <div class="uk-modal-dialog" style="width: 900px;">
+    <div class="uk-modal-dialog" style="width: 1200px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
             <h2>路牌对调</h2></div>
@@ -18,10 +18,11 @@
                     <div class="ct_table sch-list" style="margin-top: 14px;">
                         <div class="ct_table_head">
                             <dl>
-                                <dt><input type="checkbox"></dt>
+                                <dt><input type="checkbox" class="global_box"></dt>
                                 <dt>驾驶员</dt>
                                 <dt>车辆</dt>
                                 <dt>路牌</dt>
+                                <dt>起点站</dt>
                                 <dt>时间</dt>
                             </dl>
                         </div>
@@ -43,8 +44,9 @@
                     <div class="ct_table sch-list reverse" style="margin-top: 14px;">
                         <div class="ct_table_head">
                             <dl>
-                                <dt><input type="checkbox"></dt>
+                                <dt><input type="checkbox" class="global_box"></dt>
                                 <dt>时间</dt>
+                                <dt>起点站</dt>
                                 <dt>路牌</dt>
                                 <dt>车辆</dt>
                                 <dt>驾驶员</dt>
@@ -74,14 +76,35 @@
             <dd>{{sch.jGh}}/{{sch.jName}}</dd>
             <dd>{{sch.clZbh}}</dd>
             <dd>{{sch.lpName}}</dd>
-            <dd>{{sch.dfsj}}</dd>
+            <dd>{{sch.qdzName}}</dd>
+            <dd>{{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}}
+            </dd>
         </dl>
         {{/each}}
         {{else if order == 1}}
         {{each array as sch i}}
         <dl>
             <dd><input type="checkbox"></dd>
-            <dd>{{sch.dfsj}}</dd>
+            <dd>{{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}}
+            </dd>
+            <dd>{{sch.qdzName}}</dd>
             <dd>{{sch.lpName}}</dd>
             <dd>{{sch.clZbh}}</dd>
             <dd>{{sch.jGh}}/{{sch.jName}}</dd>
@@ -113,6 +136,8 @@
                         ops += '<option value="' + lp + '">' + lp + '</option>';
                     });
                     lpSelect.html(ops);
+
+                    disabledSubmitBtn();
                 });
  
                 //路牌切换事件
@@ -122,6 +147,8 @@
  
                     var htmlStr = template('schedule-lp_change-list-temp', {array: list[order][lp], order: order});
                     $('.sch-list .ct_table_body', modal).eq(order).html(htmlStr);
+
+                    disabledSubmitBtn();
                 });
  
  
@@ -136,6 +163,12 @@
                 $('[name=lineSelect]:eq(0)', modal).val(sch.xlBm).trigger('change');
                 //左默认路牌
                 $('[name=lpName]:eq(0)', modal).val(sch.lpName).trigger('change');
+
+
+                //右默认线路路牌
+                $('[name=lineSelect]:eq(1)', modal).val(sch.xlBm).trigger('change');
+                //右默认路牌
+                $('[name=lpName]:eq(1)', modal).val(sch.lpName).trigger('change');
             });
  
             //选中事件
@@ -148,25 +181,62 @@
                     cancelActiveDl(dl);
             });
  
-            $(modal).on('click', '.sch-list dl', function (e) {
+            $(modal).on('click', '.sch-list .ct_table_body dl', function (e) {
                 e.stopPropagation();
-                var cbox = $(this).find('input[type=checkbox]')[0];
-                if (!$(this).hasClass('active')) {
+                if (!$(this).hasClass('active'))
                     activeDl($(this));
-                    cbox.checked = true;
-                }
-                else {
+                else
                     cancelActiveDl($(this));
-                    cbox.checked = false;
-                }
+
+                disabledSubmitBtnByBalance();
             });
  
             function activeDl(dl) {
                 dl.addClass('active');
+                dl.find('input[type=checkbox]')[0].checked = true;
             }
  
             function cancelActiveDl(dl) {
                 dl.removeClass('active');
+                dl.find('input[type=checkbox]')[0].checked = false;
+            }
+            
+            function disabledSubmitBtn() {
+                //同一个路牌不能对调
+                var leftLP = $('[name=lineSelect]:eq(0)', modal).val() + '_' + $('[name=lpName]:eq(0)', modal).val();
+                var rightLP = $('[name=lineSelect]:eq(1)', modal).val() + '_' + $('[name=lpName]:eq(1)', modal).val();
+                var $submitBtn = $('button[type=submit]', modal);
+                if(leftLP == rightLP)
+                    $submitBtn.attr('disabled', 'disabled');
+                else
+                    $submitBtn.removeAttr('disabled');
+            }
+            
+            function disabledSubmitBtnByBalance() {
+                var leftSize = $('.sch-list:eq(0) dl.active', modal).length;
+                var rightSize = $('.sch-list:eq(1) dl.active', modal).length;
+                var $submitBtn = $('button[type=submit]', modal);
+                if(leftSize != rightSize)
+                    $submitBtn.attr('disabled', 'disabled');
+                else if(leftSize != 0)
+                    $submitBtn.removeAttr('disabled');
+            }
+
+            //全选
+            $('.global_box', modal).on('click', function () {
+                var $table = $(this).parents('.ct_table.sch-list');
+                globalSelected($table, this.checked?1:-1);
+            });
+            
+            function globalSelected($tab, status) {
+                var dls = $tab.find('.ct_table_body dl');
+
+                dls.each(function () {
+                    if(status == 1)
+                        activeDl($(this));
+                    else
+                        cancelActiveDl($(this));
+                });
             }
         })();
     </script>
@@ -177,8 +177,7 @@ var gb_schedule_context_menu = (function () {
             },
             'sep3': '---------',
             'lp_change': {
-                name: '路牌对调',
-                disabled: true
+                name: '路牌对调'
             }
         }
     });