Commit 492a02d05ac993ad28051b6d2b23c2e49f18243b
1 parent
60ce085e
update...
Showing
2 changed files
with
3 additions
and
3 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
| @@ -144,7 +144,7 @@ public class InOutStationSignalHandle extends SignalHandle{ | @@ -144,7 +144,7 @@ public class InOutStationSignalHandle extends SignalHandle{ | ||
| 144 | //起点发车 | 144 | //起点发车 |
| 145 | if(qdzCode != null | 145 | if(qdzCode != null |
| 146 | && prev.getStopNo().equals(qdzCode) | 146 | && prev.getStopNo().equals(qdzCode) |
| 147 | - && gps.getInstation()==0 | 147 | + && (gps.getInstation()==0 || !gps.getStopNo().equals(prev.getStopNo())) |
| 148 | && !willDepart(gps, prev, sch)){ | 148 | && !willDepart(gps, prev, sch)){ |
| 149 | 149 | ||
| 150 | //发车班次匹配 | 150 | //发车班次匹配 |
src/main/resources/static/real_control_v2/js/main.js
| @@ -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-21', | ||
| 173 | - text: '<h5>1、修复一个蛮严肃的问题，这个问题有极低的概率导致个别班次的操作不会同步到路单！！！</h5>' | 172 | + date: '2017-07-26', |
| 173 | + text: '<h5>1、修复一个临时性的小问题，这个问题导致26号上午，起点站和第2站缓冲区重叠的几条线路发不出去！</h5>' | ||
| 174 | }; | 174 | }; |
| 175 | 175 | ||
| 176 | var storage = window.localStorage | 176 | var storage = window.localStorage |