From be187cf1b31c8e91bc94106bee94ea3aba292cbe Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 13 Apr 2020 17:57:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=20=20=E6=93=8D=E4=BD=9C=E5=AE=9A=E4=B9=89=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/beijing_01/operationConfig.js | 274 +++++++----------- .../menus/dialog/standDetainTrainAll.vue | 4 +- 2 files changed, 100 insertions(+), 178 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/operationConfig.js b/src/jmapNew/theme/beijing_01/operationConfig.js index 5a447b357..2b3631bdd 100644 --- a/src/jmapNew/theme/beijing_01/operationConfig.js +++ b/src/jmapNew/theme/beijing_01/operationConfig.js @@ -4,13 +4,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0501', - // operateType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN, + operateType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN.value, skinCode: '03', trainingName: '设置扣车({10}-{12} 站台)', trainingRemark: '设置扣车功能', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【设置扣车】'}, @@ -20,13 +18,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0501', - // operateType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN, + operateType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN.value, skinCode: '03', trainingName: '设置扣车({10}-{12} 站台)', trainingRemark: '设置扣车功能', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['01'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】'}, @@ -36,13 +32,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0502', - // operateType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN, + operateType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN.value, skinCode: '03', trainingName: '取消扣车({10}-{12} 站台)', trainingRemark: '取消扣车功能', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】'}, @@ -52,13 +46,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0502', - // operateType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN, + operateType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN.value, skinCode: '03', trainingName: '取消扣车({10}-{12} 站台)', trainingRemark: '取消扣车功能', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['01'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' }, @@ -68,13 +60,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0505', - // operateType:CMD.Stand.CMD_STAND_SET_JUMP_STOP, + operateType:CMD.Stand.CMD_STAND_SET_JUMP_STOP.value, skinCode: '03', trainingName: '设置跳停({10}-{12} 站台)', trainingRemark: '设置跳停功能', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【设置跳停】' }, @@ -84,13 +74,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0505', - // operateType:CMD.Stand.CMD_STAND_SET_JUMP_STOP, + operateType:CMD.Stand.CMD_STAND_SET_JUMP_STOP.value, skinCode: '03', trainingName: '设置跳停({10}-{12} 站台)', trainingRemark: '设置指定001号列车跳停功能', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【设置跳停】' }, @@ -102,13 +90,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0506', - // operateType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP, + operateType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP.value, skinCode: '03', trainingName: '取消跳停({10}-{12} 站台)', trainingRemark: '取消跳停功能', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' }, @@ -118,13 +104,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0506', - // operateType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP, + operateType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP.value, skinCode: '03', trainingName: '取消跳停({10}-{12} 站台)', trainingRemark: '取消指定001号列车跳停功能', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' }, @@ -136,13 +120,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0507', - // operateType:CMD.Stand.CMD_STAND_VIEW_STATUS, + operateType:CMD.Stand.CMD_STAND_VIEW_STATUS.value, skinCode: '03', trainingName: '查询站台状态({10}-{12} 站台)', trainingRemark: '查询站台状态功能', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【站台信息】' }, @@ -152,13 +134,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0508', - // operateType:CMD.Stand.CMD_STAND_SET_PARK_TIME, + operateType:CMD.Stand.CMD_STAND_SET_PARK_TIME.value, skinCode: '03', trainingName: '停站时间控制({10}-{12} 站台)', trainingRemark: '停站时间控制(自动, 一直有效)', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【停站时间控制】' }, @@ -169,13 +149,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0508', - // operateType:CMD.Stand.CMD_STAND_SET_PARK_TIME, + operateType:CMD.Stand.CMD_STAND_SET_PARK_TIME.value, skinCode: '03', trainingName: '停站时间控制({10}-{12} 站台)', trainingRemark: '停站时间控制(人工, 20秒, 一直有效)', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【停站时间控制】' }, @@ -187,13 +165,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0508', - // operateType:CMD.Stand.CMD_STAND_SET_PARK_TIME, + operateType:CMD.Stand.CMD_STAND_SET_PARK_TIME.value, skinCode: '03', trainingName: '停站时间控制({10}-{12} 站台)', trainingRemark: '停站时间控制(人工, 20秒, 一次有效)', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【停站时间控制】' }, @@ -206,13 +182,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0509', - // operateType:CMD.Stand.CMD_STAND_SET_RUN_TIME, + operateType:CMD.Stand.CMD_STAND_SET_RUN_TIME.value, skinCode: '03', trainingName: '运行时间控制({10}-{12} 站台)', trainingRemark: '运行时间控制(设置区间 运行等级1，运行时间为115，一直有效)', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【运行时间控制】' }, @@ -224,13 +198,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0509', - // operateType:CMD.Stand.CMD_STAND_SET_RUN_TIME, + operateType:CMD.Stand.CMD_STAND_SET_RUN_TIME.value, skinCode: '03', trainingName: '运行时间控制({10}-{12} 站台)', trainingRemark: '运行时间控制(设置区间 运行等级1，运行时间为115，一次有效)', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【运行时间控制】' }, @@ -243,13 +215,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0510', - // operateType:CMD.Stand.CMD_STAND_EARLY_DEPART, + operateType:CMD.Stand.CMD_STAND_EARLY_DEPART.value, skinCode: '03', trainingName: '提前发车({10}-{12} 站台)', trainingRemark: '提前发车功能', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【提前发车】' }, @@ -259,13 +229,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0511', - // operateType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, + operateType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY.value, skinCode: '03', trainingName: '变通策略管理({10}-{12} 站台)', trainingRemark: '变通策略管理功能', - trainingType: '05', - // trainingType:'Stand', + trainingType:'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '511', tip: '鼠标右键菜单选择【变通策略管理】' }, @@ -276,13 +244,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0402', - // operateType:CMD.Section.CMD_SECTION_CUT_OFF, + operateType:CMD.Section.CMD_SECTION_CUT_OFF.value, skinCode: '03', trainingName: '轨道切除({8}{9} 区段)', trainingRemark: '轨道切除功能', - trainingType: '04', - // trainingType:'Section', + trainingType:'Section', productTypes: ['02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【轨道切除】' }, @@ -292,13 +258,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0403', - // operateType:CMD.Section.CMD_SECTION_ACTIVE, + operateType:CMD.Section.CMD_SECTION_ACTIVE.value, skinCode: '03', trainingName: '轨道激活({8}{9} 区段)', trainingRemark: '轨道激活功能', - trainingType: '04', - // trainingType:'Section', + trainingType:'Section', productTypes: ['02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【轨道激活】' }, @@ -308,13 +272,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0407', - // operateType:CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, + operateType:CMD.Section.CMD_SECTION_SET_LIMIT_SPEED.value, skinCode: '03', trainingName: '设置临时限速({8}{9} 区段)', trainingRemark: '设置临时限速功能（限速值：15）', - trainingType: '04', - // trainingType:'Section', + trainingType:'Section', productTypes: ['02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' }, @@ -330,13 +292,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0308', - // operateType:CMD.Switch.CMD_SWITCH_CUT_OFF, + operateType:CMD.Switch.CMD_SWITCH_CUT_OFF.value, skinCode: '03', trainingName: '轨道切除({7} 道岔)', trainingRemark: '轨道切除功能', - trainingType: '03', - // trainingType:'Switch', + trainingType:'Switch', productTypes: ['02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【轨道切除】' }, @@ -346,13 +306,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0309', - // operateType:CMD.Switch.CMD_SWITCH_ACTIVE, + operateType:CMD.Switch.CMD_SWITCH_ACTIVE.value, skinCode: '03', trainingName: '轨道激活({7} 道岔)', trainingRemark: '轨道激活功能', - trainingType: '03', - // trainingType:'Switch', + trainingType:'Switch', productTypes: ['02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【轨道激活】' }, @@ -362,13 +320,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0310', - // operateType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, + operateType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED.value, skinCode: '03', trainingName: '设置临时限速({7} 道岔)', trainingRemark: '设置临时限速功能（限速值 35 ）', - trainingType: '03', - // trainingType:'Switch', + trainingType:'Switch', productTypes: ['02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' }, @@ -383,13 +339,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0313', - // operateType:CMD.Switch.CMD_SWITCH_REVERSE_POSITION, + operateType:CMD.Switch.CMD_SWITCH_REVERSE_POSITION.value, skinCode: '03', trainingName: '道岔总反({7} 道岔)', trainingRemark: '道岔反位功能', - trainingType: '03', - // trainingType:'Switch', + trainingType:'Switch', productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键点击【道岔总反】' }, @@ -399,13 +353,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0312', - // operateType:CMD.Switch.CMD_SWITCH_NORMAL_POSITION, + operateType:CMD.Switch.CMD_SWITCH_NORMAL_POSITION.value, skinCode: '03', trainingName: '道岔总定({7} 道岔)', trainingRemark: '道岔定位功能', - trainingType: '03', - // trainingType:'Switch', + trainingType:'Switch', productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键点击【道岔总定】' }, @@ -415,13 +367,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0301', - // operateType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK, + operateType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK.value, skinCode: '03', trainingName: '道岔单锁({7} 道岔)', trainingRemark: '道岔单锁功能', - trainingType: '03', - // trainingType:'Switch', + trainingType:'Switch', productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键点击【道岔单锁】' }, @@ -431,13 +381,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0302', - // operateType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK, + operateType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK.value, skinCode: '03', trainingName: '道岔解锁({7} 道岔)', trainingRemark: '道岔单解功能', - trainingType: '03', - // trainingType:'Switch', + trainingType:'Switch', productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键点击【道岔解锁】' }, @@ -448,13 +396,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0201', - // operateType:CMD.Signal.CMD_SIGNAL_SET_ROUTE, + operateType:CMD.Signal.CMD_SIGNAL_SET_ROUTE.value, skinCode: '03', trainingName: '排列进路({3} 进路)', trainingRemark: '排列进路功能', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【排列进路】' }, @@ -465,13 +411,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0202', - // operateType:CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, + operateType:CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE.value, skinCode: '03', trainingName: '取消进路({3} 进路)', trainingRemark: '取消进路功能', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消进路】' }, @@ -481,13 +425,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0210', - // operateType:CMD.Signal.CMD_SIGNAL_DETAIL, + operateType:CMD.Signal.CMD_SIGNAL_DETAIL.value, skinCode: '03', trainingName: '查询进路控制状态({5} 信号机)', trainingRemark: '查询进路控制状态功能', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制状态】' }, @@ -497,13 +439,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0208', - // operateType:CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING, + operateType:CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING.value, skinCode: '03', trainingName: '进路交自动控({5} 信号机)', trainingRemark: '进路交自动控功能', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' }, @@ -514,13 +454,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0209', - // operateType:CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING, + operateType:CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING.value, skinCode: '03', trainingName: '进路交人工控({5} 信号机)', trainingRemark: '进路交人工控功能', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路交人工控】' }, @@ -531,13 +469,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0206', - // operateType:CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, + operateType:CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL.value, skinCode: '03', trainingName: '信号重开({3} 进路)', trainingRemark: '信号重开功能', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' }, @@ -547,13 +483,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0206', - // operateType:CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, + operateType:CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL.value, skinCode: '03', trainingName: '信号重开({3} 进路)', trainingRemark: '信号重开功能', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3040', tip: '鼠标左键点击【信号重开】' }, @@ -563,13 +497,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0211', - // operateType:CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, + operateType:CMD.Signal.CMD_SIGNAL_SET_CI_AUTO.value, skinCode: '03', trainingName: '设置自动进路({3} 进路)', trainingRemark: '设置自动进路功能', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3090', tip: '鼠标左键点击【自动进路】' }, @@ -579,13 +511,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0212', - // operateType:CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, + operateType:CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO.value, skinCode: '03', trainingName: '取消自动进路({3} 进路)', trainingRemark: '取消自动进路功能', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3090', tip: '鼠标左键点击【自动进路】' }, @@ -595,13 +525,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0215', - // operateType:CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE, + operateType:CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE.value, skinCode: '03', trainingName: '总人解({3} 进路)', trainingRemark: '人解进路(总人解)', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' }, @@ -611,13 +539,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0205', - // operateType:CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, + operateType:CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL.value, skinCode: '03', trainingName: '关闭信号({5} )', trainingRemark: '关闭信号', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' }, @@ -627,13 +553,11 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0205', - // operateType:CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, + operateType:CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE.value, skinCode: '03', trainingName: '取消进路({5} )', trainingRemark: '取消进路', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' }, @@ -643,42 +567,40 @@ export default { { maxDuration: 8, minDuration: 5, - operateType: '0201', - // operateType:CMD.Signal.CMD_SIGNAL_SET_ROUTE, + operateType:CMD.Signal.CMD_SIGNAL_SET_ROUTE.value, skinCode: '03', trainingName: '进路建立({3})', trainingRemark: '进路建立', - trainingType: '02', - // trainingType:'Signal', + trainingType:'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' }, { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【始端信号机】', codeType:'SIGNAL'}, { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【终端信号机】', codeType:'SIGNAL'} ] - }, + } // 自动折返 (暂时没有) // 取消自动折返 (暂时没有) // 引导信号 (暂时没有) // 取消引导信号 (暂时没有) - { - // 暂时没有 - maxDuration: 15, - minDuration: 8, - operateType: '0801', - skinCode: '03', - trainingName: '全线取消临时限速', - trainingRemark: '全线取消临时限速功能', - trainingType: '08', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '10', orderNum: 1, operateCode: '800', tip: '鼠标右键菜单选择【取消全线临时限速】' }, - { deviceType: '10', orderNum: 2, operateCode: '8001', tip: '鼠标左键点击【打开会话】按钮' }, - { deviceType: '10', orderNum: 3, operateCode: '8003', tip: '鼠标左键点击【确认】按钮' }, - { deviceType: '10', orderNum: 4, operateCode: '8004', tip: '鼠标左键点击【确认】按钮' }, - { deviceType: '10', orderNum: 5, operateCode: '8005', tip: '鼠标左键点击【关闭】按钮' }, - { deviceType: '10', orderNum: 6, operateCode: '8006', tip: '鼠标左键点击【确定】按钮' } - ] - } + // { + // // 暂时没有 + // maxDuration: 15, + // minDuration: 8, + // operateType: '0801', + // skinCode: '03', + // trainingName: '全线取消临时限速', + // trainingRemark: '全线取消临时限速功能', + // trainingType: '08', + // productTypes: ['01', '02'], + // stepVOList: [ + // { deviceType: '10', orderNum: 1, operateCode: '800', tip: '鼠标右键菜单选择【取消全线临时限速】' }, + // { deviceType: '10', orderNum: 2, operateCode: '8001', tip: '鼠标左键点击【打开会话】按钮' }, + // { deviceType: '10', orderNum: 3, operateCode: '8003', tip: '鼠标左键点击【确认】按钮' }, + // { deviceType: '10', orderNum: 4, operateCode: '8004', tip: '鼠标左键点击【确认】按钮' }, + // { deviceType: '10', orderNum: 5, operateCode: '8005', tip: '鼠标左键点击【关闭】按钮' }, + // { deviceType: '10', orderNum: 6, operateCode: '8006', tip: '鼠标左键点击【确定】按钮' } + // ] + // } ] }; diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/foshan_01/menus/dialog/standDetainTrainAll.vue index cb9e2895f..a96461b34 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/standDetainTrainAll.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/standDetainTrainAll.vue @@ -83,8 +83,8 @@ export default { return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrainAll.menu.domId : ''; }, title() { - // if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.menu.operation) { - if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.mbar.operation) { + if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.menu.operation) { + // if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.mbar.operation) { return '全线取消扣车'; } else { return '全线取消跳停'; From b7e6b9a8c16af653ddc39f97e5fbb2a32119f223 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 13 Apr 2020 18:30:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BD=9B=E5=B1=B1=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E5=9B=BE=E5=AF=BC=E5=85=A5=E4=B8=8A=E8=A1=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=B0=83=E6=95=B4&=E8=A5=BF=E5=AE=89=E4=BA=8C=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E8=BD=A6=E7=AB=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/xian_02.js | 24 +++++ src/jmapNew/shape/Station/EDeviceStatus.js | 95 +++++++++++++++++++ src/jmapNew/shape/Station/index.js | 81 +++++++++------- src/jmapNew/theme/foshan_01/planConvert.js | 4 +- .../newMap/newMapdraft/mapoperate/station.vue | 36 +++++-- 5 files changed, 196 insertions(+), 44 deletions(-) create mode 100644 src/jmapNew/shape/Station/EDeviceStatus.js diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js index b0f28c23b..bf4330bbb 100644 --- a/src/jmapNew/config/skinCode/xian_02.js +++ b/src/jmapNew/config/skinCode/xian_02.js @@ -410,6 +410,30 @@ class SkinCode extends defaultStyle { invalidColor: '#FF0000' // 验证旁路检查（无检验起效） } }, + deviceStatus: { + fontSize: 12, // 字体大小 + distance: 30, // 模式间距 + psd: { + text: 'PSD', + defaultColor: '#FFF' + }, + mfa: { + text: 'MFA', + defaultColor: '#FFF' + }, + mfb: { + text: 'MFB', + defaultColor: '#FFF' + }, + pfa: { + text: 'PFA', + defaultColor: '#FFF' + }, + pfb: { + text: 'PFB', + defaultColor: '#FFF' + } + }, StationControl:{ text: { distance: 2, // 灯和文字之间的距离 diff --git a/src/jmapNew/shape/Station/EDeviceStatus.js b/src/jmapNew/shape/Station/EDeviceStatus.js new file mode 100644 index 000000000..17927e4bf --- /dev/null +++ b/src/jmapNew/shape/Station/EDeviceStatus.js @@ -0,0 +1,95 @@ +import Group from 'zrender/src/container/Group'; +import Text from 'zrender/src/graphic/Text'; + +export default class EDeviceStatus extends Group { + constructor(model) { + super(); + this.model = model; + this.zlevel = model.zlevel; + this._subType = model._subType; + this.z = model.z; + this.create(model); + } + create(model) { + this.psd = new Text({ + zlevel: this.zlevel, + z: this.z, + style: { + x: model.x, + y: model.y, + fontWeight: model.style.textStyle.fontWeight, + fontSize: model.style.Station.deviceStatus.fontSize, + fontFamily: model.style.fontFamily, + text: model.style.Station.deviceStatus.psd.text, + textFill: model.style.Station.deviceStatus.psd.defaultColor, + textAlign: model.style.textStyle.textAlign, + textVerticalAlign: model.style.textStyle.textVerticalAlign + } + }); + this.mfa = new Text({ + zlevel: this.zlevel, + z: this.z, + style: { + x: model.x + model.style.Station.deviceStatus.distance, + y: model.y, + fontWeight: model.style.textStyle.fontWeight, + fontSize: model.style.Station.deviceStatus.fontSize, + fontFamily: model.style.fontFamily, + text: model.style.Station.deviceStatus.mfa.text, + textFill: model.style.Station.deviceStatus.mfa.defaultColor, + textAlign: model.style.textStyle.textAlign, + textVerticalAlign: model.style.textStyle.textVerticalAlign + } + }); + this.mfb = new Text({ + zlevel: this.zlevel, + z: this.z, + style: { + x: model.x + model.style.Station.deviceStatus.distance * 2, + y: model.y, + fontWeight: model.style.textStyle.fontWeight, + fontSize: model.style.Station.deviceStatus.fontSize, + fontFamily: model.style.fontFamily, + text: model.style.Station.deviceStatus.mfb.text, + textFill: model.style.Station.deviceStatus.mfb.defaultColor, + textAlign: model.style.textStyle.textAlign, + textVerticalAlign: model.style.textStyle.textVerticalAlign + } + }); + this.pfa = new Text({ + zlevel: this.zlevel, + z: this.z, + style: { + x: model.x + model.style.Station.deviceStatus.distance * 3, + y: model.y, + fontWeight: model.style.textStyle.fontWeight, + fontSize: model.style.Station.deviceStatus.fontSize, + fontFamily: model.style.fontFamily, + text: model.style.Station.deviceStatus.pfa.text, + textFill: model.style.Station.deviceStatus.pfa.defaultColor, + textAlign: model.style.textStyle.textAlign, + textVerticalAlign: model.style.textStyle.textVerticalAlign + } + }); + this.pfb = new Text({ + zlevel: this.zlevel, + z: this.z, + style: { + x: model.x + model.style.Station.deviceStatus.distance * 4, + y: model.y, + fontWeight: model.style.textStyle.fontWeight, + fontSize: model.style.Station.deviceStatus.fontSize, + fontFamily: model.style.fontFamily, + text: model.style.Station.deviceStatus.pfb.text, + textFill: model.style.Station.deviceStatus.pfb.defaultColor, + textAlign: model.style.textStyle.textAlign, + textVerticalAlign: model.style.textStyle.textVerticalAlign + } + }); + this.add(this.psd); + this.add(this.mfa); + this.add(this.mfb); + this.add(this.pfa); + this.add(this.pfb); + } +} diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js index 5352b18c9..b5a9dff8c 100644 --- a/src/jmapNew/shape/Station/index.js +++ b/src/jmapNew/shape/Station/index.js @@ -16,6 +16,7 @@ import EControlSwitch from './EControlSwitch'; import EAxle from './EAxle'; // import {isShowThePrdType} from '../../utils/handlePath'; import EFoldbackMode from './EFoldbackMode'; +import EDeviceStatus from './EDeviceStatus'; import Text from 'zrender/src/graphic/Text'; export default class Station extends Group { @@ -31,6 +32,7 @@ export default class Station extends Group { this.create(); this.createTurnBack(); // 创建按图折返 this.createControlMode(); + this.createTextControlMode(); this.setState(model); this.checkIsDrawMap(); } @@ -117,6 +119,16 @@ export default class Station extends Group { }); this.add(this.axle); } + if (style.Station.deviceStatus && model.showDeviceStatus) { + this.deviceStatus = new EDeviceStatus({ + zlevel: this.zlevel, + z: this.z, + x: model.deviceStatusPosition.x, + y: model.deviceStatusPosition.y, + style: style + }); + this.add(this.deviceStatus); + } const path = window.location.href; if (style.Station.kmPostShow || path.includes('/map/draw')) { // 公里标是否显示 @@ -208,65 +220,66 @@ export default class Station extends Group { // 创建文字控制模式组（西安二号线-（进路模式， 车站控制模式， 车站通信状态， 验证旁路）） createTextControlMode() { const model = this.model; - if (model.visible && model.textControlMode) { + const style = this.style; + if (model.visible && model.textControlMode && style.Station.controlMode) { this.routeMode = new Text({ zlevel: this.zlevel, z: this.z, style: { x: model.textControlModePosition.x, y: model.textControlModePosition.y, - fontWeight: model.style.textStyle.fontWeight, - fontSize: model.style.Station.textControlMode.fontSize, - fontFamily: model.style.fontFamily, - text: model.style.Station.textControlMode.routeMode.defaultText, - textFill: model.style.Station.textControlMode.routeMode.defaultColor, - textAlign: model.style.textStyle.textAlign, - textVerticalAlign: model.style.textStyle.textVerticalAlign + fontWeight: style.textStyle.fontWeight, + fontSize: style.Station.controlMode.fontSize, + fontFamily: style.fontFamily, + text: style.Station.controlMode.routeMode.defaultText, + textFill: style.Station.controlMode.routeMode.defaultColor, + textAlign: style.textStyle.textAlign, + textVerticalAlign: style.textStyle.textVerticalAlign } }); this.stationControlMode = new Text({ zlevle: this.zlevle, z: this.z, style: { - x: model.textControlModePosition.x + model.style.Station.textControlMode.distance, + x: model.textControlModePosition.x + style.Station.controlMode.distance, y: model.textControlModePosition.y, - fontWeight: model.style.textStyle.fontWeight, - fontSize: model.style.Station.textControlMode.fontSize, - fontFamily: model.style.fontFamily, - text: model.style.Station.textControlMode.stationControlMode.defaultText, - textFill: model.style.Station.textControlMode.stationControlMode.defaultColor, - textAlign: model.style.textStyle.textAlign, - textVerticalAlign: model.style.textStyle.textVerticalAlign + fontWeight: style.textStyle.fontWeight, + fontSize: style.Station.controlMode.fontSize, + fontFamily: style.fontFamily, + text: style.Station.controlMode.stationControlMode.defaultText, + textFill: style.Station.controlMode.stationControlMode.defaultColor, + textAlign: style.textStyle.textAlign, + textVerticalAlign: style.textStyle.textVerticalAlign } }); this.stationCommunication = new Text({ zlevel: this.zlevel, z: this.z, style: { - x: model.textControlModePosition.x + model.style.Station.textControlMode.distance * 2, - y: model.textControlMode.Position.y, - fontWeight: model.style.textStyle.fontWeight, - fontSize: model.style.Station.textControlMode.fontSize, - fontFamily: model.style.fontFamily, - text: model.style.Station.textControlMode.stationCommunication.defaultText, - textFill: model.style.Station.textControlMode.stationControlMode.defaultColor, - textAlign: model.style.textStyle.textAlign, - textVerticalAlign: model.style.textStyle.textVerticalAlign + x: model.textControlModePosition.x + style.Station.controlMode.distance * 2, + y: model.textControlModePosition.y, + fontWeight: style.textStyle.fontWeight, + fontSize: style.Station.controlMode.fontSize, + fontFamily: style.fontFamily, + text: style.Station.controlMode.stationCommunication.defaultText, + textFill: style.Station.controlMode.stationControlMode.defaultColor, + textAlign: style.textStyle.textAlign, + textVerticalAlign: style.textStyle.textVerticalAlign } }); this.verifyBypass = new Text({ zlevel: this.zlevel, z: this.z, style: { - x: model.textControlModePosition.x + model.style.Station.textControlMode.distance * 3, - y: model.textControlMode.Position.y, - fontWeight: model.style.textStyle.fontWeight, - fontSize: model.style.Station.textControlMode.fontSize, - fontFamily: model.style.fontFamily, - text: model.style.Station.textControlMode.verifyBypass.defaultText, - textFill: model.style.Station.textControlMode.verifyBypass.defaultColor, - textAlign: model.style.textStyle.textAlign, - textVerticalAlign: model.style.textStyle.textVerticalAlign + x: model.textControlModePosition.x + style.Station.controlMode.distance * 3, + y: model.textControlModePosition.y, + fontWeight: style.textStyle.fontWeight, + fontSize: style.Station.controlMode.fontSize, + fontFamily: style.fontFamily, + text: style.Station.controlMode.verifyBypass.defaultText, + textFill: style.Station.controlMode.verifyBypass.defaultColor, + textAlign: style.textStyle.textAlign, + textVerticalAlign: style.textStyle.textVerticalAlign } }); this.add(this.routeMode); diff --git a/src/jmapNew/theme/foshan_01/planConvert.js b/src/jmapNew/theme/foshan_01/planConvert.js index b993d7637..4fffc5ab2 100644 --- a/src/jmapNew/theme/foshan_01/planConvert.js +++ b/src/jmapNew/theme/foshan_01/planConvert.js @@ -67,8 +67,8 @@ export default { if (reg3.test(dataList[i][item + j]) || reg3.test(dataList[i][item + j + 1])) { arrivalList.push({ stationName: dataList[columnNum][item + j], - arriveTime: reg3.test(dataList[i][item + j]) ? prefixTime(dataList[i][item + j]) : prefixTime(dataList[i][item + j + 1]), - departureTime: reg3.test(dataList[i][item + j + 1]) ? prefixTime(dataList[i][item + j + 1]) : prefixTime(dataList[i][item + j]) + departureTime: reg3.test(dataList[i][item + j]) ? prefixTime(dataList[i][item + j]) : prefixTime(dataList[i][item + j + 1]), + arriveTime: reg3.test(dataList[i][item + j + 1]) ? prefixTime(dataList[i][item + j + 1]) : prefixTime(dataList[i][item + j]) }); } } diff --git a/src/views/newMap/newMapdraft/mapoperate/station.vue b/src/views/newMap/newMapdraft/mapoperate/station.vue index c97d567a5..8c19517ef 100644 --- a/src/views/newMap/newMapdraft/mapoperate/station.vue +++ b/src/views/newMap/newMapdraft/mapoperate/station.vue @@ -159,7 +159,9 @@ export default { showFoldbackMode: false, // 折返模式 foldbackModePosition: {x: 0, y: 0}, showAxle: false, // 计轴预复位 - axlePosition: {x: 0, y: 0} + axlePosition: {x: 0, y: 0}, + showDeviceStatus: false, + deviceStatusPosition: {x: 0, y: 0} }, addModel: { modelList: [], @@ -265,6 +267,11 @@ export default { { prop: 'axlePosition', label: '计轴预复位坐标:', type: 'coordinate', width: '120px', isHidden: !this.editModel.showAxle, children: [ {prop: 'axlePosition.x', firstLevel: 'axlePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px'}, {prop: 'axlePosition.y', firstLevel: 'axlePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px'} + ]}, + { prop: 'showDeviceStatus', label: '设备状态:', type: 'checkbox', change: true, deviceChange: this.changeShowDeviceStatus}, + { prop: 'deviceStatusPosition', label: '设备状态坐标:', type: 'coordinate', width: '120px', isHidden: !this.editModel.showDeviceStatus, children: [ + {prop: 'deviceStatusPosition.x', firstLevel: 'deviceStatusPosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px'}, + {prop: 'deviceStatusPosition.y', firstLevel: 'deviceStatusPosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px'} ]} ] }, @@ -370,8 +377,8 @@ export default { changeTextControlMode(data) { if (data) { this.editModel.textControlModePosition = { - x: this.editModel.position.x, - y: this.editModel.position.y + 30 + x: this.editModel.position.x - 40, + y: this.editModel.position.y + 60 }; } else { this.editModel.textControlModePosition = { @@ -384,7 +391,7 @@ export default { if (data) { this.editModel.unmannedPosition = { x: this.editModel.position.x, - y: this.editModel.position.y + 30 + y: this.editModel.position.y + 60 }; } else { this.editModel.unmannedPosition = { @@ -397,7 +404,7 @@ export default { if (data) { this.editModel.lampFilamentPosition = { x: this.editModel.position.x, - y: this.editModel.position.y + 30 + y: this.editModel.position.y + 60 }; } else { this.editModel.lampFilamentPosition = { @@ -410,7 +417,7 @@ export default { if (data) { this.editModel.controlSwitchPosition = { x: this.editModel.position.x, - y: this.editModel.position.y + 30 + y: this.editModel.position.y + 60 }; } else { this.editModel.controlSwitchPosition = { @@ -423,7 +430,7 @@ export default { if (data) { this.editModel.foldbackModePosition = { x: this.editModel.position.x, - y: this.editModel.position.y + 30 + y: this.editModel.position.y + 60 }; } else { this.editModel.foldbackModePosition = { @@ -436,7 +443,7 @@ export default { if (data) { this.editModel.axlePosition = { x: this.editModel.position.x, - y: this.editModel.position.y + 30 + y: this.editModel.position.y + 60 }; } else { this.editModel.axlePosition = { @@ -445,6 +452,19 @@ export default { }; } }, + changeShowDeviceStatus(data) { + if (data) { + this.editModel.deviceStatusPosition = { + x: this.editModel.position.x - 60, + y: this.editModel.position.y + 90 + }; + } else { + this.editModel.deviceStatusPosition = { + x: 0, + y: 0 + }; + } + }, // 选择管理车站 changeChargeStation(data) { if (data.length > 0) { From 7f7318814c83ac7c64c3988dc6eee30d890740b4 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 13 Apr 2020 18:43:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=20=E7=8E=B0=E5=9C=B0=20=E5=8F=96=E6=B6=88=E8=BF=9B?= =?UTF-8?q?=E8=B7=AF=20=E4=BF=A1=E5=8F=B7=E9=87=8D=E5=BC=80=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/beijing_01/menus/menuSignal.vue | 1 + src/jmapNew/theme/beijing_01/operationConfig.js | 16 ++++++++-------- src/scripts/cmdPlugin/OperationHandler.js | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue index d61298593..779ec9e13 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue @@ -371,6 +371,7 @@ export default { }, // 现地信号重开操作 reopenSignalByRoute(selectType) { + debugger; commitOperate(menuOperate.Signal.reopenSignal, {signalCode:selectType.code}, 3).then(({valid, operate})=>{ }).catch(error=>{ this.$refs.noticeInfo.doShow({}, error.message); diff --git a/src/jmapNew/theme/beijing_01/operationConfig.js b/src/jmapNew/theme/beijing_01/operationConfig.js index 2b3631bdd..9118fa170 100644 --- a/src/jmapNew/theme/beijing_01/operationConfig.js +++ b/src/jmapNew/theme/beijing_01/operationConfig.js @@ -491,7 +491,7 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3040', tip: '鼠标左键点击【信号重开】' }, - { deviceType: '04', orderNum: 2, operateCode: '3040', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL'} + { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击选择该信号机', codeType:'SIGNAL'} ] }, { @@ -505,7 +505,7 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3090', tip: '鼠标左键点击【自动进路】' }, - { deviceType: '04', orderNum: 2, operateCode: '3090', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL'} + { deviceType: '04', orderNum: 2, operateCode: '3090', tip: '鼠标左键点击选择该信号机', codeType:'SIGNAL'} ] }, { @@ -519,7 +519,7 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3090', tip: '鼠标左键点击【自动进路】' }, - { deviceType: '04', orderNum: 2, operateCode: '3090', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL'} + { deviceType: '04', orderNum: 2, operateCode: '3090', tip: '鼠标左键点击选择该信号机', codeType:'SIGNAL'} ] }, { @@ -533,7 +533,7 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' }, - { deviceType: '04', orderNum: 2, operateCode: '3050', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL'} + { deviceType: '04', orderNum: 2, operateCode: '3050', tip: '鼠标左键点击选择该信号机', codeType:'SIGNAL'} ] }, { @@ -547,7 +547,7 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' }, - { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL'} + { deviceType: '04', orderNum: 2, operateCode: '313', tip: '鼠标左键点击选择该信号机', codeType:'SIGNAL'} ] }, { @@ -561,7 +561,7 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' }, - { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL'} + { deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击选择该信号机', codeType:'SIGNAL'} ] }, { @@ -575,8 +575,8 @@ export default { productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' }, - { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【始端信号机】', codeType:'SIGNAL'}, - { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【终端信号机】', codeType:'SIGNAL'} + { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击选择该信号机', codeType:'SIGNAL'}, + { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击选择该信号机', codeType:'SIGNAL'} ] } // 自动折返 (暂时没有) diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 1158d3fb8..d25026f94 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -718,7 +718,7 @@ export const OperationEvent = { reopenSignal: { button: { operation: '3040', - domId: '_Tips-Signal-Reopen-Mbm' + domId: '_Tips-Signal-Reopen-Mbm{TOP}' }, menu: { operation: '304',