From 8b38960f147667801c80ac6eb43a657fde749fc8 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Fri, 17 Feb 2023 17:58:59 +0800 Subject: [PATCH 1/3] =?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/datie_02/menus/menuButtonCtc.vue | 8 ++++---- src/scripts/cmdPlugin/OperationHandler.js | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue index aeb09a584..f2d11aac5 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue @@ -409,9 +409,9 @@ export default { operation: OperationEvent.CTCCommand.switchRouteSetModel.menu.operation }; this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { - if (valid) { - this.$refs.statusSelect.doShow(); - } + // if (valid) { + this.$refs.statusSelect.doShow(); + // } }); }, modeCovertBtn(operation) { @@ -420,7 +420,7 @@ export default { }; this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { this.modeCovertShow = true; - this.operation = operation; + // this.operation = operation; }); }, buttonDown(operation, commandTypeList) { diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 1540247a5..cccced2bc 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3806,23 +3806,23 @@ export const OperationEvent = { }, modeCovert:{ button:{ - operation: '299d', + operation: '299e', domId: '_Tips-Mode-Covert-Button{TOP}' }, agreeModeCovert:{ - operation: '299e', + operation: '299f', domId: '_Tips-Agree-Mode-Covert{TOP}' }, applyModeCovert:{ - operation: '299f', + operation: '299g', domId: '_Tips-Apply-Mode-Covert{TOP}' }, agreeModeCovertCommit:{ - operation: '299g', + operation: '299h', domId: '_Tips-Agree-Mode-Covert-Commit{TOP}' }, applyModeCovertCommit:{ - operation: '299g', + operation: '299i', domId: '_Tips-Apply-Mode-Covert-Commit{TOP}' } } From 960e16dfa2261eecef2ac961e08f506a4409fd27 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Fri, 17 Feb 2023 18:05:16 +0800 Subject: [PATCH 2/3] =?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/scripts/cmdPlugin/OperationHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index cccced2bc..f516d910b 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3815,7 +3815,7 @@ export const OperationEvent = { }, applyModeCovert:{ operation: '299g', - domId: '_Tips-Apply-Mode-Covert{TOP}' + domId: '_Tips-Apply-Mode-Covert' }, agreeModeCovertCommit:{ operation: '299h', From 35cd45786f5866501b1b6c7a7b0b0542220b76c9 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Fri, 17 Feb 2023 18:15:55 +0800 Subject: [PATCH 3/3] =?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 --- .../datie_02/menus/dialog/applyOrAgreeModeCovert.vue | 4 +--- src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue | 5 +---- src/scripts/cmdPlugin/OperationHandler.js | 8 ++++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue b/src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue index 9caf08f28..4af0f0509 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue @@ -288,9 +288,7 @@ export default { operation: OperationEvent.Command.cancel.menu.operation }; this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { - if (valid) { - this.doClose(); - } + this.doClose(); }).catch(() => { this.doClose(); }); diff --git a/src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue b/src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue index 8330e5e5a..9821a2b17 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue @@ -194,7 +194,6 @@ export default { }, commit() { const list = this.getChangeInfoList(); - console.log('🚀 ~ file: statusSelect.vue:154 ~ commit ~ list', list); if (list.length) { const operate = { over: true, @@ -224,9 +223,7 @@ export default { operation: OperationEvent.CTCCommand.switchRouteSetModel.cancel.operation }; this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { - if (valid) { - this.doClose(); - } + this.doClose(); }); }, doClose() { diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index f516d910b..e0b24cb85 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3807,15 +3807,15 @@ export const OperationEvent = { modeCovert:{ button:{ operation: '299e', - domId: '_Tips-Mode-Covert-Button{TOP}' + domId: '_Tips-Mode-Covert-Button{BOTTOM}' }, agreeModeCovert:{ operation: '299f', - domId: '_Tips-Agree-Mode-Covert{TOP}' + domId: '_Tips-Agree-Mode-Covert{BOTTOM}' }, applyModeCovert:{ operation: '299g', - domId: '_Tips-Apply-Mode-Covert' + domId: '_Tips-Apply-Mode-Covert{BOTTOM}' }, agreeModeCovertCommit:{ operation: '299h', @@ -4252,7 +4252,7 @@ export const OperationEvent = { switchRouteSetModel: { menu: { operation: 'a063', - domId: '_Tips-CTC-switchRouteSetModel-menu{TOP}' + domId: '_Tips-CTC-switchRouteSetModel-menu{BOTTOM}' }, confirm: { operation: 'a064',