From 62bf080515ed8e47686dbe6849740aaed415bb32 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 5 Feb 2021 14:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E9=83=BD=E4=B8=89=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=20=E5=BC=95=E5=AF=BC=E6=80=BB=E9=94=81=20=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/chengdu_03/menus/menuButton.vue | 11 +++++++++--
 src/jmapNew/theme/chengdu_03/operationConfig.js   |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
index 3d3c3a7a4..bdd19f30a 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
@@ -217,7 +217,7 @@ export default {
         }
     },
     beforeDestroy() {
-        this.buttonDown(this.Command.cancel.clearMbm.operation);
+        this.resetMbmButton();
     },
     methods: {
         passWordCommit(data) {
@@ -325,6 +325,11 @@ export default {
                 });
             }
         },
+        resetMbmButton() {
+            this.commandTypeList = [];
+            this.$store.dispatch('menuOperation/setButtonOperation', null);
+            Handler.clear(); // 清空操作组
+        },
         // 排列进路 OR 信号重开操作
         arrangementRouteOperation(deviceList) {
             const operate = {
@@ -659,7 +664,9 @@ export default {
             } else {
                 operate.cmdType = CMD.Station.CMD_STATION_SET_MASTER_GUIDE_LOCK;
             }
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => { this.buttonDown(this.Command.cancel.clearMbm.operation); }).catch((error) => {
+            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {
+                this.resetMbmButton();
+            }).catch((error) => {
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
             });
diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js
index dd82dde3b..d233080a4 100644
--- a/src/jmapNew/theme/chengdu_03/operationConfig.js
+++ b/src/jmapNew/theme/chengdu_03/operationConfig.js
@@ -907,7 +907,7 @@ export default {
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '609', tip: '鼠标左键点击【引导总锁】' },
                 { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '1190', tip: '鼠标左键点击【{26}】', codeType:'BUTTON' }
+                { deviceType: '04', orderNum: 3, operateCode: '609', tip: '鼠标左键点击【{26}】', codeType:'BUTTON' }
             ],
             config:{guideTotalLockBT:true}
         },
@@ -924,7 +924,7 @@ export default {
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '609', tip: '鼠标左键点击【引导总锁】' },
                 { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '1190', tip: '鼠标左键点击【{26}】', codeType:'BUTTON' }
+                { deviceType: '04', orderNum: 3, operateCode: '609', tip: '鼠标左键点击【{26}】', codeType:'BUTTON' }
             ],
             config:{guideTotalLockBT:true}
         }