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] =?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',