From 2f2316e353aeeee32a775dd68ec210245efcdfe2 Mon Sep 17 00:00:00 2001 From: lVAL Date: Thu, 21 Jan 2021 16:38:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A5=BF=E5=AE=892=E5=8C=BA?= =?UTF-8?q?=E6=95=85=E8=A7=A3=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/xian_02/menus/menuSection.vue | 6 ++--- src/jmapNew/theme/xian_02/operationConfig.js | 22 +++---------------- src/scripts/cmdPlugin/MenuContextHandler.js | 22 +++++++++++++++++++ 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue index f7b9d9f60..c5144f563 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSection.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue @@ -22,7 +22,7 @@ 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 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'; @@ -181,9 +181,9 @@ export default { }, initMenu() { // 编辑模式菜单列表 - // this.menu = MenuContextHandler.covert(this.menuNormal); if (this.selected.type != '04') { - this.menu = this.menuNormal.Center; + // this.menu = this.menuNormal.Center; + this.menu = MenuContextHandler.covert2(this.menuNormal); } else { this.menu = []; } diff --git a/src/jmapNew/theme/xian_02/operationConfig.js b/src/jmapNew/theme/xian_02/operationConfig.js index 8b0c6f0fb..0e543e4fa 100644 --- a/src/jmapNew/theme/xian_02/operationConfig.js +++ b/src/jmapNew/theme/xian_02/operationConfig.js @@ -32,20 +32,6 @@ export default { { deviceType: '06', orderNum: 4, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' } ] }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: 'Stand_Early_Depart', - // skinCode: '09', - // trainingName: '提前发车({10}-{12}站台)', - // trainingRemark: '提前发车功能', - // trainingType: 'Stand', - // productTypes: ['01', '02'], - // stepVOList: [ - // { deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【提前发车】' }, - // { deviceType: '06', orderNum: 2, operateCode: '501', tip: '鼠标左键点击【确定】按钮' } - // ] - // }, { maxDuration: 15, minDuration: 8, @@ -151,11 +137,9 @@ export default { trainingType: 'Section', productTypes: ['01'], stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' }, - { deviceType: '03', orderNum: 2, operateCode: '4024', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '03', orderNum: 3, operateCode: '4028', tip: '鼠标左键选择({8}{9})区段', val: '{19}' }, - { deviceType: '03', orderNum: 4, operateCode: '4025', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '03', orderNum: 5, operateCode: '4023', tip: '鼠标左键点击【关闭】按钮' } + { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' }, + { deviceType: '03', orderNum: 2, operateCode: '4042', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' } ] }, // { diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js index a198d2630..4d48ba018 100644 --- a/src/scripts/cmdPlugin/MenuContextHandler.js +++ b/src/scripts/cmdPlugin/MenuContextHandler.js @@ -60,6 +60,28 @@ class MenuContextHandler { return result; } + covert2(menuList) { + const selected = this.getCurrentStateObject(); + let menu = []; + const control = this.getStationControl(selected); + if (control && !store.state.scriptRecord.audioPlay) { + if (this.getPrdType() != '' && this.getPrdType() != null) { + const type = State2SimulationMap[this.getPrdType()]; + const status = State2ControlMap[control.controlMode]; // 判断当前模式 + if (type) { + menu = [...menuList[type]]; + } + // 特殊处理站台的右键操作( 因为小站台不允许有操作 ) + if (selected._type == 'StationStand') { + if (selected.small) { + menu = []; + } + } + } + } + return menu; + } + covert(menuList) { const selected = this.getCurrentStateObject(); let menu = [];