From de8ea66ebd2667b5b4ec2e76cf612a444feef9c0 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 17 Jan 2023 14:00:39 +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

---
 src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue | 2 +-
 src/jmapNew/theme/datie_01/menus/dialog/routeHandControl.vue   | 3 ++-
 src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue      | 1 -
 src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue  | 2 +-
 .../theme/datie_02/menus/dialog/modifyAdjacentStation.vue      | 1 -
 src/jmapNew/theme/datie_02/menus/dialog/routeGuide.vue         | 1 -
 src/jmapNew/theme/datie_02/menus/dialog/stageRunplan.vue       | 1 -
 src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue         | 1 -
 src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue    | 3 +--
 .../theme/datie_jd1a/menus/dialog/defectiveShunting.vue        | 3 ++-
 src/jmapNew/theme/datie_jd1a/menus/dialog/routeHandControl.vue | 3 ++-
 src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue | 3 ++-
 src/jmapNew/theme/datie_ksk/menus/dialog/routeHandControl.vue  | 3 ++-
 src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue | 3 ++-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue
index 09860a94d..0cf0bb291 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue
@@ -252,7 +252,7 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/datie_01/menus/dialog/routeHandControl.vue
index 09860a94d..e63f62c8e 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/routeHandControl.vue
@@ -61,6 +61,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
+import { UserOperationType } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmControl from './childDialog/confirmControl';
@@ -252,7 +253,7 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue b/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue
index 431ddbfa1..e456c18af 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue
@@ -180,7 +180,6 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
                 userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue b/src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue
index 9534fb63b..330c287f2 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue
@@ -130,7 +130,7 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue b/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue
index 8d9b026b8..231eec9e6 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue
@@ -137,7 +137,6 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
                 userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/routeGuide.vue b/src/jmapNew/theme/datie_02/menus/dialog/routeGuide.vue
index 2af0f769d..5ce1e6af8 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/routeGuide.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/routeGuide.vue
@@ -237,7 +237,6 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
                 userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/stageRunplan.vue b/src/jmapNew/theme/datie_02/menus/dialog/stageRunplan.vue
index 9189c018d..0cae33bc9 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/stageRunplan.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/stageRunplan.vue
@@ -188,7 +188,6 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
                 userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue b/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue
index 6efc7cd46..ace75cc81 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue
@@ -123,7 +123,6 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
                 userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue
index 98782ebad..efc152738 100644
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue
@@ -34,7 +34,7 @@ import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import {menuOperate} from '../../../components/utils/menuOperate';
 import NoticeInfo from '../../../components/menus/childDialog/noticeInfo';
 import PasswordBox from '../dialog/childDialog/passwordInputBox.vue';
-import {UserOperationType} from "../../../../../scripts/ConstDic";
+import {UserOperationType} from '../../../../../scripts/ConstDic';
 export default {
     name: 'RouteCancel',
     components: {
@@ -116,7 +116,6 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
                 operation: OperationEvent.Command.close.menu.operation
             };
             this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/defectiveShunting.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/defectiveShunting.vue
index 40ef237e1..6a3cc3b3e 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/defectiveShunting.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/defectiveShunting.vue
@@ -31,6 +31,7 @@
 </template>
 <script>
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { UserOperationType } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 export default {
@@ -109,7 +110,7 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/routeHandControl.vue
index 09860a94d..339f5c026 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/routeHandControl.vue
@@ -67,6 +67,7 @@ import ConfirmControl from './childDialog/confirmControl';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { UserOperationType } from '@/scripts/ConstDic';
 
 export default {
     name: 'RouteHandControl',
@@ -252,7 +253,7 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue
index 40ef237e1..431ad1889 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue
@@ -33,6 +33,7 @@
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name: 'DefectiveShunting',
     components: {
@@ -109,7 +110,7 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/routeHandControl.vue
index 09860a94d..339f5c026 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/routeHandControl.vue
@@ -67,6 +67,7 @@ import ConfirmControl from './childDialog/confirmControl';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { UserOperationType } from '@/scripts/ConstDic';
 
 export default {
     name: 'RouteHandControl',
@@ -252,7 +253,7 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
index f52131573..f27b192ce 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
@@ -84,6 +84,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mapGetters } from 'vuex';
 import ConstConfig from '@/scripts/ConstConfig';
+import { UserOperationType } from '@/scripts/ConstDic';
 
 export default {
     name: 'StandBackStrategy',
@@ -218,7 +219,7 @@ export default {
         },
         cancel() {
             const operate = {
-                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };