diff --git a/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue index e0a99c84f..0ccfe3c67 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue @@ -132,7 +132,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); } diff --git a/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue index 509c508b4..947a5ea6a 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue @@ -220,7 +220,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); } diff --git a/src/jmapNew/theme/race_01/menus/dialog/routerCommand.vue b/src/jmapNew/theme/race_01/menus/dialog/routerCommand.vue index 1f2699d6c..a255bcff2 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/routerCommand.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/routerCommand.vue @@ -117,7 +117,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); }, diff --git a/src/jmapNew/theme/race_01/menus/dialog/sectionAlxeReset.vue b/src/jmapNew/theme/race_01/menus/dialog/sectionAlxeReset.vue index 40765b987..902ed64fa 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/sectionAlxeReset.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/sectionAlxeReset.vue @@ -137,7 +137,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); }, diff --git a/src/jmapNew/theme/race_01/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/race_01/menus/dialog/standBulkBuckleTrain.vue index 05a7032f5..b93bc78ce 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/standBulkBuckleTrain.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/standBulkBuckleTrain.vue @@ -212,7 +212,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); }, diff --git a/src/jmapNew/theme/race_01/menus/dialog/stationBackStrategy.vue b/src/jmapNew/theme/race_01/menus/dialog/stationBackStrategy.vue index 89f842de1..5ec6803b3 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/stationBackStrategy.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/stationBackStrategy.vue @@ -156,7 +156,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); } else { diff --git a/src/jmapNew/theme/race_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/race_01/menus/dialog/stationControl.vue index 65395bfe2..0b5b49fb8 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/stationControl.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/stationControl.vue @@ -285,7 +285,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); } diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue b/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue index 5b0c0eedd..d8679c8a2 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue @@ -142,7 +142,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); }, diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue index cc41329b3..9b41d5854 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue @@ -140,7 +140,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); } else { diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue index b05f13b66..10132d9fa 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue @@ -142,7 +142,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); }, diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue index 0e50fc415..481f9e57e 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue @@ -149,7 +149,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); }, diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue index 07e4d73b2..7586dc59e 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue @@ -169,7 +169,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); }, diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetWork.vue index b1c62e2ba..9be76961c 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/trainSetWork.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetWork.vue @@ -106,7 +106,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); }, diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue index dac69b1d0..6804d0809 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue @@ -137,7 +137,9 @@ export default { } }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); }, diff --git a/src/jmapNew/theme/race_01/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/race_01/menus/dialog/turnBackControl.vue index 0870422ef..e3ead9414 100644 --- a/src/jmapNew/theme/race_01/menus/dialog/turnBackControl.vue +++ b/src/jmapNew/theme/race_01/menus/dialog/turnBackControl.vue @@ -152,7 +152,9 @@ export default { this.doClose(); }).catch(() => { this.loading = false; - this.doClose(); + if (!this.$store.state.trainingNew.trainingSwitch) { + this.doClose(); + } this.$refs.noticeInfo.doShow(); }); }, diff --git a/src/jmapNew/theme/race_01/menus/menuSignal.vue b/src/jmapNew/theme/race_01/menus/menuSignal.vue index a5b288d37..49f4f084f 100644 --- a/src/jmapNew/theme/race_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/race_01/menus/menuSignal.vue @@ -65,7 +65,7 @@ export default { cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, isDisabled: (signal, work) => false, isShow: (signal, work) => true, - isAvailableInOtherControlMode: true + isAvailableInOtherControlMode: true }, { label: '取消进路', @@ -73,7 +73,7 @@ export default { cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, isDisabled: (signal, work) => false, isShow: (signal, work) => true, - isAvailableInOtherControlMode: true + isAvailableInOtherControlMode: true }, { label: '信号重开', @@ -130,7 +130,7 @@ export default { cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING, isDisabled: (signal, work) => false, isShow: (signal, work) => true, - isAvailableInOtherControlMode: true + isAvailableInOtherControlMode: true }, { label: '进路自排开', @@ -138,7 +138,7 @@ export default { cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING, isDisabled: (signal, work) => false, isShow: (signal, work) => true, - isAvailableInOtherControlMode: true + isAvailableInOtherControlMode: true }, { label: '设置通过模式',