diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalDetail.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalDetail.vue index 843d74ecc..bad99163c 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalDetail.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalDetail.vue @@ -45,6 +45,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; +import CMD from '@/scripts/cmdPlugin/CommandEnum'; export default { name: 'InitSignalBlock', @@ -72,13 +73,10 @@ export default { return this.$store.state.menuOperation.selected; }, domIdClose() { - return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; - }, - domIdChoose() { - return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : ''; + return this.dialogShow ? OperationEvent.Command.common.close.domId : ''; }, domIdConfirm() { - return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : ''; + return this.dialogShow ? OperationEvent.Command.common.confirm.domId : ''; }, title() { return '信号机信息显示'; @@ -144,7 +142,9 @@ export default { }, cancel() { const operate = { - operation: OperationEvent.Command.cancel.menu.operation + over: true, + cmdType: CMD.Signal.CMD_SIGNAL_DETAIL, + operation: OperationEvent.Command.common.close.operation }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue index 87dc1936d..d56df5106 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue @@ -42,6 +42,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { mapGetters } from 'vuex'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; +import CMD from '@/scripts/cmdPlugin/CommandEnum'; export default { name: 'StandDetain', @@ -124,6 +125,8 @@ export default { }, cancel() { const operate = { + over: true, + cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS, operation: OperationEvent.Command.common.close.operation }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {