diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeControl.vue index 05c2641cd..eba277529 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeControl.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeControl.vue @@ -180,14 +180,13 @@ export default { // 总人解 humanTrainRoute() { const operate = { - operation: OperationEvent.Signal.humanTrainRoute.menu.operation, - operateNext: OperationEvent.Signal.humanTrainRoute.confirm.operation + over: true, + operation: OperationEvent.Signal.humanTrainRoute.confirm.operation, + cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - operate.cmdType = CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE; - this.$refs.password.doShow(operate); + this.close(); } }).catch(() => { this.doClose(); @@ -223,10 +222,11 @@ export default { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.doClose(); } }).catch(() => { + this.doClose(); + this.$refs.noticeInfo.doShow(operate); }); }, // 信号解封 diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue index 875f26cd8..75244bc37 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue @@ -32,9 +32,9 @@ :height="140" > - + diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue index 061dcfc70..87f6a8e10 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue @@ -23,9 +23,9 @@
进路列表 - + @@ -209,7 +209,6 @@ export default { const operate = { operation: OperationEvent.Signal.guide.choose.operation }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); @@ -249,7 +248,6 @@ export default { }, cancel() { const operate = { - operation: OperationEvent.Command.cancel.menu.operation }; diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue index 83a6b22ef..4e6f78823 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue @@ -15,9 +15,9 @@
- + diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue index 688bd8b17..5c941ca90 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue @@ -33,9 +33,9 @@ highlight-current-row @row-click="clickEvent" > - + diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue index c34cc55b6..5fd587718 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue @@ -306,6 +306,7 @@ export default { start: true, code: `${this.selected.code}`, operation: OperationEvent.Signal.guide.menu.operation, + operateNext: OperationEvent.Signal.guide.confirm.operation, param: { signalCode: `${this.selected.code}` } @@ -384,7 +385,6 @@ export default { signalCode: `${this.selected.code}` } }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });