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} }