From 6fd16fcc95e3443e4c6b022d917867a878fba371 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 13 Mar 2023 15:01:59 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=B8=89=E6=96=B9=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/display/thirdJump.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/newMap/display/thirdJump.vue b/src/views/newMap/display/thirdJump.vue
index 2d4ff4757..b986038b3 100644
--- a/src/views/newMap/display/thirdJump.vue
+++ b/src/views/newMap/display/thirdJump.vue
@@ -27,6 +27,12 @@ export default {
                     labels: this.$route.query.labels,
                     third: true
                 };
+                if (this.$route.query.client) {
+                    query.client = this.$route.query.client;
+                }
+                if (this.$route.query.singleClient) {
+                    query.singleClient = this.$route.query.singleClient;
+                }
                 this.$router.replace({ path: `/display/demon`, query: query });
                 launchFullscreen();
             }).catch(error=>{

From 54fb5eb47ad47c86641041d1182f13a5055666b8 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Fri, 7 Apr 2023 15:27:22 +0800
Subject: [PATCH 02/10] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 6187b449c16b486929e43d0984d198a3f78da7c9
Author: dong <58670809@qq.com>
Date:   Fri Apr 7 15:22:33 2023 +0800

    代码调整

commit 074453ece74675c3528026c7d3d5857a9a46f4e4
Author: weizhihong <weizhihong@joylink.club>
Date:   Fri Mar 31 16:52:08 2023 +0800

    【删除注释】
---
 src/jmapNew/theme/chengdu_01/menus/menuBar.vue                | 2 +-
 src/jmapNew/theme/chengdu_01/menus/menuSection.vue            | 2 +-
 src/jmapNew/theme/chengdu_01/menus/menuSignal.vue             | 1 -
 src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue       | 2 +-
 src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue             | 2 +-
 src/jmapNew/theme/chengdu_01/menus/menuTrain.vue              | 2 --
 src/jmapNew/theme/chengdu_03/menus/menuButton.vue             | 2 +-
 src/jmapNew/theme/chengdu_03/menus/menuSection.vue            | 2 +-
 src/jmapNew/theme/chengdu_03/menus/menuSignal.vue             | 2 +-
 src/jmapNew/theme/components/menus/dialog/trainControl.vue    | 2 +-
 src/jmapNew/theme/components/menus/menuBar.vue                | 2 +-
 src/jmapNew/theme/datie_01/menus/menuButton.vue               | 1 -
 src/jmapNew/theme/datie_01/menus/menuSection.vue              | 1 -
 src/jmapNew/theme/datie_01/menus/menuSignal.vue               | 1 -
 src/jmapNew/theme/datie_01/menus/menuStation.vue              | 1 -
 src/jmapNew/theme/datie_01/menus/menuStationStand.vue         | 2 --
 src/jmapNew/theme/datie_01/menus/menuSwitch.vue               | 1 -
 src/jmapNew/theme/datie_01/menus/menuTrain.vue                | 1 -
 src/jmapNew/theme/datie_02/menus/menuButton.vue               | 2 +-
 src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue            | 2 +-
 src/jmapNew/theme/datie_jd1a/menus/menuButton.vue             | 1 -
 src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue          | 1 -
 src/jmapNew/theme/datie_jd1a/menus/menuStation.vue            | 2 +-
 src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue       | 1 -
 src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue              | 1 -
 src/jmapNew/theme/datie_ksk/menus/menuButton.vue              | 1 -
 src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue           | 2 +-
 src/jmapNew/theme/datie_ksk/menus/menuSection.vue             | 1 -
 src/jmapNew/theme/datie_ksk/menus/menuSignal.vue              | 1 -
 src/jmapNew/theme/datie_ksk/menus/menuStation.vue             | 3 +--
 src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue        | 2 --
 src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue              | 1 -
 src/jmapNew/theme/datie_ksk/menus/menuTrain.vue               | 2 --
 src/jmapNew/theme/datie_tky/menus/menuSection.vue             | 1 -
 src/jmapNew/theme/datie_tky/menus/menuSignal.vue              | 1 -
 src/jmapNew/theme/datie_tky/menus/menuSwitch.vue              | 1 -
 src/jmapNew/theme/datie_tky/menus/menuTrain.vue               | 2 --
 src/jmapNew/theme/foshan_01/menus/menuAxleReset.vue           | 1 -
 src/jmapNew/theme/foshan_01/menus/menuButton.vue              | 2 +-
 src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue        | 2 +-
 src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue       | 2 +-
 src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue           | 2 --
 src/jmapNew/theme/ningbo_01/menus/menuSection.vue             | 2 --
 src/jmapNew/theme/ningbo_01/menus/menuSignal.vue              | 2 --
 src/jmapNew/theme/ningbo_01/menus/menuStation.vue             | 2 --
 src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue      | 2 +-
 src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue        | 2 +-
 src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue     | 2 --
 src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue        | 2 +-
 src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue     | 2 +-
 src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue              | 1 -
 src/jmapNew/theme/ningbo_01/menus/menuTrain.vue               | 2 --
 src/jmapNew/theme/ningbo_03/menus/menuStation.vue             | 2 +-
 src/jmapNew/theme/ningbo_03/menus/menuTrain.vue               | 2 +-
 src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue        | 2 +-
 src/jmapNew/theme/xian_01/menus/menuSection.vue               | 1 -
 src/jmapNew/theme/xian_01/menus/menuSignal.vue                | 2 --
 src/jmapNew/theme/xian_01/menus/menuStation.vue               | 2 --
 src/jmapNew/theme/xian_01/menus/menuStationStand.vue          | 2 --
 src/jmapNew/theme/xian_01/menus/menuStationTurnBack.vue       | 2 --
 src/jmapNew/theme/xian_01/menus/menuSwitch.vue                | 1 -
 src/jmapNew/theme/xian_01/menus/menuTrain.vue                 | 2 --
 src/jmapNew/theme/xian_02/menus/menuAutoTrunRoute.vue         | 2 --
 src/jmapNew/theme/xian_02/menus/menuAxleReset.vue             | 1 -
 src/jmapNew/theme/xian_02/menus/menuSection.vue               | 3 ---
 src/jmapNew/theme/xian_02/menus/menuSignal.vue                | 3 ---
 src/jmapNew/theme/xian_02/menus/menuStation.vue               | 1 -
 src/jmapNew/theme/xian_02/menus/menuStationControl.vue        | 1 -
 src/jmapNew/theme/xian_02/menus/menuSwitch.vue                | 1 -
 src/jmapNew/theme/xian_02/menus/popStationStand.vue           | 4 ----
 .../newMap/display/terminals/equipmentConstructionTable.vue   | 2 +-
 71 files changed, 25 insertions(+), 96 deletions(-)

diff --git a/src/jmapNew/theme/chengdu_01/menus/menuBar.vue b/src/jmapNew/theme/chengdu_01/menus/menuBar.vue
index 3efb5f524..8eff247f6 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuBar.vue
@@ -72,7 +72,7 @@ import { mapGetters } from 'vuex';
 import { TrainingMode } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { State2SimulationMap } from '@/scripts/cmdPlugin/Config';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import SystemLogin from './menuDialog/systemLogin';
 import SystemLogout from './menuDialog/systemLogout';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue
index af230d5b0..a19530d0a 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue
@@ -23,7 +23,7 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
index 03f9ea685..1b6b4383c 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
@@ -16,7 +16,6 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue
index 0448cc45f..65b78c9ce 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue
@@ -16,7 +16,7 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
index f9d15ffc0..17c9cf380 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
@@ -21,7 +21,7 @@ import CancelMouseState from '@/mixin/CancelMouseState';
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
index 6ec4d1da9..da98b209e 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
@@ -14,8 +14,6 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-// import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
index 110f27288..88a7971fe 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
@@ -111,7 +111,7 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-// import Handler from '@/scripts/cmdPlugin/Handler';
+
 import { getAutoReentryBySignalCode } from '@/utils/mapList';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
index 4b7cadb11..da27b2084 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
@@ -21,7 +21,7 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 import {judgeStationControl} from '../../components/utils/menuJudge';
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
index fb111ac3d..a1523729e 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
@@ -25,7 +25,7 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordInputBox';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import {judgeStationControl} from '../../components/utils/menuJudge';
diff --git a/src/jmapNew/theme/components/menus/dialog/trainControl.vue b/src/jmapNew/theme/components/menus/dialog/trainControl.vue
index a5b477add..0057eccaf 100644
--- a/src/jmapNew/theme/components/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/trainControl.vue
@@ -96,7 +96,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-// import Handler from '@/scripts/cmdPlugin/Handler';
+
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import { getTrainDetailBytripNumber, getTrainDetailByStNumber } from '@/api/simulation';
 import NoticeInfo from '../childDialog/noticeInfo';
diff --git a/src/jmapNew/theme/components/menus/menuBar.vue b/src/jmapNew/theme/components/menus/menuBar.vue
index 1e4d321fb..562e31f38 100644
--- a/src/jmapNew/theme/components/menus/menuBar.vue
+++ b/src/jmapNew/theme/components/menus/menuBar.vue
@@ -17,7 +17,7 @@
 </template>
 <script>
 import { State2SimulationMap } from '@/scripts/cmdPlugin/Config';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import EachChildMenu from './eachChildMenu';
 
 export default {
diff --git a/src/jmapNew/theme/datie_01/menus/menuButton.vue b/src/jmapNew/theme/datie_01/menus/menuButton.vue
index c95248095..d895e027d 100644
--- a/src/jmapNew/theme/datie_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuButton.vue
@@ -108,7 +108,6 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-// import Handler from '@/scripts/cmdPlugin/Handler';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
diff --git a/src/jmapNew/theme/datie_01/menus/menuSection.vue b/src/jmapNew/theme/datie_01/menus/menuSection.vue
index 3b540cc50..12e31a16b 100644
--- a/src/jmapNew/theme/datie_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuSection.vue
@@ -124,7 +124,6 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                // this.menu = MenuContextHandler.covert(this.menuNormal);
                 this.menu = this.menuNormal.Local;
             } else {
                 this.menu = [];
diff --git a/src/jmapNew/theme/datie_01/menus/menuSignal.vue b/src/jmapNew/theme/datie_01/menus/menuSignal.vue
index 565b695bd..9dadc9468 100644
--- a/src/jmapNew/theme/datie_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuSignal.vue
@@ -195,7 +195,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = this.menuNormal.Local;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/datie_01/menus/menuStation.vue b/src/jmapNew/theme/datie_01/menus/menuStation.vue
index 23b16fcbc..81233db7f 100644
--- a/src/jmapNew/theme/datie_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuStation.vue
@@ -92,7 +92,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = this.menuNormal.Local;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/datie_01/menus/menuStationStand.vue b/src/jmapNew/theme/datie_01/menus/menuStationStand.vue
index 4a2228e89..ea5b95e17 100644
--- a/src/jmapNew/theme/datie_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuStationStand.vue
@@ -17,7 +17,6 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFaultNew';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -116,7 +115,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/datie_01/menus/menuSwitch.vue b/src/jmapNew/theme/datie_01/menus/menuSwitch.vue
index a38b1d4c9..2c9952bab 100644
--- a/src/jmapNew/theme/datie_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuSwitch.vue
@@ -137,7 +137,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = this.menuNormal.Local;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/datie_01/menus/menuTrain.vue b/src/jmapNew/theme/datie_01/menus/menuTrain.vue
index e66d16215..92a4cf963 100644
--- a/src/jmapNew/theme/datie_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuTrain.vue
@@ -165,7 +165,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 // if (!this.$store.state.scriptRecord.bgSet) {
diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index 3185c8c16..1adbbdf91 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -125,7 +125,7 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-// import Handler from '@/scripts/cmdPlugin/Handler';
+
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import DefectiveShunting from './dialog/defectiveShunting.vue';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
index e9be2e399..6ab08179f 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
@@ -127,7 +127,7 @@
 import PopMenu from '@/components/PopMenu';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-// import Handler from '@/scripts/cmdPlugin/Handler';
+
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import TrainRoute from './dialog/trainRoute.vue';
 import ShuntRoute from './dialog/shuntRoute.vue';
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue b/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue
index ef595b5c1..9b601ec05 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue
@@ -211,7 +211,6 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler'
-// import Handler from '@/scripts/cmdPlugin/Handler'
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue'
 import DefectiveShunting from './dialog/defectiveShunting.vue'
 import CMD from '@/scripts/cmdPlugin/CommandEnum'
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue
index 229c7f115..f36499797 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue
@@ -120,7 +120,6 @@
 import PopMenu from '@/components/PopMenu';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-// import Handler from '@/scripts/cmdPlugin/Handler';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import TrainRoute from './dialog/trainRoute.vue';
 import ShuntRoute from './dialog/shuntRoute.vue';
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuStation.vue b/src/jmapNew/theme/datie_jd1a/menus/menuStation.vue
index d8895da01..54e9ac200 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuStation.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuStation.vue
@@ -19,7 +19,7 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-// import Handler from '@/scripts/cmdPlugin/Handler';
+
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 
 export default {
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue b/src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue
index cd77d8df0..f28166c21 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue
@@ -17,7 +17,6 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
index 2c6f1ba4a..fc237d4a9 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
@@ -32,7 +32,6 @@ import UpdateTrip from './dialog/updateTrip';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
 
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuButton.vue b/src/jmapNew/theme/datie_ksk/menus/menuButton.vue
index 4cd47cbb5..ff248104f 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuButton.vue
@@ -139,7 +139,6 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-// import Handler from '@/scripts/cmdPlugin/Handler';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import DefectiveShunting from './dialog/defectiveShunting.vue';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue
index 229c7f115..a0e926b02 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue
@@ -120,7 +120,7 @@
 import PopMenu from '@/components/PopMenu';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-// import Handler from '@/scripts/cmdPlugin/Handler';
+
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import TrainRoute from './dialog/trainRoute.vue';
 import ShuntRoute from './dialog/shuntRoute.vue';
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuSection.vue b/src/jmapNew/theme/datie_ksk/menus/menuSection.vue
index 7aecfa05c..9034a2038 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuSection.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuSection.vue
@@ -138,7 +138,6 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                // this.menu = MenuContextHandler.covert(this.menuNormal);
                 this.menu = this.menuNormal.Local;
                 const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
                 if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue b/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue
index 641e26aae..46ba38c1e 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue
@@ -208,7 +208,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = this.menuNormal.Local;
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
             if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuStation.vue b/src/jmapNew/theme/datie_ksk/menus/menuStation.vue
index d8895da01..665032554 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuStation.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuStation.vue
@@ -19,7 +19,7 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-// import Handler from '@/scripts/cmdPlugin/Handler';
+
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 
 export default {
@@ -104,7 +104,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = this.menuNormal.Local;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue b/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue
index cd77d8df0..640fadc2b 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue
@@ -17,7 +17,6 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -116,7 +115,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue b/src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue
index 5b2cc762d..ea995fc4e 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue
@@ -197,7 +197,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = this.menuNormal.Local;
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
             if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue b/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue
index b419ec630..6e9620946 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue
@@ -33,7 +33,6 @@ import UpdateTrip from './dialog/updateTrip';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
@@ -248,7 +247,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
             if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
                 this.menu.forEach(item => { item.disabled = true; });
diff --git a/src/jmapNew/theme/datie_tky/menus/menuSection.vue b/src/jmapNew/theme/datie_tky/menus/menuSection.vue
index 1abfbb0d5..5a257498e 100644
--- a/src/jmapNew/theme/datie_tky/menus/menuSection.vue
+++ b/src/jmapNew/theme/datie_tky/menus/menuSection.vue
@@ -71,7 +71,6 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                // this.menu = MenuContextHandler.covert(this.menuNormal);
                 this.menu = this.menuNormal.Local;
             } else {
                 this.menu = [];
diff --git a/src/jmapNew/theme/datie_tky/menus/menuSignal.vue b/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
index 84e1ee257..2687a9aae 100644
--- a/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
@@ -98,7 +98,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = this.menuNormal.Local;
             // // 故障模式菜单列表
             // if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/datie_tky/menus/menuSwitch.vue b/src/jmapNew/theme/datie_tky/menus/menuSwitch.vue
index 6ab499d8e..af3360550 100644
--- a/src/jmapNew/theme/datie_tky/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/datie_tky/menus/menuSwitch.vue
@@ -197,7 +197,6 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = this.menuNormal.Local;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/datie_tky/menus/menuTrain.vue b/src/jmapNew/theme/datie_tky/menus/menuTrain.vue
index 7dd297c49..a9e95a1d7 100644
--- a/src/jmapNew/theme/datie_tky/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_tky/menus/menuTrain.vue
@@ -33,7 +33,6 @@ import UpdateTrip from './dialog/updateTrip';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
@@ -248,7 +247,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
             if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
                 this.menu.forEach(item => { item.disabled = true; });
diff --git a/src/jmapNew/theme/foshan_01/menus/menuAxleReset.vue b/src/jmapNew/theme/foshan_01/menus/menuAxleReset.vue
index 8e4f4c21a..d2ad8330f 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuAxleReset.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuAxleReset.vue
@@ -13,7 +13,6 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'MenuLimit',
diff --git a/src/jmapNew/theme/foshan_01/menus/menuButton.vue b/src/jmapNew/theme/foshan_01/menus/menuButton.vue
index ab0e97326..ed71fa45f 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuButton.vue
@@ -244,7 +244,7 @@
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import { SimulationUserType, OperateMode } from '@/scripts/ConstDic';
-// import Handler from '@/scripts/cmdPlugin/Handler';
+
 
 export default {
     name: 'MapButtonMenu',
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue
index 5289f7742..f59344ea8 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue
@@ -149,7 +149,7 @@ import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordIn
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-// import Handler from '@/scripts/cmdPlugin/Handler';
+
 // import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 export default {
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue b/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue
index ea3e602ea..a78ce944a 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue
@@ -12,7 +12,7 @@ import { mapGetters } from 'vuex';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue b/src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue
index 0cd208a99..877006c7e 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue
@@ -13,7 +13,6 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'MenuLimit',
@@ -70,7 +69,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
index f839f50d7..d5b85c5fd 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
@@ -27,7 +27,6 @@ import ConfirmControl from '@/jmapNew/theme/components/menus/childDialog/confirm
 import OperateConfirm from './dialog/childDialog/operateConfirm';
 import SectionUnLock from '@/jmapNew/theme/components/menus/dialog/sectionUnLock';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
@@ -182,7 +181,6 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                // this.menu = MenuContextHandler.covert(this.menuNormal);
                 this.menu = [];
                 this.menuNormal.forEach(menuItem => {
                     let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
index 1e7211d2a..499358ca4 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
@@ -27,7 +27,6 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import OperateConfirm from './dialog/childDialog/operateConfirm';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import PasswordInput from './dialog/passwordInput';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
@@ -195,7 +194,6 @@ export default {
     },
     methods: {
         initMenu() {
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 let status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
index af078f91c..ea2e1125d 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
@@ -18,8 +18,6 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { OperateMode, DeviceMenu, TrainingMode } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-// import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
index 773f6261b..84017e412 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
@@ -12,7 +12,7 @@ import { mapGetters } from 'vuex';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 
 export default {
     name: 'StationControlMenu',
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
index e14d34f52..19a2b5fbc 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
@@ -14,7 +14,7 @@ import { mapGetters } from 'vuex';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperateConfirm from './dialog/childDialog/operateConfirm';
 import ButtonConfirm from './dialog/childDialog/buttonConfirm';
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
index ffdfb9e00..f891d1552 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
@@ -11,7 +11,6 @@ import { mapGetters } from 'vuex';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import ButtonDown from './dialog/buttonDown';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
@@ -78,7 +77,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 let status = judgeStationControl(this.selected.code, this.selected.stationCode, this.work);
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
index a84a137d1..7a3a96b01 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
@@ -26,7 +26,7 @@ import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuO
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue
index 41d14abbf..00c54c2a7 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue
@@ -12,7 +12,7 @@ import { mapGetters } from 'vuex';
 
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import {menuOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
index 38b2782b9..712e5c8ec 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
@@ -27,7 +27,6 @@ import { mapGetters } from 'vuex';
 
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
index 10ab4a906..8748f4b76 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
@@ -30,7 +30,6 @@ import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit'
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 
@@ -231,7 +230,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuStation.vue b/src/jmapNew/theme/ningbo_03/menus/menuStation.vue
index 8e01af41c..19dc73455 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuStation.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuStation.vue
@@ -19,7 +19,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import { DeviceMenu } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
index d9cfa9a08..d0f9f1dc1 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
@@ -30,7 +30,7 @@ import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit'
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 // import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
index afdda768d..65ca9c353 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
@@ -38,7 +38,7 @@
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import Handler from '@/scripts/cmdPlugin/Handler';
+
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import {TrainType} from '@/scripts/ConstDic';
 
diff --git a/src/jmapNew/theme/xian_01/menus/menuSection.vue b/src/jmapNew/theme/xian_01/menus/menuSection.vue
index 8edbe7839..d6f60735d 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSection.vue
@@ -190,7 +190,6 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                // this.menu = MenuContextHandler.covert(this.menuNormal);
                 this.menu = [];
                 this.menuNormal.forEach(menuItem => {
                     let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
index c1c85498a..a74b0523e 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
@@ -24,7 +24,6 @@ import RouteHandControl from '@/jmapNew/theme/components/menus/dialog/routeHandC
 import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
@@ -266,7 +265,6 @@ export default {
     },
     methods: {
         initMenu() {
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
diff --git a/src/jmapNew/theme/xian_01/menus/menuStation.vue b/src/jmapNew/theme/xian_01/menus/menuStation.vue
index 0d83409c2..dddbe6fd3 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStation.vue
@@ -19,7 +19,6 @@ import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
@@ -186,7 +185,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 const status = judgeStationControl(this.selected.code, this.selected.stationCode, this.work);
diff --git a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
index 1814db426..f83c2d616 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
@@ -27,7 +27,6 @@ import Psl from '@/jmapNew/theme/components/menus/dialog/psl';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
@@ -194,7 +193,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 let status = judgeStationControl(this.selected.stationCode, this.selected.deviceStationCode, this.work);
diff --git a/src/jmapNew/theme/xian_01/menus/menuStationTurnBack.vue b/src/jmapNew/theme/xian_01/menus/menuStationTurnBack.vue
index d89fe982f..099530489 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStationTurnBack.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStationTurnBack.vue
@@ -12,7 +12,6 @@ import { mapGetters } from 'vuex';
 
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -70,7 +69,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;
diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
index 155773f0b..3deb815ef 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
@@ -206,7 +206,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 let status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
index 82a617952..06ebe03dd 100644
--- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
@@ -31,7 +31,6 @@ import TrainSwitch from './dialog/trainSwitch';
 import TrainEditNumber from './dialog/trainEditNumber';
 import TrainDetail from './dialog/trainDetail';
 import SetTrainOperation from '@/jmapNew/theme/components/menus/dialog/setTrainOperation';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 
@@ -240,7 +239,6 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected) : false;
diff --git a/src/jmapNew/theme/xian_02/menus/menuAutoTrunRoute.vue b/src/jmapNew/theme/xian_02/menus/menuAutoTrunRoute.vue
index e200ee1ec..4f886f384 100644
--- a/src/jmapNew/theme/xian_02/menus/menuAutoTrunRoute.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuAutoTrunRoute.vue
@@ -12,7 +12,6 @@ import { mapGetters } from 'vuex';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'MenuLimit',
@@ -86,7 +85,6 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/xian_02/menus/menuAxleReset.vue b/src/jmapNew/theme/xian_02/menus/menuAxleReset.vue
index 26e269064..f25a62c21 100644
--- a/src/jmapNew/theme/xian_02/menus/menuAxleReset.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuAxleReset.vue
@@ -71,7 +71,6 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue
index 0f614e975..2175564fb 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue
@@ -24,7 +24,6 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
@@ -229,8 +228,6 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                // this.menu = this.menuNormal.Center;
-                // this.menu = MenuContextHandler.covert2(this.menuNormal);
                 this.menu = [];
                 this.menuNormal.forEach(menuItem => {
                     const status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index ec9955591..659f4a5aa 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -230,8 +230,6 @@ export default {
             }
         },
         '$store.state.menuOperation.leftClickCount': function (val) {
-            // const control = MenuContextHandler.getStationControl(this.selected);
-            // const centralStation = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
             if (this.selected._type === 'Signal') {
                 const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
                 status && this.arrangementRoute();
@@ -246,7 +244,6 @@ export default {
             };
         },
         initMenu() {
-            // this.menu = MenuContextHandler.covert2(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
diff --git a/src/jmapNew/theme/xian_02/menus/menuStation.vue b/src/jmapNew/theme/xian_02/menus/menuStation.vue
index f55cd9b5b..1c007c93d 100644
--- a/src/jmapNew/theme/xian_02/menus/menuStation.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuStation.vue
@@ -263,7 +263,6 @@ export default {
             this.menu = [];
             // this.menu = [...this.menuNormal.Center];
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             const selected = this.selected;
             const work = this.work;
             function setDisabledShow(item) {
diff --git a/src/jmapNew/theme/xian_02/menus/menuStationControl.vue b/src/jmapNew/theme/xian_02/menus/menuStationControl.vue
index 3b03b509d..77c0610c7 100644
--- a/src/jmapNew/theme/xian_02/menus/menuStationControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuStationControl.vue
@@ -68,7 +68,6 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;
diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
index f22e14c23..61ff8934e 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
@@ -202,7 +202,6 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert2(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
                 const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
diff --git a/src/jmapNew/theme/xian_02/menus/popStationStand.vue b/src/jmapNew/theme/xian_02/menus/popStationStand.vue
index 5d2f1e5bf..c27848541 100644
--- a/src/jmapNew/theme/xian_02/menus/popStationStand.vue
+++ b/src/jmapNew/theme/xian_02/menus/popStationStand.vue
@@ -20,7 +20,6 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
@@ -295,17 +294,14 @@ export default {
                 this.menu = this.updateStandPlan;
                 break;
             case 'stopJumping':
-                // this.menu = MenuContextHandler.covertList(this.stopJumping.Center);
                 this.getMenu(type);
                 break;
             case 'allTrainStopJump':
                 this.topTip = '所有列车跳停本站';
-                // this.menu = MenuContextHandler.covertList(this.allTrainStopJump.Center);
                 this.getMenu(type);
                 break;
             case 'standDetain':
                 this.topTip = '站台扣车 SET/CANCEL';
-                // this.menu = MenuContextHandler.covertList(this.standDetain.Center);
                 this.getMenu(type);
                 break;
             case 'psdInfoConfirm':
diff --git a/src/views/newMap/display/terminals/equipmentConstructionTable.vue b/src/views/newMap/display/terminals/equipmentConstructionTable.vue
index c15b65a48..9a8ed93a7 100644
--- a/src/views/newMap/display/terminals/equipmentConstructionTable.vue
+++ b/src/views/newMap/display/terminals/equipmentConstructionTable.vue
@@ -251,7 +251,7 @@ export default {
     }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .equipmentConstructionTable{
   width:91%;margin-left:15px
 }

From 2bb8c6df92508536eb33abda5a293dbc3fb564c1 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 12 Apr 2023 18:34:06 +0800
Subject: [PATCH 03/10] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 30763300acb5d7ce9e3ff7af5e4d8c27139abc44
Author: dong <58670809@qq.com>
Date:   Wed Apr 12 18:31:39 2023 +0800

    修改前端配置带id

commit cde33feb22f90f2af2d305bb97781473d61db0ea
Author: fan <fanyuhong@joylink.club>
Date:   Wed Apr 12 18:07:47 2023 +0800

    宁波三进路选择表示样式不取消

commit 34a94e2c6dcf7b7b496752dbeb764f762db934d5
Author: fan <fanyuhong@joylink.club>
Date:   Wed Apr 12 17:58:11 2023 +0800

    区域选择界面调整

commit 52af1d994bdda8eb6b689e3f4c33181ecff986b0
Author: fan <fanyuhong@joylink.club>
Date:   Wed Apr 12 13:33:03 2023 +0800

    系统管理-教学考试数据管理

commit 6187b449c16b486929e43d0984d198a3f78da7c9
Author: dong <58670809@qq.com>
Date:   Fri Apr 7 15:22:33 2023 +0800

    代码调整

commit 074453ece74675c3528026c7d3d5857a9a46f4e4
Author: weizhihong <weizhihong@joylink.club>
Date:   Fri Mar 31 16:52:08 2023 +0800

    【删除注释】
---
 .../menus/menuDialog/areaSelection.vue        | 39 ++++++++-----------
 .../menus/menuDialog/routeCommand.vue         |  1 +
 .../system/frontProjectConfigManage/add.vue   |  2 +-
 src/views/system/userExam/index.vue           |  8 ++++
 src/views/system/userTraining/index.vue       |  8 ++++
 5 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
index 8dc294630..da68e047f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
@@ -30,9 +30,9 @@
             </template>
           </el-table-column>
           <el-table-column prop="name" label="车站名" align="center" width="100" :show-overflow-tooltip="true" />
-          <el-table-column prop="control" label="控制状态" align="center" width="70">
+          <el-table-column prop="controller" label="控制状态" align="center" width="70">
             <template slot-scope="scope">
-              <div>{{ getControlStatus(scope.row.code) }}</div>
+              <div>{{ getControlStatus(scope.row.controller) }}</div>
             </template>
           </el-table-column>
           <el-table-column prop="stationCode" label="" align="center">
@@ -93,9 +93,12 @@ export default {
         }
     },
     watch: {
-        '$store.state.map.mapStateLoadedCount': function () {
+        '$store.state.map.mapStationStateUpdateCount': function() {
             if (this.show) {
-                this.tableData = [...this.tableData];
+                this.tableData.forEach(item => {
+                    const station = this.$store.getters['map/getDeviceByCode'](item.code);
+                    item.controller = station.controller;
+                });
             }
         }
     },
@@ -122,24 +125,18 @@ export default {
                 this.memberId = this.$store.state.training.myMemberId;
                 const centralizedStationCode = this.stationCentralizedMap[this.$store.state.training.roleDeviceCode];
                 const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode);
-                this.$set(centralizedStation, 'apply', false);
-                this.$set(centralizedStation, 'release', false);
-                this.$set(centralizedStation, 'distribution', false);
-                this.tableData.push(centralizedStation);
+                const data = { code: centralizedStation.code, name: centralizedStation.name, apply: false, release: false, distribution: false, controller: null };
+                this.tableData.push(data);
                 centralizedStation.chargeStationCodeList.forEach(elem => {
                     const station = this.$store.getters['map/getDeviceByCode'](elem);
-                    this.$set(station, 'apply', false);
-                    this.$set(station, 'release', false);
-                    this.$set(station, 'distribution', false);
-                    this.tableData.push(station);
+                    const data1 = { code: station.code, name: station.name, apply: false, release: false, distribution: false, controller: null };
+                    this.tableData.push(data1);
                 });
             } else if (this.$store.state.training.roles === 'DISPATCHER') {
                 this.memberId = this.$store.state.training.myMemberId;
                 this.stationList.forEach(item => {
-                    this.$set(item, 'apply', false);
-                    this.$set(item, 'release', false);
-                    this.$set(item, 'distribution', false);
-                    this.tableData.push(item);
+                    const data = { code: item.code, name: item.name, apply: false, release: false, distribution: false, controller: null };
+                    this.tableData.push(data);
                 });
             }
             this.show = true;
@@ -154,9 +151,8 @@ export default {
                 }
             });
         },
-        getControlStatus(code) {
-            const newStation = this.$store.getters['map/getDeviceByCode'](code);
-            return newStation.controller === this.memberId ? '自控' : '未控';
+        getControlStatus(controller) {
+            return controller === this.memberId ? '自控' : '未控';
         },
         getDisabled(code, type) {
             const newStation = this.$store.getters['map/getDeviceByCode'](code);
@@ -172,9 +168,8 @@ export default {
             }
         },
         getController(station) {
-            const newStation = this.$store.getters['map/getDeviceByCode'](station.code);
-            if (newStation.controller) {
-                const controller = this.$store.state.training.memberData[newStation.controller];
+            if (station.controller) {
+                const controller = this.$store.state.training.memberData[station.controller];
                 return controller.label;
             } else {
                 return '';
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
index 6a5ad4675..26fd32c25 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
@@ -324,6 +324,7 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
+            this.restoreBeforeDevices();
             this.$refs.table.setCurrentRow();
             this.$refs.endTable.setCurrentRow();
             this.$refs.singleTable.setCurrentRow();
diff --git a/src/views/system/frontProjectConfigManage/add.vue b/src/views/system/frontProjectConfigManage/add.vue
index d9ac4302e..93d204bb0 100644
--- a/src/views/system/frontProjectConfigManage/add.vue
+++ b/src/views/system/frontProjectConfigManage/add.vue
@@ -85,7 +85,7 @@ export default {
                     this.loading = true;
                     const data = Object.assign({}, this.formModel);
                     // 检查项目markKey
-                    checkFrontProjectExist({markKey:data.markKey}).then(res=>{
+                    checkFrontProjectExist({markKey:data.markKey, id: data.id}).then(res=>{
                         if (!res.data) {
                             if (data.id) {
                                 // 更新前端项目配置
diff --git a/src/views/system/userExam/index.vue b/src/views/system/userExam/index.vue
index e3163496b..8f317dc5d 100644
--- a/src/views/system/userExam/index.vue
+++ b/src/views/system/userExam/index.vue
@@ -39,6 +39,14 @@ export default {
                         config: {
                             data: this.$ConstSelect.examResultList
                         }
+                    },
+                    userMobile: {
+                        type: 'text',
+                        label: '手机号'
+                    },
+                    userId: {
+                        type: 'text',
+                        label: '用户Id'
                     }
                 }
 
diff --git a/src/views/system/userTraining/index.vue b/src/views/system/userTraining/index.vue
index 23efdcc8a..860142850 100644
--- a/src/views/system/userTraining/index.vue
+++ b/src/views/system/userTraining/index.vue
@@ -35,6 +35,14 @@ export default {
                     userName: {
                         type: 'text',
                         label: this.$t('system.userName')
+                    },
+                    userMobile: {
+                        type: 'text',
+                        label: '手机号'
+                    },
+                    userId: {
+                        type: 'text',
+                        label: '用户Id'
                     }
                 }
 

From 857472ba721a51e80d2e89ede76cdc29d8cd0208 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Fri, 14 Apr 2023 16:26:57 +0800
Subject: [PATCH 04/10] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 73c9c0777eccbce97cae036e368b61fca518f0dd
Author: dong <58670809@qq.com>
Date:   Fri Apr 14 16:25:38 2023 +0800

    去掉实训管理查询项缓存
---
 src/views/organization/trainingManage/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/organization/trainingManage/index.vue b/src/views/organization/trainingManage/index.vue
index af8c6380b..819094601 100644
--- a/src/views/organization/trainingManage/index.vue
+++ b/src/views/organization/trainingManage/index.vue
@@ -25,6 +25,7 @@ export default {
             queryForm: {
                 labelWidth: '100px',
                 reset: false,
+                notRecord: true,
                 queryObject: {
                     mapId: {
                         type: 'select',

From f27fd63e295d6e65a34a5473d71a75daaa954838 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Mon, 17 Apr 2023 13:28:06 +0800
Subject: [PATCH 05/10] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 0d50ac586b4ca3411960ddd04d638e5782ddbf53
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 13:26:39 2023 +0800

    修改弹窗没有高度问题
---
 src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue b/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue
index 7d8b73d35..7a3b42018 100644
--- a/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue
+++ b/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="menus" :style="{width: width + 'px'}">
+  <div class="menus" :style="{width: width + 'px', height: '100%'}">
     <div class="title">{{ `哈尔滨局CTC3.0(车务终端A机)--王岗：${dateString}第一班 18:00 管理员代--` }}</div>
     <menu-bar ref="menuBar" :selected="selected" />
     <div style="position: absolute; top: 64px;z-index: 10;background: #F0F0F0;padding: 2px;height: 65px;width: 100%;">

From c020d69150f438cfcce5ace4da3769b6f2790941 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Mon, 17 Apr 2023 14:51:08 +0800
Subject: [PATCH 06/10] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 1f5d891c55a2b28420affb35be6389badfdea61a
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 14:40:39 2023 +0800

    修改苏电院交控线路顶部菜单展开后没法收回去问题
---
 src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue  | 9 +++++++++
 .../theme/chengdu_03/menus/dispatchWorkMenuBar.vue       | 3 +++
 src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue     | 9 +++++++++
 src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue  | 3 +++
 4 files changed, 24 insertions(+)

diff --git a/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue
index e3fda315d..ed43be196 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue
@@ -58,7 +58,16 @@ export default {
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+            };
         });
+    },
+    beforeDestroy() {
+        window.onclick = function (e) {};
     }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue
index 74c576be1..93aff0a39 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue
@@ -372,6 +372,9 @@ export default {
                     this.$refs.helpAbout.doShow(operate);
                 }
             });
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
         }
     }
 };
diff --git a/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue b/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue
index b3cb3a4df..f20200129 100644
--- a/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue
@@ -33,7 +33,16 @@ export default {
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+            };
         });
+    },
+    beforeDestroy() {
+        window.onclick = function (e) {};
     }
 };
 </script>
diff --git a/src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue b/src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue
index f6ecdebcf..34190d805 100644
--- a/src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue
@@ -328,6 +328,9 @@ export default {
                     this.$refs.helpAbout.doShow(operate);
                 }
             });
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
         }
     }
 };

From f2039927dbacad84b2055344261617a1dcf5da3e Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 19 Apr 2023 10:42:38 +0800
Subject: [PATCH 07/10] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit d082dc2fbc970cccf3ba1f3daee80a9d3a5ecd30
Author: dong <58670809@qq.com>
Date:   Wed Apr 19 10:41:17 2023 +0800

    修改收令单位不显示调度命令问题

commit c52925960c20d076c253e086a4e18e7085d09442
Merge: a3bc0de08 1f5d891c5
Author: joylink_zhangsai <1021828630@qq.com>
Date:   Tue Apr 18 16:25:03 2023 +0800

    Merge remote-tracking branch 'origin/test' into test

commit a3bc0de08a0c6ef2afdbbf5210619f80d9700b10
Author: joylink_zhangsai <1021828630@qq.com>
Date:   Tue Apr 18 16:24:34 2023 +0800

    处理列车异常显示问题 by fan

commit 1f5d891c55a2b28420affb35be6389badfdea61a
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 14:40:39 2023 +0800

    修改苏电院交控线路顶部菜单展开后没法收回去问题

commit 0d50ac586b4ca3411960ddd04d638e5782ddbf53
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 13:26:39 2023 +0800

    修改弹窗没有高度问题

commit 73c9c0777eccbce97cae036e368b61fca518f0dd
Author: dong <58670809@qq.com>
Date:   Fri Apr 14 16:25:38 2023 +0800

    去掉实训管理查询项缓存
---
 src/jmapNew/painter.js                        |  2 +-
 .../components/menus/dialog/cmdManage.vue     | 11 ++++++----
 .../newMap/display/terminals/dispatchCmd.vue  | 22 ++++++++-----------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/jmapNew/painter.js b/src/jmapNew/painter.js
index 271c5f914..6615d0fb6 100644
--- a/src/jmapNew/painter.js
+++ b/src/jmapNew/painter.js
@@ -155,7 +155,7 @@ class Painter {
             trainDevice.instance && this.mapInstanceLevel[deviceType.Train].remove(trainDevice.instance);
             trainDevice.instance = null;
             trainDevice.zrOptions = this.$jmap.$options;
-            this.add(trainDevice);
+            curModel.sectionModel.instance && this.add(trainDevice);
         });
 
         if (this.screenFlag) {
diff --git a/src/jmapNew/theme/components/menus/dialog/cmdManage.vue b/src/jmapNew/theme/components/menus/dialog/cmdManage.vue
index 8b3e1f03a..7828dd94e 100644
--- a/src/jmapNew/theme/components/menus/dialog/cmdManage.vue
+++ b/src/jmapNew/theme/components/menus/dialog/cmdManage.vue
@@ -38,18 +38,18 @@
                   <span style="margin-left: 10px">{{ getStateInfo(scope.row.rcvCompanies).time || '' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="发令单位">
+              <el-table-column label="发令单位" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <span style="margin-left: 10px">{{ scope.row.sendCompany ? scope.row.sendCompany.name : '' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="sender" label="发令人" />
+              <el-table-column prop="sender" label="发令人" show-overflow-tooltip />
               <el-table-column label="签否">
                 <template slot-scope="scope">
                   <span style="margin-left: 10px">{{ getSignedStatus(getStateInfo(scope.row.rcvCompanies)) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="签收人">
+              <el-table-column label="签收人" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <span style="margin-left: 10px">{{ getSignedBy(scope.row.rcvCompanies) || '' }}</span>
                 </template>
@@ -352,7 +352,10 @@ export default {
         },
         findDisCmdObj(obj, val) {
             return Object.values(obj).find(item => {
-                return item.rcvCompanies[0].id == val;
+                const find = item.rcvCompanies.find(ii => {
+                    return ii.id == val;
+                });
+                return find;
             });
         },
         searchCmd() {
diff --git a/src/views/newMap/display/terminals/dispatchCmd.vue b/src/views/newMap/display/terminals/dispatchCmd.vue
index 3e8d9ae7e..301fea982 100644
--- a/src/views/newMap/display/terminals/dispatchCmd.vue
+++ b/src/views/newMap/display/terminals/dispatchCmd.vue
@@ -1324,20 +1324,16 @@ export default {
             console.log('tabClick');
         },
         selectionChange(selection) {
+            this.command.rcvCompanies = [];
             selection.forEach(item => {
-                const find = this.command.rcvCompanies.find(every => {
-                    return item.code == every.code;
-                });
-                if (!find) {
-                    const obj = {
-                        name: item.name,
-                        rsCompany: true,
-                        cpType: item.cpType,
-                        code: item.code,
-                        ...item
-                    };
-                    this.command.rcvCompanies.push(obj);
-                }
+                const obj = {
+                    name: item.name,
+                    rsCompany: true,
+                    cpType: item.cpType,
+                    code: item.code,
+                    ...item
+                };
+                this.command.rcvCompanies.push(obj);
             });
         },
         getCompanyIdList(sum) {

From a373d21deb5b109337fd74fb2bafe3143a764a2a Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 27 Apr 2023 09:23:21 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BD=92=E5=B1=9E=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/publish/publishMap/project.vue          | 15 ++++++++++-----
 .../system/frontProjectConfigManage/index.vue     |  6 +-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/publish/publishMap/project.vue b/src/views/publish/publishMap/project.vue
index 13ba7b462..3ab59d6b6 100644
--- a/src/views/publish/publishMap/project.vue
+++ b/src/views/publish/publishMap/project.vue
@@ -32,7 +32,7 @@
 
 <script>
 import { setMapProject } from '@/api/jmap/map';
-import { ProjectList } from '@/scripts/ProjectConfig';
+import { getBackProjectConfigList } from '@/api/projectConfig';
 export default {
     name: 'SetMapProject',
     data() {
@@ -54,6 +54,15 @@ export default {
             options: []
         };
     },
+    mounted() {
+        getBackProjectConfigList().then(resp => {
+            if (resp.data && resp.data.length > 0) {
+                this.options = resp.data;
+            }
+        }).catch(error => {
+            console.log(error);
+        });
+    },
     methods: {
         doShow(row) {
             this.dialogVisible = true;
@@ -62,10 +71,6 @@ export default {
             this.formModel.cityCode = row.cityCode;
             this.formModel.project = row.project;
             this.formModel.projectCode = row.project ? row.projectCode : '';
-            this.options = [];
-            ProjectList.forEach(item => {
-                this.options.push({label: item.label, value: item.value.toUpperCase()});
-            });
         },
         doSave() {
             this.$refs['form'].validate((valid) => {
diff --git a/src/views/system/frontProjectConfigManage/index.vue b/src/views/system/frontProjectConfigManage/index.vue
index f47c91c05..e6aa2881b 100644
--- a/src/views/system/frontProjectConfigManage/index.vue
+++ b/src/views/system/frontProjectConfigManage/index.vue
@@ -90,11 +90,7 @@ export default {
         getBackProjectConfigList().then(resp => {
             if (resp.data && resp.data.length > 0) {
                 resp.data.forEach(each=>{
-                    if (each.label == '') {
-                        this.projectMap[each.value] = {label:'默认', value:'DEFAULT'};
-                    } else {
-                        this.projectMap[each.value] = each;
-                    }
+                    this.projectMap[each.value] = each;
                 });
                 this.queryForm.queryObject.project.config.data = Object.values(this.projectMap);
             }

From 210a7d0fdd077a1f3d47f2b3dcc071414cc0039a Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 27 Apr 2023 13:21:50 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/thirdLogin/index.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/thirdLogin/index.vue b/src/views/thirdLogin/index.vue
index 9cd76ee83..397d7b518 100644
--- a/src/views/thirdLogin/index.vue
+++ b/src/views/thirdLogin/index.vue
@@ -9,9 +9,9 @@
 import { LoginParams } from '@/utils/login';
 import { thirdCountLogin } from '@/api/management/user';
 import md5 from 'js-md5';
-import { setToken, getToken, getSessionStorage } from '@/utils/auth';
+import { setToken, getToken } from '@/utils/auth';
 //  , ProjectLoginStyleList, VersionBaseNoShow, MainBodyNoShow, NoQrcodeList, localPackageProject, RegisterCodeList
-import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig';
+// import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig';
 
 export default {
     name:'ThirdLogin',
@@ -26,12 +26,12 @@ export default {
             return project || 'login';
         }
     },
-    created() {
-        const project = getSessionStorage('project');
-        if (project) {
-            document.querySelector("link[rel*='icon']").href = loginInfo[project].linkIcon || ProjectIcon[project];
-        }
-    },
+    // created() {
+    //     const project = getSessionStorage('project');
+    //     if (project) {
+    //         document.querySelector("link[rel*='icon']").href = loginInfo[project].linkIcon || ProjectIcon[project];
+    //     }
+    // },
     mounted() {
         const userId = this.$route.query.userId;
         const paccount = this.$route.query.paccount;
@@ -42,7 +42,7 @@ export default {
         if (userId && paccount && secret == computeSecret) {
             const model = Object.assign({
                 parentAccount:paccount,
-                project:loginInfo[this.project].loginParam,
+                project: this.$store.state.projectConfig.projectCode,
                 account:userId,
                 deviceCode:deviceCode
             }, LoginParams.LianKeTang);

From e3532895941a27c0e8048fdc3b662a614829865d Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 5 May 2023 09:32:34 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/thirdLogin/index.vue | 42 ++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/views/thirdLogin/index.vue b/src/views/thirdLogin/index.vue
index 397d7b518..e6343cea4 100644
--- a/src/views/thirdLogin/index.vue
+++ b/src/views/thirdLogin/index.vue
@@ -3,18 +3,24 @@
     <div class="thirdLoginMessage">
       {{ message }}
     </div>
+    <org-select ref="orgSelect" @select="selectOrg" />
   </div>
 </template>
 <script>
 import { LoginParams } from '@/utils/login';
+import { getOrgList, selectOrgnization } from '@/api/login';
 import { thirdCountLogin } from '@/api/management/user';
 import md5 from 'js-md5';
 import { setToken, getToken } from '@/utils/auth';
+import OrgSelect from '../login/orgSelect';
 //  , ProjectLoginStyleList, VersionBaseNoShow, MainBodyNoShow, NoQrcodeList, localPackageProject, RegisterCodeList
 // import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig';
 
 export default {
     name:'ThirdLogin',
+    components: {
+        OrgSelect
+    },
     data() {
         return {
             message:''
@@ -52,7 +58,8 @@ export default {
                 const header = { group: '', 'X-Token': tokenKey };
                 this.$store.dispatch('setToken', tokenKey);
                 this.$store.dispatch('subscribe', {header, type:'class'});
-                this.$router.replace({path:'/trainingPlatform'});
+                // this.$router.replace({path:'/trainingPlatform'});
+                this.checkOrgnizationInfo();
             } else {
                 thirdCountLogin(model).then(resp=> {
                     const token = resp.data;
@@ -60,8 +67,7 @@ export default {
                     setToken(token);
                     this.$store.dispatch('setToken', token);
                     this.$store.dispatch('subscribe', {header, type:'class'});
-                    this.$router.replace({path:'/trainingPlatform'});
-                    // setSessionStorage('thirdLogin', true);
+                    this.checkOrgnizationInfo();
                 }).catch(() => {
                     this.message = '参数有误，请检查';
                 });
@@ -72,7 +78,35 @@ export default {
         }
     },
     methods:{
-
+        selectOrg(orgId) {
+            selectOrgnization(orgId).then(() => { // 先登入组织，再跳转路由（跳转路由会获取用户信息，可能拿不到组织信息）
+                this.$router.replace({path:'/trainingPlatform'});
+            }).catch(err => {
+                this.$message.error(`登入组织失败！，${err.message}`);
+            });
+        },
+        checkOrgnizationInfo() {
+            getOrgList().then(resp => {
+                const orgList = resp.data;
+                let orgId = '';
+                if (orgList.length < 2) {
+                    if (orgList.length === 1) {
+                        orgId = orgList[0].orgId;
+                        selectOrgnization(orgId).then(() => { // 先登入组织，再跳转路由（跳转路由会获取用户信息，可能拿不到组织信息）
+                            this.$router.replace({path:'/trainingPlatform'});
+                        }).catch(err => {
+                            this.$message.error(`登入组织失败！，${err.message}`);
+                        });
+                    } else {
+                        this.$router.replace({path:'/trainingPlatform'});
+                    }
+                } else {
+                    this.$refs.orgSelect.doShow(orgList);
+                }
+            }).catch((error)=>{
+                this.$message.error(error.message);
+            });
+        }
     }
 };
 </script>