update

潘钊
1 parent a107ec2d
Showing 5 changed files with 71 additions and 18 deletions
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
@@ -66,7 +66,7 @@ public class GpsRealData implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
         logger.info("gpsDataLoader,20,5");
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 30, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
     }
  
     public void put(GpsEntity gps) {
@@ -181,7 +181,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             //持久化
             dayOfSchedule.save(sch);
             //下发调度指令
-            //directiveService.send60Dispatch(next, doneSum, "到站@系统");
+            directiveService.send60Dispatch(next, doneSum, "到站@系统");
  
             //准备执行下一个班次
             if (next != null) {
@@ -130,12 +130,12 @@ public class DayOfSchedule implements CommandLineRunner {
     public void run(String... arg0) throws Exception {
         basicDataLoader.loadAllData();
         //从数据库恢复排班
-        dataRecovery();
+        //dataRecovery();
  
         //翻班线程
         Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
-        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
         //首班出场指令补发器
 //		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
         //班次误点扫描
@@ -685,15 +685,17 @@ label.destroy-sch small{
   border-bottom: 0;
 }
  
-i.add-temp-sch-icon{
-  float: right;
-  font-size: 18px;
-  cursor: pointer;
-  color: #4592b8;
-  margin: 10px 15px 0;
+.add-temp-sch-icon{
+    float: right;
+    margin: 0 3px 0;
+    padding: 0;
+    font-size: 13px;
+    text-decoration: underline;
 }
-i.add-temp-sch-icon:hover{
-  color: #2d7091;
+
+.add-temp-lp-icon{
+    cursor: pointer;
+    margin-left: 5px;
 }
  
  
@@ -1046,4 +1048,20 @@ i.signal_state_icon.uk-icon-question-circle{
 i.signal_state_icon.uk-icon-reply{
     color: #4134e3 !important;
     box-shadow: none;
+}
+
+.child-task-status{
+    float: right;
+    font-size: 13px;
+}
+
+.child-task-status.fail{
+    color: red;
+    text-shadow: red 0px 0px 20px;
+}
+
+.child-task-status.fail span.calc-detail{
+    font-family: Consolas,monospace,serif;
+    white-space: nowrap;
+    font-size: 14px;
 }
 \ No newline at end of file
@@ -18,13 +18,17 @@
                         <div class="uk-form-row">
                             <label class="uk-form-label" style="width: 50px;">路牌</label>
                             <div class="uk-form-controls" style="margin-left: 51px;">
-                                <select name="lpName"></select>
+                                <select name="lpName" style="width: 120px;"></select>
+                                <i class="uk-icon-plus add-temp-lp-icon" title="临加路牌" data-uk-tooltip></i>
                             </div>
                         </div>
                     </div>
                     <div class="uk-width-1-3">
                         <div class="uk-form-row">
-                            <i class="uk-icon-plus add-temp-sch-icon" title="新增临加班次" data-uk-tooltip></i>
+                            <!--<i class="uk-icon-plus add-temp-sch-icon" title="新增临加班次" data-uk-tooltip></i>-->
+                            <!--<button class="uk-button uk-button-primary add-temp-sch-icon">临加班次</button>-->
+                            <!--<a class="uk-button add-temp-sch-icon"><i class="uk-icon-plus"></i> 临加班次</a>-->
+                            <a class="uk-button uk-button-link add-temp-sch-icon" > 临加班次</a>
                         </div>
                     </div>
                 </div>
@@ -51,7 +55,9 @@
         </div>
  
         <div class="uk-panel uk-panel-box uk-panel-box-secondary" style="padding-bottom: 0;">
-            <h3 class="uk-panel-title">子任务列表</h3>
+            <h3 class="uk-panel-title" id="childTaskTitle">
+                子任务列表
+            </h3>
             <div class="ct_table_wrap ct_table_no_border" style="height: 142px;">
                 <div class="ct_table sub-task-table">
                     <div class="ct_table_head">
@@ -131,6 +137,12 @@
         </dl>
         {{/each}}
     </script>
+
+    <script id="sub_task-fail-status-temp" type="text/html">
+        <div class="child-task-status fail"><i class="uk-icon-times-circle"></i> 营运里程 与主任务不符，请检查子任务
+            <span class="calc-detail">{{calcs}}</span></div>
+    </script>
+
     <script>
         (function () {
             var modal_opts = {center: false, bgclose: false, modal: false}
@@ -218,7 +230,7 @@
                 if (opts && opts.sch) {
                     selectedDl(opts.sch);
                 }
-            }
+            };
  
             //刷新子任务表格
             var sub_task_update = function () {
@@ -230,7 +242,30 @@
                 tbody.html(htmlStr);
                 //字典转换
                 dictionaryUtils.transformDom($('.nt-dictionary', tbody));
-            }
+
+                //检查子任务营运里程
+                $('#childTaskTitle .child-task-status', modal).remove();
+                var i = 0;
+                if(sch.cTasks.length == 0)
+                    return;
+                var sum=0, calcs='';
+                $.each(sch.cTasks, function () {
+                    if(this.mileageType=='service'){
+                        sum = gb_common.accAdd(sum, this.mileage);
+                        calcs += (' + ' + this.mileage);
+                        i ++;
+                    }
+                });
+                //公里与主任务不符合
+                if(sum != sch.jhlc){
+                    if(i > 1)
+                        calcs += ('='+sum);
+                    calcs += (' ≠ ' + sch.jhlc);
+                    calcs = calcs.substr(3);
+                    var htmlStr = template('sub_task-fail-status-temp', {calcs: calcs});
+                    $('#childTaskTitle', modal).append(htmlStr);
+                }
+            };
  
             //新增临加
             var add_temp_sch = function () {
@@ -241,7 +276,7 @@
                 open_modal(folder + '/add_temp_sch.html', {
                     sch: sch
                 }, modal_opts);
-            }
+            };
  
             //删除临加班次
             var remove_sch = function () {