From 7110d2f06f0c2e151e7eb38764fb15da89339c26 Mon Sep 17 00:00:00 2001 From: lVAL Date: Mon, 22 Feb 2021 18:46:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/ningbo_01/operationConfig.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js index a1765aa4b..90bc44960 100644 --- a/src/jmapNew/theme/ningbo_01/operationConfig.js +++ b/src/jmapNew/theme/ningbo_01/operationConfig.js @@ -701,8 +701,8 @@ export default { minDuration: 8, operateType: 'Signal_Human_Release_Route', skinCode: '06', - trainingName: '人工解锁进路({5})', - trainingRemark: '人工解锁进路', + trainingName: '人解列车进路({5})', + trainingRemark: '人解列车进路', trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ From 8adadc5858c4973e3742980a9e9d955893a5c9ed Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 22 Feb 2021 18:48:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=9D=83=E5=9C=A8=E5=AE=9E=E8=AE=AD=E4=B8=AD=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jmap/map.js | 7 +++++++ .../theme/ningbo_01/menus/menuSignal.vue | 8 ++++---- .../ningbo_01/menus/menuStationPreReset.vue | 20 +++++++++---------- .../ningbo_01/menus/menuStationStand.vue | 2 +- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js index b988690d8..f3026cbf5 100644 --- a/src/api/jmap/map.js +++ b/src/api/jmap/map.js @@ -257,3 +257,10 @@ export function getVersionList(mapId) { method: 'get' }); } +/** 查询地图下车站下的区段 */ +export function getSectionListByStationCode(id, stationCode) { + return request({ + url: `/api/map/${id}/station/${stationCode}/sections`, + method: 'get' + }); +} diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue index 81450416b..5a5e06604 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue @@ -138,12 +138,12 @@ export default { cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE }, { - label: '取消进路', + label: '取消列车进路', handler: this.cancelTrainRoute, cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE }, { - label: '人工解锁进路', // 信号机引导取消 + label: '人解列车进路', // 信号机引导取消 handler: this.humanTrainRoute, cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE }, @@ -163,12 +163,12 @@ export default { cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING }, { - label: '设置通过模式', + label: '设置自动通过进路', handler: this.singalPassModel, cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO }, { - label: '取消通过模式', + label: '取消自动通过进路', handler: this.singalCancelPassModel, cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO }, diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue index bf0797f19..87a35d381 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue @@ -38,16 +38,16 @@ export default { } ], Center: [ - { - label: '设置', - handler: this.setPreReset, - cmdType: CMD.Station.CMD_STATION_PRE_RESET - }, - { - label: '取消', - handler: this.cancelPreReset, - cmdType: CMD.Station.CMD_STATION_CANCEL_PRE_RESET - } + // { + // label: '设置', + // handler: this.setPreReset, + // cmdType: CMD.Station.CMD_STATION_PRE_RESET + // }, + // { + // label: '取消', + // handler: this.cancelPreReset, + // cmdType: CMD.Station.CMD_STATION_CANCEL_PRE_RESET + // } ] }, menuForce: [ diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue index bc6ef8889..2ec60a4c3 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue @@ -132,7 +132,7 @@ export default { cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO }, { - label: '查看站台信息', + label: '站台详细信息', handler: this.detail, cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS } From a432cfc632a27266cbfde57a51f4c32e0669ca0f Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 22 Feb 2021 18:51:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/ningbo_01/operationConfig.js | 64 ++++++++++--------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js index 90bc44960..183ad1c84 100644 --- a/src/jmapNew/theme/ningbo_01/operationConfig.js +++ b/src/jmapNew/theme/ningbo_01/operationConfig.js @@ -12,7 +12,7 @@ export default { stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【扣车】' }, { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '06', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } + { deviceType: '06', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -27,7 +27,7 @@ export default { stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' }, { deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '06', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } + { deviceType: '06', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -70,7 +70,7 @@ export default { stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【提前发车】' }, { deviceType: '06', orderNum: 2, operateCode: '501', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '06', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, + { deviceType: '06', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -252,7 +252,7 @@ export default { stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区故解】' }, { deviceType: '03', orderNum: 2, operateCode: '4023', tip: '鼠标左键点击【是】按钮' }, - { deviceType: '03', orderNum: 2, operateCode: '4024', 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: '鼠标左键点击【确定】按钮' } ] @@ -269,7 +269,7 @@ export default { stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【区段跟踪切除】' }, { deviceType: '03', orderNum: 2, operateCode: '405', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '03', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -284,7 +284,7 @@ export default { stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段跟踪激活】' }, { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '03', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -351,9 +351,9 @@ export default { stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【解封】' }, { deviceType: '03', orderNum: 2, operateCode: '4042', tip: '鼠标左键点击【是】按钮' }, - { deviceType: '03', orderNum: 3, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '{19}' }, - { deviceType: '03', orderNum: 5, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 5, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' } ] }, { @@ -386,7 +386,7 @@ export default { stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标左键菜单选择【定操】' }, { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '02', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } + { deviceType: '02', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -401,7 +401,7 @@ export default { stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【反操】' }, { deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '02', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } + { deviceType: '02', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -462,7 +462,7 @@ export default { stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' }, { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '02', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } + { deviceType: '02', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -477,7 +477,7 @@ export default { stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔单解】' }, { deviceType: '03', orderNum: 2, operateCode: '1042', tip: '鼠标左键点击【是】按钮' }, - { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择道岔({7})', val: '{17}' }, { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' } ] @@ -494,7 +494,7 @@ export default { stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' }, { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '02', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, + { deviceType: '02', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -509,7 +509,7 @@ export default { stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔解封】' }, { deviceType: '03', orderNum: 2, operateCode: '1062', tip: '鼠标左键点击【是】按钮' }, - { deviceType: '03', orderNum: 3, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '1066', tip: '鼠标左键选择道岔({7})', val: '{17}' }, { deviceType: '03', orderNum: 5, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' } ] @@ -565,7 +565,7 @@ export default { { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【排列进路】' }, { deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{28}】', val: '{4}' }, { deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '04', orderNum: 4, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } + { deviceType: '04', orderNum: 4, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, // this.tempData.forEach(route => { @@ -585,7 +585,7 @@ export default { stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消列车进路】' }, { deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } + { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -600,7 +600,7 @@ export default { stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' }, { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, + { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -616,7 +616,7 @@ export default { { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' }, { deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择【{28}】进路', val: '{4}' }, { deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '04', orderNum: 4, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } + { deviceType: '04', orderNum: 4, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -632,7 +632,7 @@ export default { { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路交人工控】' }, { deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择【{28}】进路', val: '{4}' }, { deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '04', orderNum: 4, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } + { deviceType: '04', orderNum: 4, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -647,7 +647,7 @@ export default { stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【设置自动通过进路】' }, { deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, + { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, // { @@ -662,7 +662,7 @@ export default { // stepVOList: [ // { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【Fleet进路办理】' }, // { deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, + // { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, // ] // }, @@ -678,7 +678,7 @@ export default { stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【取消自动通过进路】' }, { deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, + { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, // { @@ -693,7 +693,7 @@ export default { // stepVOList: [ // { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【Fleet进路取消】' }, // { deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, + // { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, // ] // }, { @@ -736,7 +736,7 @@ export default { stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【封锁】' }, { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, + { deviceType: '04', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } ] }, { @@ -751,9 +751,9 @@ export default { stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【解封】' }, { deviceType: '03', orderNum: 2, operateCode: '3072', tip: '鼠标左键点击【是】按钮' }, - { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择信号机({5})', val: '{6}' }, - { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' } ] }, { @@ -825,8 +825,9 @@ export default { stepVOList: [ { deviceType: '05', orderNum: 1, operateCode: '900', tip: '鼠标右键菜单选择【设置自动折返】'}, { deviceType: '05', orderNum: 2, operateCode: '900', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '05', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, - ] + { deviceType: '05', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } + ], + config: { autoCycleBT: true } }, { maxDuration: 15, @@ -836,12 +837,13 @@ export default { trainingName: '取消自动折返({3})', trainingRemark: '取消自动折返', trainingType: 'Signal', - productTypes: ['01','02'], + productTypes: ['01', '02'], stepVOList: [ { deviceType: '05', orderNum: 1, operateCode: '901', tip: '鼠标右键菜单选择【取消自动折返】'}, { deviceType: '05', orderNum: 2, operateCode: '901', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '05', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' }, - ] + { deviceType: '05', orderNum: 3, operateCode: 'com16', tip: '鼠标左键点击【执行】按钮' } + ], + config: { autoCycleBT: true } }, { maxDuration: 20, From dafe484a0a155e97a1f45e56ab727e18d80e48c9 Mon Sep 17 00:00:00 2001 From: lVAL Date: Mon, 22 Feb 2021 18:56:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=BA=BA?= =?UTF-8?q?=E8=A7=A3=E5=88=97=E8=BD=A6=E8=BF=9B=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/ningbo_01/operationConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js index 90bc44960..794aecce1 100644 --- a/src/jmapNew/theme/ningbo_01/operationConfig.js +++ b/src/jmapNew/theme/ningbo_01/operationConfig.js @@ -706,7 +706,7 @@ export default { trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【人工解锁进路】' }, + { deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【人解列车进路】' }, { deviceType: '04', orderNum: 2, operateCode: '305', tip: '鼠标左键点击【确定】按钮' } ] }, From 0f492cfbe2e04460d3cf4fd6c916ca98856fd69e Mon Sep 17 00:00:00 2001 From: lVAL Date: Tue, 23 Feb 2021 08:59:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/ningbo_01/operationConfig.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js index 38a55e74b..43215c347 100644 --- a/src/jmapNew/theme/ningbo_01/operationConfig.js +++ b/src/jmapNew/theme/ningbo_01/operationConfig.js @@ -331,7 +331,7 @@ export default { operateType: 'Section_Block', skinCode: '06', trainingName: '封锁({8}{9})', - trainingRemark: '封锁功能', + trainingRemark: '区段封锁功能', trainingType: 'Section', productTypes: ['01'], stepVOList: [ @@ -345,7 +345,7 @@ export default { operateType: 'Section_Unblock', skinCode: '06', trainingName: '解封({8}{9})', - trainingRemark: '解封功能', + trainingRemark: '区段解封功能', trainingType: 'Section', productTypes: ['01'], stepVOList: [ @@ -380,7 +380,7 @@ export default { operateType: 'Switch_Normal_Position', skinCode: '06', trainingName: '定操({7})', - trainingRemark: '定操({7})', + trainingRemark: '道岔定操功能({7})', trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ @@ -395,7 +395,7 @@ export default { operateType: 'Switch_Reverse_Position', // 0313 新增定位字典 skinCode: '06', trainingName: '反操({7})', - trainingRemark: '反操({7})', + trainingRemark: '道岔反操功能({7})', trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ @@ -410,7 +410,7 @@ export default { operateType: 'Switch_Cut_Off', skinCode: '06', trainingName: '区段切除({7})', - trainingRemark: '区段切除', + trainingRemark: '区段切除功能', trainingType: 'Switch', productTypes: ['02'], stepVOList: [ @@ -715,12 +715,12 @@ export default { minDuration: 8, operateType: 'Signal_Set_Guide', skinCode: '06', - trainingName: '信号机引导办理({5})', - trainingRemark: '信号机引导办理', + trainingName: '引导({5})', + trainingRemark: '引导办理', trainingType: 'Signal', productTypes: ['01'], stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【信号机引导办理】' }, + { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【引导】' }, { deviceType: '04', orderNum: 2, operateCode: '308', tip: '鼠标左键点击【确定】按钮' } ] }, @@ -730,7 +730,7 @@ export default { operateType: 'Signal_Block', skinCode: '06', trainingName: '封锁({5})', - trainingRemark: '封锁', + trainingRemark: '信号机封锁功能', trainingType: 'Signal', productTypes: ['01'], stepVOList: [ @@ -745,7 +745,7 @@ export default { operateType: 'Signal_Unblock', skinCode: '06', trainingName: '解封({5})', - trainingRemark: '解封功能', + trainingRemark: '信号机解封功能', trainingType: 'Signal', productTypes: ['01'], stepVOList: [