恢复配置文件

潘钊
1 parent b5436d64
Showing 3 changed files with 10 additions and 8 deletions
src/main/java/com/bsth/data/gpsdata/arrival/utils/SignalSchPlanMatcher.java
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
src/main/resources/static/real_control_v2/js/main.js
@@ -40,8 +40,8 @@ public class SignalSchPlanMatcher {
                     return;
  
                 long dt = fbFirst.getDfsjT();
-                //前5后10  -执行分班的首个营运
-                if(dt - t < 1000 * 60 * 5 || t - dt < 1000 * 60 * 10){
+                //晚于待发前4分钟  -执行分班的首个营运
+                if(dt - t < 1000 * 60 * 4){
                     dayOfSchedule.addExecPlan(fbFirst);
                     return;
                 }
@@ -142,9 +142,11 @@
             });
  
             $(modal).on('refresh', function (e, data) {
-                var lpName = data.lpName;
-                if(is_new_temp_lp(lpName)){
-                    $('[name=lpName_eq]', modal).append('<option value="'+lpName+'" selected>'+lpName+'</option>');
+                if(data){
+                    var lpName = data.lpName;
+                    if(is_new_temp_lp(lpName)){
+                        $('[name=lpName_eq]', modal).append('<option value="'+lpName+'" selected>'+lpName+'</option>');
+                    }
                 }
                 jsQuery();
             });
@@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(),
                 $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
             }, 1000);
             //弹出更新说明
-            //showUpdateDescription();
+            showUpdateDescription();
         });
  
         function g_emit(id) {
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-07-14',
-        text: '<h5></h5>'
+        date: '2017-07-17',
+        text: '<h5>1、修复了一个蛮蠢的bug，这个bug曾经导致在分班进场班次发出晚20分钟的时候，有一定几率实发时间跳到下午首班营运班次上。</h5>'
     };
  
     var storage = window.localStorage