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] 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 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 @@ -