Commit 2c72913940f0d3f9ec6ea5aa972805c32e52d44f
1 parent
4935c902
update
Showing
2 changed files
with
5 additions
and
2 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
| @@ -48,11 +48,11 @@ public class CorrectSignalHandle extends SignalHandle { | @@ -48,11 +48,11 @@ public class CorrectSignalHandle extends SignalHandle { | ||
| 48 | gps.setState(0); | 48 | gps.setState(0); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | - if(gps.getState() != 0){ | 51 | + /*if(gps.getState() != 0){ |
| 52 | logger.info(gps.getNbbm() + " 纠正状态到营运"); | 52 | logger.info(gps.getNbbm() + " 纠正状态到营运"); |
| 53 | //切换到营运状态 | 53 | //切换到营运状态 |
| 54 | directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "纠正@系统"); | 54 | directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "纠正@系统"); |
| 55 | - } | 55 | + }*/ |
| 56 | 56 | ||
| 57 | return true; | 57 | return true; |
| 58 | } | 58 | } |
src/main/resources/static/real_control_v2/js/north/toolbar.js
| @@ -102,6 +102,9 @@ var gb_northToolbar = (function () { | @@ -102,6 +102,9 @@ var gb_northToolbar = (function () { | ||
| 102 | form_waybill: function () { | 102 | form_waybill: function () { |
| 103 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/waybill.html', '行车路单'); | 103 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/waybill.html', '行车路单'); |
| 104 | }, | 104 | }, |
| 105 | + form_waybillQp: function () { | ||
| 106 | + gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/waybillQp.html', '行车路单'); | ||
| 107 | + }, | ||
| 105 | form_history_message: function () { | 108 | form_history_message: function () { |
| 106 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/historyMessage.html', '调度历史消息'); | 109 | gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/historyMessage.html', '调度历史消息'); |
| 107 | }, | 110 | }, |