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