From 0a2f2b08b37962f71030115bb679f87fd120bb0f Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Mon, 1 Feb 2021 18:36:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=A1=E5=8F=B7=E6=9C=BA?=
 =?UTF-8?q?=E5=92=8C=E7=AB=99=E5=8F=B0=20=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningbo_03/menus/menuDialog/signalDetail.vue      | 12 ++++++------
 .../theme/ningbo_03/menus/menuDialog/standDetail.vue |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

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 }) => {