From 405158b2e36be97e4bb5b16ed9f09cb4b89cb322 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 30 Jun 2020 14:39:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=90=E9=83=BD=E4=B8=89?= =?UTF-8?q?=E5=8F=B7=E7=BA=BF=E7=8E=B0=E5=9C=B0=E6=93=8D=E4=BD=9C=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/chengdu_03/menus/menuButton.vue | 1 - .../theme/chengdu_03/operationConfig.js | 49 +++++++++++-------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue index 9f872de43..837803b85 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue @@ -275,7 +275,6 @@ export default { this.deviceList = []; if (operation != this.Command.cancel.clearMbm.operation) { const operate = { - type: 'mbm', operation: operation }; const operationList = [this.Signal.humanTrainRoute.button.operation, this.Section.fault.button.operation, this.Switch.unlock.button.operation, this.MixinCommand.unblock.button.operation, this.Station.guideLock.button.operation]; diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js index 3a7d9443e..9db1afe3e 100644 --- a/src/jmapNew/theme/chengdu_03/operationConfig.js +++ b/src/jmapNew/theme/chengdu_03/operationConfig.js @@ -1,3 +1,13 @@ +// SECTION 区段 +// SWITCH 道岔 +// SIGNAL 信号机 +// START_SIGNAL 进路起始信号机 +// END_SIGNAL 进路终端信号机 + +// STATION 车站 +// STAND 站台 +// ROUTE 进路 +// CYCLE 自动折返 import CMD from '@/scripts/cmdPlugin/CommandEnum'; export default { list: [ @@ -29,8 +39,8 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' }, - { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }, - { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', val: '{4}' } + { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL' }, + { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' } ] }, { @@ -60,9 +70,9 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3080', tip: '鼠标左键点击【引导进路】' }, - { deviceType: '04', orderNum: 2, operateCode: '3080', tip: '鼠标左键点击【{5}】'}, // 进路编号值不正确 - { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }, - { deviceType: '04', orderNum: 4, operateCode: '3080', tip: '鼠标左键点击【{5}】', val: '{4}' } + { deviceType: '04', orderNum: 2, operateCode: '3080', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL'}, // 进路编号值不正确 + { deviceType: '04', orderNum: 3, operateCode: '3080', tip: '输入密码123，点击【确定】按钮' }, + { deviceType: '04', orderNum: 4, operateCode: '3080', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' } ] }, { @@ -90,8 +100,8 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3030', tip: '鼠标左键点击【总取消】' }, - { deviceType: '04', orderNum: 2, operateCode: '3051', tip: '输入密码123，点击【确定】按钮' }, - { deviceType: '04', orderNum: 3, operateCode: '3030', tip: '鼠标左键点击【{5}】按钮', val: '{6}' } + { deviceType: '04', orderNum: 2, operateCode: '3030', tip: '输入密码123，点击【确定】按钮' }, + { deviceType: '04', orderNum: 3, operateCode: '3030', tip: '鼠标左键点击【{5}】按钮', codeType:'SIGNAL' } ] }, { // 不生成实训 @@ -207,8 +217,8 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' }, - { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' }, - { deviceType: '04', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{5}】', val: '{6}' } + { deviceType: '04', orderNum: 2, operateCode: '2992', tip: '输入密码123，点击【确认】按钮' }, + { deviceType: '04', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' } ] }, { @@ -309,7 +319,7 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键菜单选择【道岔定操】' }, - { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】', val: '{17}' } + { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' } ] }, { @@ -337,7 +347,7 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键菜单选择【道岔反操】' }, - { deviceType: '02', orderNum: 2, operateCode: '1020', tip: '鼠标左键点击【{7}】按钮', val: '{17}' } + { deviceType: '02', orderNum: 2, operateCode: '1020', tip: '鼠标左键点击【{7}】按钮', codeType:'SWITCH' } ] }, { @@ -365,7 +375,7 @@ export default { productTypes: ['01'], // 现地操作 stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键菜单选择【道岔单锁】' }, - { deviceType: '02', orderNum: 2, operateCode: '1030', tip: '鼠标左键点击【{{7}}】', val: '{17}' } + { deviceType: '02', orderNum: 2, operateCode: '1030', tip: '鼠标左键点击【{{7}}】', codeType:'SWITCH' } ] }, { @@ -393,8 +403,8 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键菜单选择【道岔解锁】' }, - { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' }, - { deviceType: '02', orderNum: 3, operateCode: '1040', tip: '鼠标左键点击【{7}】按钮', val: '{17}' } + { deviceType: '02', orderNum: 2, operateCode: '1040', tip: '输入密码123，点击【确认】按钮' }, + { deviceType: '02', orderNum: 3, operateCode: '1040', tip: '鼠标左键点击【{7}】按钮', codeType:'SWITCH' } ] }, { @@ -423,7 +433,7 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '2991', tip: '鼠标左键菜单选择【封锁】' }, - { deviceType: '02', orderNum: 2, operateCode: '2991', tip: '鼠标左键点击【{7}】按钮', val: '{17}' } + { deviceType: '02', orderNum: 2, operateCode: '2991', tip: '鼠标左键点击【{7}】按钮', codeType:'SWITCH' } ] }, { @@ -452,8 +462,8 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' }, - { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' }, - { deviceType: '02', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{7}】按钮', val: '{17}' } + { deviceType: '02', orderNum: 2, operateCode: '2992', tip: '输入密码123，点击【确认】按钮' }, + { deviceType: '02', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{7}】按钮', codeType:'SWITCH' } ] }, { @@ -498,9 +508,8 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '4020', tip: '鼠标右键菜单选择【区故解】' }, - { deviceType: '03', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确认】按钮' }, - { deviceType: '03', orderNum: 3, operateCode: '4020', tip: '鼠标左键点击【{9}】', val: '{18}' }, - { deviceType: '03', orderNum: 4, operateCode: '00012', tip: '鼠标左键点击【清除】' } + { deviceType: '03', orderNum: 2, operateCode: '4020', tip: '输入密码123，点击【确认】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '4020', tip: '鼠标左键点击【{9}】', codeType:'SECTION' } ] }, { // 未生成实训