From 6c272d3a6cf5aa2278fa9db0e3791d0918ecea35 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 17 Jun 2020 18:29:35 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/menus/dialog/routeControl.vue | 4 +- .../ningbo_01/menus/dialog/routeLock.vue | 145 ------------------ .../theme/ningbo_01/menus/menuSignal.vue | 5 +- 3 files changed, 3 insertions(+), 151 deletions(-) delete mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/routeLock.vue diff --git a/src/jmapNew/theme/components/menus/dialog/routeControl.vue b/src/jmapNew/theme/components/menus/dialog/routeControl.vue index b9d771cd9..8be050e37 100644 --- a/src/jmapNew/theme/components/menus/dialog/routeControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/routeControl.vue @@ -104,8 +104,8 @@ export default { return this.$t('menu.menuSignal.cancelInterlockAutoTrigger'); // 取消联锁自动触发 } else if (this.operation == OperationEvent.Signal.unlock.menu.operation) { return '信号解封'; - } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) { - return '信号关灯'; + } else if (this.operation == OperationEvent.Signal.lock.menu.operation) { + return '信号封锁'; } return ''; } diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeLock.vue deleted file mode 100644 index 89917c327..000000000 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeLock.vue +++ /dev/null @@ -1,145 +0,0 @@ - - - diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue index fe90ec7a8..08bbc4319 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue @@ -2,7 +2,6 @@
- @@ -16,7 +15,6 @@ import PopMenu from '@/components/PopMenu'; import RouteControl from '@/jmapNew/theme/components/menus/dialog/routeControl'; import RouteSelection from './dialog/routeSelection'; -import RouteLock from './dialog/routeLock'; import RouteUnLock from './dialog/routeUnLock'; import RouteHandControl from './dialog/routeHandControl'; import RouterCommand from './dialog/routerCommand'; @@ -34,7 +32,6 @@ export default { PopMenu, RouteControl, RouteSelection, - RouteLock, RouteUnLock, RouteHandControl, RouteDetail, @@ -258,7 +255,7 @@ export default { lock() { commitOperate(menuOperate.Signal.lock, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{ if (valid) { - this.$refs.routeLock.doShow(operate, this.selected); + this.$refs.routeControl.doShow(operate, this.selected); } }); }, From 0983307bc7ddaca299682679559b3804de7ba834 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 17 Jun 2020 18:36:22 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/chatView/chatBox.vue | 1 + src/views/newMap/displayNew/demon/addQuest.vue | 14 +++++++++++--- src/views/newMap/displayNew/menuTrainList.vue | 6 ++++-- .../scriptManage/scriptRecord/getActionNew.vue | 6 ++++-- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue index ec52b14be..866a914d6 100644 --- a/src/views/newMap/displayNew/chatView/chatBox.vue +++ b/src/views/newMap/displayNew/chatView/chatBox.vue @@ -192,6 +192,7 @@ export default { this.$refs.chatCoversitionList.addCoversition(data, headerTitle); this.isHasCoversition = true; this.currentCoversition = {id:data.id, all:data.all}; + this.memberListCoversition = {id:data.id, all:data.all}; this.headerTitle = headerTitle; }, changeCoversition(data) { diff --git a/src/views/newMap/displayNew/demon/addQuest.vue b/src/views/newMap/displayNew/demon/addQuest.vue index ef016ab6e..6941cce43 100644 --- a/src/views/newMap/displayNew/demon/addQuest.vue +++ b/src/views/newMap/displayNew/demon/addQuest.vue @@ -181,9 +181,17 @@ export default { let newMemberList = []; if (res.code == 200) { if (res.data.memberList && res.data.memberList.length > 0) { - const lastData = JSON.stringify(res.data.memberList); - const playerList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew); - newMemberList = playerList.filter(item => item.hasPlay === true); + // res.data.memberList + // newMemberList + const playerList = res.data.memberList.filter(item => item.hasPlay === true); + playerList.map(each=>{ + if (!each.deviceName && each.deviceCode) { + const device = this.$store.getters['map/getDeviceByCode'](each.deviceCode); + each.deviceName = device.name; + } + }); + const lastData = JSON.stringify(playerList); + newMemberList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew); } if (res.data.mapLocation) { this.mapLocation = res.data.mapLocation; diff --git a/src/views/newMap/displayNew/menuTrainList.vue b/src/views/newMap/displayNew/menuTrainList.vue index 15caa34ab..3e2b95207 100644 --- a/src/views/newMap/displayNew/menuTrainList.vue +++ b/src/views/newMap/displayNew/menuTrainList.vue @@ -74,10 +74,12 @@ export default { const trainList = this.$store.state.map.map.trainList; if (this.lineCode == '10' || this.lineCode == '11') { this.topTrainList = trainList.filter((train)=>{ - return train.serviceNumber != '' && train.serviceNumber != undefined && !train.right && train.sectionCode; + // train.serviceNumber != '' && train.serviceNumber != undefined && + return !train.right && train.sectionCode; }); this.bottomTrainList = trainList.filter((train)=>{ - return train.serviceNumber != '' && train.serviceNumber != undefined && train.right && train.sectionCode; + // train.serviceNumber != '' && train.serviceNumber != undefined && + return train.right && train.sectionCode; }); } else { this.trainList = trainList.filter((train)=>{ diff --git a/src/views/scriptManage/scriptRecord/getActionNew.vue b/src/views/scriptManage/scriptRecord/getActionNew.vue index 0bd8adcdc..17b51f80c 100644 --- a/src/views/scriptManage/scriptRecord/getActionNew.vue +++ b/src/views/scriptManage/scriptRecord/getActionNew.vue @@ -112,8 +112,10 @@ export default { // isStartCoversition const targetNameList = []; element.conversationMemberIds.forEach(id=>{ - const userName = memberVOList.find(elem=>{ return elem.id == id; }); - targetNameList.push(userName.name); + if (member.id != id) { + const userName = memberVOList.find(elem=>{ return elem.id == id; }); + targetNameList.push(userName.name); + } }); this.actionInfoList.push({id: element.id, isStartCoversition: true, memberName: memberName, targetName:targetNameList.toString() }); break; From 426aed9ef1139be186401da12b5c671c752feb2a Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 18 Jun 2020 09:20:42 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/demon/addQuest.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/newMap/displayNew/demon/addQuest.vue b/src/views/newMap/displayNew/demon/addQuest.vue index 6941cce43..fcbf96444 100644 --- a/src/views/newMap/displayNew/demon/addQuest.vue +++ b/src/views/newMap/displayNew/demon/addQuest.vue @@ -187,7 +187,11 @@ export default { playerList.map(each=>{ if (!each.deviceName && each.deviceCode) { const device = this.$store.getters['map/getDeviceByCode'](each.deviceCode); - each.deviceName = device.name; + if (device.name) { + each.deviceName = device.name; + } else { + each.deviceName = each.deviceCode; + } } }); const lastData = JSON.stringify(playerList); From b0e5d7a6b64967c5c2fc9c7535a3f5b727b16a13 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 18 Jun 2020 09:46:29 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=9C=BA=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/beijing_01/menus/menuSignal.vue | 7 +- .../menus/dialog/routeDetail.vue | 14 +- .../foshan_01/menus/dialog/routeDetail.vue | 168 ------------------ .../theme/foshan_01/menus/menuSignal.vue | 7 +- .../ningbo_01/menus/dialog/routeDetail.vue | 166 ----------------- .../theme/ningbo_01/menus/menuSignal.vue | 9 +- 6 files changed, 23 insertions(+), 348 deletions(-) rename src/jmapNew/theme/{beijing_01 => components}/menus/dialog/routeDetail.vue (94%) delete mode 100644 src/jmapNew/theme/foshan_01/menus/dialog/routeDetail.vue delete mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue index db4b65eb6..7258c84bd 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue @@ -2,9 +2,9 @@
- + - +
@@ -15,7 +15,7 @@ import PopMenu from '@/components/PopMenu'; import RouteControl from '@/jmapNew/theme/components/menus/dialog/routeControl'; import RouteSelection from './dialog/routeSelection'; import RouteHandControl from './dialog/routeHandControl'; -import RouteDetail from './dialog/routeDetail'; +import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; import { OperateMode } from '@/scripts/ConstDic'; @@ -49,6 +49,7 @@ export default { return { menu: [], clickNum:0, + systemName:'beijing-01__systerm', oldSelected:null, menuNormal: { Local: [ diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue similarity index 94% rename from src/jmapNew/theme/beijing_01/menus/dialog/routeDetail.vue rename to src/jmapNew/theme/components/menus/dialog/routeDetail.vue index e3556db61..30125ffd9 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/routeDetail.vue +++ b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue @@ -2,7 +2,7 @@
import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; -import { mouseCancelState } from '../utils/menuItemStatus'; -import NoticeInfo from './childDialog/childDialog/noticeInfo'; +// import { mouseCancelState } from '../utils/menuItemStatus'; +import NoticeInfo from '../childDialog/noticeInfo'; export default { name: 'RouteDetail', components: { NoticeInfo }, + props:{ + systemName:{ + type:String, + required:true + } + }, data() { return { dialogShow: false, @@ -128,7 +134,7 @@ export default { this.loading = false; this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); - mouseCancelState(this.selected); + // mouseCancelState(this.selected); }, commit() { const operate = { diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/foshan_01/menus/dialog/routeDetail.vue deleted file mode 100644 index 059e1366e..000000000 --- a/src/jmapNew/theme/foshan_01/menus/dialog/routeDetail.vue +++ /dev/null @@ -1,168 +0,0 @@ - - - diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue index 82c76d2c2..5e0385080 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue @@ -4,9 +4,9 @@ - + - +
@@ -20,7 +20,7 @@ import RouteLock from './dialog/routeLock'; import RouteUnLock from './dialog/routeUnLock'; import RouteHandControl from './dialog/routeHandControl'; import RouterCommand from './dialog/routerCommand'; -import RouteDetail from './dialog/routeDetail'; +import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; @@ -54,6 +54,7 @@ export default { data() { return { menu: [], + systemName:'foshan-01__systerm', menuNormal: { Local: [ { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue deleted file mode 100644 index 80f0b5cbc..000000000 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue +++ /dev/null @@ -1,166 +0,0 @@ - - - diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue index 08bbc4319..4126ee37f 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue @@ -3,11 +3,11 @@ - + - + - \ +
@@ -18,7 +18,7 @@ import RouteSelection from './dialog/routeSelection'; import RouteUnLock from './dialog/routeUnLock'; import RouteHandControl from './dialog/routeHandControl'; import RouterCommand from './dialog/routerCommand'; -import RouteDetail from './dialog/routeDetail'; +import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import {menuOperate, commitOperate} from './utils/menuOperate'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; @@ -49,6 +49,7 @@ export default { data() { return { menu: [], + systemName:'ningbo-01__systerm', menuNormal: { Local: [ { From f892440294f6c590a7e429115f6cad62c01be70c Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 18 Jun 2020 10:05:12 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fuzhou_01/menus/dialog/standDetail.vue | 2 +- .../menus/dialog/standDetainTrainAll.vue | 10 +- .../fuzhou_01/menus/dialog/standRunLevel.vue | 6 +- .../fuzhou_01/menus/dialog/standStopTime.vue | 4 +- .../theme/fuzhou_01/operationConfig.js | 40 +- .../theme/fuzhou_01/operationConfigGlobal.js | 236 ++--- src/jmapNew/theme/xian_01/operationConfig.js | 287 +++--- .../theme/xian_01/operationConfigGlobal.js | 820 ------------------ src/scripts/cmdPlugin/ValidateHandler.js | 2 + 9 files changed, 281 insertions(+), 1126 deletions(-) delete mode 100644 src/jmapNew/theme/xian_01/operationConfigGlobal.js diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue index 3531f2fb9..2cceb5de8 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue @@ -151,7 +151,7 @@ export default { }; this.loading = true; - this.$store.dispatch('training/next', operate).then(({ valid }) => { + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; if (valid) { this.doClose(); diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue index 43198ba0e..ffe509465 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue @@ -15,10 +15,10 @@ - {{ $t('menu.uplinkBroadly') }} + {{ $t('menu.uplinkBroadly') }} - {{ $t('menu.downlinkBroadly') }} + {{ $t('menu.downlinkBroadly') }} @@ -112,7 +112,6 @@ export default { /** status 01: 未扣车*/ const stand = (this.$store.getters['map/getDeviceByCode'](elem.code) || {}); const station = (this.$store.getters['map/getDeviceByCode'](elem.stationCode) || {}); - console.log(stand, stand.centerHoldTrain); if (station && station.visible && stand && stand.centerHoldTrain && elem.right == this.upDown) { this.tempData.push({ stationName: station.name, standName: elem.name }); } @@ -146,7 +145,7 @@ export default { this.loadTableData(); const operate = { operation: OperationEvent.StationStand.cancelDetainTrainAll.choose.operation, - val: `${upDown}` + val: (this.rightUp && upDown) || (!this.rightUp && !upDown) ? '02' : '01' }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { @@ -160,12 +159,11 @@ export default { over: true, operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation, cmdType: CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN, - val: this.upDown, + val: (this.rightUp && this.upDown) || (!this.rightUp && !this.upDown) ? '02' : '01', param: { isRight: this.upDown } }; - this.loading = true; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.loading = false; diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue index 7467d0388..c3996b2dc 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue @@ -145,14 +145,14 @@ export default { if (index != 0) { const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code); const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode); - this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: selected.runLevelTime ? selected.runLevelTime : 0, check: selected.runLevelTimeValidStatus }); + this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: selected.runLevelTime ? selected.runLevelTime : 0, check: !!selected.runLevelTimeForever }); } } else { // 上行时，此站不是最后一站 if (index != this.stationList.length) { const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code); const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode); - this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: selected.runLevelTime ? selected.runLevelTime : 0, check: selected.runLevelTimeValidStatus }); + this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: selected.runLevelTime ? selected.runLevelTime : 0, check: !!selected.runLevelTimeForever }); } } }, @@ -229,6 +229,7 @@ export default { if (this.isConfirm) { const operate = { operation: OperationEvent.StationStand.setRunLevel.menu.operation, + val: [`${this.time}`, `${this.tempData[0].check}`].join('::'), param:{ runLevelTimeForever: !!this.tempData[0].check, runLevelTime: this.time @@ -242,6 +243,7 @@ export default { if (valid) { this.doClose(); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + delete operate.val; this.$refs.confirmControl.doShow(operate); } }).catch(() => { diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue index e3af32eb0..7eedac086 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue @@ -185,6 +185,7 @@ export default { const operate = { operation: OperationEvent.StationStand.setStopTime.choose1.operation, + val: `${control}`, param: {} }; @@ -224,7 +225,7 @@ export default { commit() { const operate = { operation: OperationEvent.StationStand.setStopTime.menu.operation, - val: [`${this.control}`, this.time, this.effective].join('::'), + val: [`${this.control}`, `${this.control === '01' ? -1 : this.time}`, `${this.control === '01' ? true : this.effective}`].join('::'), param:{ parkingTime: this.control === '01' ? -1 : this.time, parkingAlwaysValid: this.control === '01' ? true : this.effective @@ -238,6 +239,7 @@ export default { if (valid) { this.doClose(); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + delete operate.val; this.$refs.confirmControl.doShow(operate); } }).catch(() => { diff --git a/src/jmapNew/theme/fuzhou_01/operationConfig.js b/src/jmapNew/theme/fuzhou_01/operationConfig.js index d7f833093..1dce1900f 100644 --- a/src/jmapNew/theme/fuzhou_01/operationConfig.js +++ b/src/jmapNew/theme/fuzhou_01/operationConfig.js @@ -173,7 +173,7 @@ export default { productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【跳停】' }, - { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮', val: '{11}' } + { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮' } ] }, { @@ -187,7 +187,7 @@ export default { productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' }, - { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮', val: '{11}' } + { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮' } ] }, { @@ -216,8 +216,8 @@ export default { stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' }, { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【自动】', val: '01' }, - { deviceType: '06', orderNum: 3, operateCode: '509', tip: '鼠标左键点击【确认】按钮', val: '01::20::true' }, - { deviceType: '06', orderNum: 4, operateCode: '5091', tip: '鼠标左键点击【确认】按钮', val: '01::20::true' } + { deviceType: '06', orderNum: 3, operateCode: '509', tip: '鼠标左键点击【确认】按钮', val: '01::-1::true'}, + { deviceType: '06', orderNum: 4, operateCode: '5091', tip: '鼠标左键点击【确认】按钮'} ] }, { @@ -231,10 +231,11 @@ export default { productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' }, - { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【人工】', val: '02' }, + // { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【人工】', val: '02' }, { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' }, - { deviceType: '06', orderNum: 4, operateCode: '509', tip: '鼠标左键点击【确认】按钮', val: '02::20::true' }, - { deviceType: '06', orderNum: 5, operateCode: '5091', tip: '鼠标左键点击【确认】按钮', val: '02::20::true' } + { deviceType: '06', orderNum: 4, operateCode: '5093', tip: '鼠标左键点击，选择【一直有效】', val: 'true' }, + { deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮', val: '02::20::true'}, + { deviceType: '06', orderNum: 6, operateCode: '5091', tip: '鼠标左键点击【确认】按钮'} ] }, { @@ -248,11 +249,10 @@ export default { productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' }, - { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【人工】', val: '02' }, + // { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【人工】', val: '02' }, { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' }, - { deviceType: '06', orderNum: 4, operateCode: '5093', tip: '鼠标左键点击，选择【一次有效】', val: 'false' }, { deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮', val: '02::20::false' }, - { deviceType: '06', orderNum: 6, operateCode: '5091', tip: '鼠标左键点击【确认】按钮', val: '02::20::false' } + { deviceType: '06', orderNum: 6, operateCode: '5091', tip: '鼠标左键点击【确认】按钮'} ] }, { @@ -267,8 +267,9 @@ export default { stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' }, { deviceType: '06', orderNum: 2, operateCode: '5101', tip: '鼠标左键点击，选择【60】', val: '60' }, - { deviceType: '06', orderNum: 3, operateCode: '510', tip: '鼠标左键点击【确认】按钮', val: '60::true' }, - { deviceType: '06', orderNum: 4, operateCode: '5102', tip: '鼠标左键点击【确认】按钮', val: '60::true' } + { deviceType: '06', orderNum: 3, operateCode: '5103', tip: '鼠标左键点击，选择【一直有效】', val: 'true' }, + { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮', val: '60::true' }, + { deviceType: '06', orderNum: 5, operateCode: '5102', tip: '鼠标左键点击【确认】按钮' } ] }, { @@ -283,9 +284,8 @@ export default { stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' }, { deviceType: '06', orderNum: 2, operateCode: '5101', tip: '鼠标左键点击，选择【60】', val: '60' }, - { deviceType: '06', orderNum: 3, operateCode: '5103', tip: '鼠标左键点击，取消选择【一直有效】', val: 'false' }, - { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮', val: '60::false' }, - { deviceType: '06', orderNum: 5, operateCode: '5102', tip: '鼠标左键点击【确认】按钮', val: '60::false' } + { deviceType: '06', orderNum: 3, operateCode: '510', tip: '鼠标左键点击【确认】按钮', val: '60::false' }, + { deviceType: '06', orderNum: 4, operateCode: '5102', tip: '鼠标左键点击【确认】按钮' } ] }, { @@ -444,7 +444,7 @@ export default { { deviceType: '03', orderNum: 2, operateCode: '4081', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '03', orderNum: 3, operateCode: '4082', tip: '鼠标左键点击【确认】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '4083', tip: '鼠标左键点击【确认1】按钮' }, - { deviceType: '03', orderNum: 5, operateCode: '4084', tip: '鼠标左键点击【确认2】按钮', val: '5' }, + { deviceType: '03', orderNum: 5, operateCode: '4084', tip: '鼠标左键点击【确认2】按钮'}, { deviceType: '03', orderNum: 6, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } ] }, @@ -620,7 +620,7 @@ export default { { deviceType: '02', orderNum: 2, operateCode: '1141', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '1142', tip: '鼠标左键点击【确认】按钮' }, { deviceType: '02', orderNum: 4, operateCode: '1143', tip: '鼠标左键点击【确认1】按钮' }, - { deviceType: '02', orderNum: 5, operateCode: '1144', tip: '鼠标左键点击【确认2】按钮', val: '5' }, + { deviceType: '02', orderNum: 5, operateCode: '1144', tip: '鼠标左键点击【确认2】按钮' }, { deviceType: '02', orderNum: 6, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } ] }, @@ -637,7 +637,7 @@ export default { stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【进路选排】' }, { deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' }, - { deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【确定】按钮', val: '{4}' }, { deviceType: '04', orderNum: 4, operateCode: '3012', tip: '鼠标左键点击【确定】按钮' } ] }, @@ -761,7 +761,7 @@ export default { stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【自排开】' }, { deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择控制状态为"人工"的进路', val: '{6}' }, - { deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' } + { deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮', val: '{6}' } ] }, { @@ -776,7 +776,7 @@ export default { stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【自排关】' }, { deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择第一条进路', val: '{6}' }, - { deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' } + { deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮', val: '{6}' } ] }, { diff --git a/src/jmapNew/theme/fuzhou_01/operationConfigGlobal.js b/src/jmapNew/theme/fuzhou_01/operationConfigGlobal.js index e99041826..c2a4419a5 100644 --- a/src/jmapNew/theme/fuzhou_01/operationConfigGlobal.js +++ b/src/jmapNew/theme/fuzhou_01/operationConfigGlobal.js @@ -3,11 +3,11 @@ export default { { maxDuration: 20, minDuration: 15, - operateType: '0103', + operateType: 'CM_Apply_For_Center_Control', skinCode: '05', trainingName: 'Switch to central control ({1})', trainingRemark: 'Control permission conversion, switch station control to central control', - trainingType: '01', + trainingType: 'ControlConvertMenu', productTypes: ['02'], stepVOList: [ { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Left click the menu bar [control mode conversion]on the top' }, @@ -22,11 +22,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0101', + operateType: 'CM_Apply_For_Station_Control', skinCode: '05', trainingName: 'Switch to station control ({1})', trainingRemark: 'Control permission conversion, Force to station control', - trainingType: '01', + trainingType: 'ControlConvertMenu', productTypes: ['01'], stepVOList: [ { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Left click the menu bar [control mode conversion]on the top' }, @@ -41,11 +41,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0102', + operateType: 'CM_Force_Station_Control', skinCode: '05', trainingName: 'Force to station control ({1})', trainingRemark: 'Control permission conversion,Force to station control', - trainingType: '01', + trainingType: 'ControlConvertMenu', productTypes: ['01'], stepVOList: [ { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Left click the menu bar [control mode conversion]on the top' }, @@ -61,11 +61,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0501', + operateType: 'Stand_Set_Hold_Train', skinCode: '05', trainingName: 'Detain Train({10}-{12}station)', trainingRemark: 'Set the detaining function', - trainingType: '05', + trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '504', tip: 'Right click to select [Detain Train]' }, @@ -75,11 +75,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0502', + operateType: 'Stand_Cancel_Hold_Train', skinCode: '05', trainingName: 'Cancel Detaining({10}-{12}The platform)', trainingRemark: 'Set cancelling detaining function', - trainingType: '05', + trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '505', tip: 'Right click to select [Cancel Detaining]]' }, @@ -89,11 +89,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0503', + operateType: 'Stand_Force_Cancel_Hold_Train', skinCode: '05', trainingName: 'Force Canceling Detaining({10}-{12}The platform)', trainingRemark: 'Force to cancel train detaining function', - trainingType: '05', + trainingType: 'Stand', productTypes: ['01'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '506', tip: 'Right click to select [Force Canceling Detaining]' }, @@ -103,68 +103,68 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0504', + operateType: 'Stand_Whole_Line_Cancel_Hold_Train', skinCode: '05', trainingName: 'Cancel train detaining along the whole line({10}-{12}The platform)', trainingRemark: 'Cancel train detaining along the whole line (default the whole uplink and downlink )', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '508', tip: 'Right click to select [Cancel train detaining along the whole line]' }, - { deviceType: '06', orderNum: 2, operateCode: '508', tip: 'Left click [confirm] ', val: '{11}' } + { deviceType: '06', orderNum: 2, operateCode: '508', tip: 'Left click [confirm] ' } ] }, { maxDuration: 15, minDuration: 8, - operateType: '0504', + operateType: 'Stand_Whole_Line_Cancel_Hold_Train', skinCode: '05', trainingName: 'Cancel train detaining along the whole line({10}-{12}The platform)', trainingRemark: 'Cancel train detaining along the whole line (select the uplink or downlink ))', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '508', tip: 'Right click to select [Cancel train detaining along the whole line]' }, { deviceType: '06', orderNum: 2, operateCode: '5081', tip: 'Right click to select[{14}the whole line', val: '{13}' }, - { deviceType: '06', orderNum: 3, operateCode: '508', tip: 'Left click [confirm]', val: '{13}' } + { deviceType: '06', orderNum: 3, operateCode: '508', tip: 'Left click [confirm]'} ] }, { maxDuration: 15, minDuration: 8, - operateType: '0505', + operateType: 'Stand_Set_Jump_Stop', skinCode: '05', trainingName: 'Skip this station to continue moving({10}-{12}The platform)', trainingRemark: 'Set the skip to continue moving function', - trainingType: '05', + trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '502', tip: 'Right click to select [Skip this station to continue moving]' }, - { deviceType: '06', orderNum: 2, operateCode: '502', tip: 'Left click [confirm]', val: '{11}' } + { deviceType: '06', orderNum: 2, operateCode: '502', tip: 'Left click [confirm]'} ] }, { maxDuration: 15, minDuration: 8, - operateType: '0506', + operateType: 'Stand_Cancel_Jump_Stop', skinCode: '05', trainingName: 'Cancel skiping({10}-{12}The platform)', trainingRemark: 'Set cancelling skiping function', - trainingType: '05', + trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '503', tip: 'Right click to select [Cancel skiping]' }, - { deviceType: '06', orderNum: 2, operateCode: '503', tip: 'Left click [confirm]', val: '{11}' } + { deviceType: '06', orderNum: 2, operateCode: '503', tip: 'Left click [confirm]'} ] }, { maxDuration: 8, minDuration: 5, - operateType: '0507', + operateType: 'Stand_View_Status', skinCode: '05', trainingName: 'Query Platform status({10}-{12}The platform)', trainingRemark: 'Query platform status function', - trainingType: '05', + trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '507', tip: 'Right click to select [Query Platform status]' }, @@ -174,95 +174,95 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0508', + operateType: 'Stand_Set_Park_Time', skinCode: '05', trainingName: 'Set the stop time({10}-{12}The platform)', trainingRemark: 'Set the stop time (auto, permanent validity)', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right click to select [Set the stop time]' }, { deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Left click to select [auto]', val: '01' }, - { deviceType: '06', orderNum: 3, operateCode: '509', tip: 'Left click [confirm] ', val: '01::20::true' }, - { deviceType: '06', orderNum: 4, operateCode: '5091', tip: 'Left click [confirm] ', val: '01::20::true' } + { deviceType: '06', orderNum: 3, operateCode: '509', tip: 'Left click [confirm] ' }, + { deviceType: '06', orderNum: 4, operateCode: '5091', tip: 'Left click [confirm] ' } ] }, { maxDuration: 15, minDuration: 8, - operateType: '0508', + operateType: 'Stand_Set_Park_Time', skinCode: '05', trainingName: 'Set the stop time({10}-{12}The platform)', trainingRemark: 'Set the stop time (manual, 20 seconds, permanent validity)', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right click to select [Set the stop time]' }, { deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Left click to select [manual]', val: '02' }, { deviceType: '06', orderNum: 3, operateCode: '5094', tip: 'Set time [20]', val: '20' }, - { deviceType: '06', orderNum: 4, operateCode: '509', tip: 'Left click [confirm] ', val: '02::20::true' }, - { deviceType: '06', orderNum: 5, operateCode: '5091', tip: 'Left click [confirm]', val: '02::20::true' } + { deviceType: '06', orderNum: 4, operateCode: '509', tip: 'Left click [confirm] '}, + { deviceType: '06', orderNum: 5, operateCode: '5091', tip: 'Left click [confirm]'} ] }, { maxDuration: 15, minDuration: 8, - operateType: '0508', + operateType: 'Stand_Set_Park_Time', skinCode: '05', trainingName: 'Set the stop time({10}-{12}The platform)', trainingRemark: 'Set the stop time (manual, 20 seconds, once valid )', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right click to select [Set the stop time]' }, { deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Left click to select [manual]', val: '02' }, { deviceType: '06', orderNum: 3, operateCode: '5094', tip: 'Set time [20]', val: '20' }, { deviceType: '06', orderNum: 4, operateCode: '5093', tip: 'Left click to select "once valid ".', val: 'false' }, - { deviceType: '06', orderNum: 5, operateCode: '509', tip: 'Left click [confirm] ', val: '02::20::false' }, - { deviceType: '06', orderNum: 6, operateCode: '5091', tip: 'Left click [confirm] ', val: '02::20::false' } + { deviceType: '06', orderNum: 5, operateCode: '509', tip: 'Left click [confirm] '}, + { deviceType: '06', orderNum: 6, operateCode: '5091', tip: 'Left click [confirm] '} ] }, { maxDuration: 15, minDuration: 8, - operateType: '0509', + operateType: 'Stand_Set_Run_Time', skinCode: '05', trainingName: 'Set Operation speed Level({10}-{12}The platform)', trainingRemark: 'Set Operation speed Level(set the interval running time to 60, permanent validity)', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '510', tip: 'Right click to select [Set Operation speed Level]' }, { deviceType: '06', orderNum: 2, operateCode: '5101', tip: 'Left click to select [60]', val: '60' }, - { deviceType: '06', orderNum: 3, operateCode: '510', tip: 'Left click [confirm] ', val: '60::true' }, - { deviceType: '06', orderNum: 4, operateCode: '5102', tip: 'Left click [confirm] ', val: '60::true' } + { deviceType: '06', orderNum: 3, operateCode: '510', tip: 'Left click [confirm] '}, + { deviceType: '06', orderNum: 4, operateCode: '5102', tip: 'Left click [confirm] '} ] }, { maxDuration: 15, minDuration: 8, - operateType: '0509', + operateType: 'Stand_Set_Run_Time', skinCode: '05', trainingName: 'Set Operation speed Level({10}-{12}The platform)', trainingRemark: 'Set Operation speed Level (set the interval running time to 60, once valid )', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '510', tip: 'Right click to select [Set Operation speed Level]' }, { deviceType: '06', orderNum: 2, operateCode: '5101', tip: 'Left click to select [60]', val: '60' }, { deviceType: '06', orderNum: 3, operateCode: '5103', tip: 'Left click to cancel [permanent validity].', val: 'false' }, - { deviceType: '06', orderNum: 4, operateCode: '510', tip: 'Left click [confirm] ', val: '60::false' }, - { deviceType: '06', orderNum: 5, operateCode: '5102', tip: 'Left click [confirm] ', val: '60::false' } + { deviceType: '06', orderNum: 4, operateCode: '510', tip: 'Left click [confirm] '}, + { deviceType: '06', orderNum: 5, operateCode: '5102', tip: 'Left click [confirm] '} ] }, { maxDuration: 15, minDuration: 8, - operateType: '0510', + operateType: 'Stand_Early_Depart', skinCode: '05', trainingName: 'Set departure in advance({10}-{12}The platform)', trainingRemark: 'Set departure inadvance function', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '501', tip: 'Right click to select [Set departure in advance]' }, @@ -272,11 +272,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0511', + operateType: 'Stand_Set_Reentry_Strategy', skinCode: '05', trainingName: 'Manual return strategy setting({10}-{12}The platform)', trainingRemark: 'Manual return strategy setting function', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '511', tip: 'Right click to select [Manual return strategy setting]' }, @@ -288,11 +288,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0401', + operateType: 'Section_Fault_Unlock', skinCode: '05', trainingName: 'Section fault unlocking({8}{9})', trainingRemark: 'Fault unlocking', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '402', tip: 'Right click to select [Section fault unlocking]' }, @@ -305,11 +305,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0402', + operateType: 'Section_Cut_Off', skinCode: '05', trainingName: 'Section resection({8}{9})', trainingRemark: 'Section resection', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '405', tip: 'Right click to select [Section resection]' }, @@ -319,11 +319,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0403', + operateType: 'Section_Active', skinCode: '05', trainingName: 'Section activation({8}{9})', trainingRemark: 'Section activation function', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '406', tip: 'Right click to select [Section activation]' }, @@ -333,11 +333,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0404', + operateType: 'Section_Axis_Pre_Reset', skinCode: '05', trainingName: 'Axis pre-reset({8}{9})', trainingRemark: 'Axis pre-reset function', - trainingType: '04', + trainingType: 'Section', productTypes: ['01'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '409', tip: 'Right click to select [Axis pre-reset]' }, @@ -350,11 +350,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0405', + operateType: 'Section_Block', skinCode: '05', trainingName: 'Section blockade({8}{9})', trainingRemark: 'Section blockade function', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '403', tip: 'Right click to select [Section blockade]' }, @@ -364,11 +364,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0406', + operateType: 'Section_Unblock', skinCode: '05', trainingName: 'Section unblockade({8}{9})', trainingRemark: 'Section unblockade function', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '404', tip: 'Right click to select [Section unblockade]' }, @@ -381,11 +381,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0407', + operateType: 'Section_Set_Limit_Speed', skinCode: '05', trainingName: 'Set speed limit on the section({8}{9})', trainingRemark: 'Set speed limit on the section (speed limit value: 5)', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '407', tip: 'Right click to select [Set speed limit on the section]' }, @@ -400,11 +400,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0408', + operateType: 'Section_Cancel_Limit_Speed', skinCode: '05', trainingName: 'Cancel speed limit on the section({8}{9})', trainingRemark: 'Cancel speed limit on the section', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '408', tip: 'Right click to select [Cancel speed limit on the section]' }, @@ -419,11 +419,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0301', + operateType: 'Switch_Single_Lock', skinCode: '05', trainingName: 'Single lock of turnout({7})', trainingRemark: 'Single lock of turnout', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '103', tip: 'Right click to select [Single lock of turnout]' }, @@ -433,11 +433,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0302', + operateType: 'Switch_Single_Unlock', skinCode: '05', trainingName: 'Single release of turnout({7})', trainingRemark: 'Single release of turnout', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '104', tip: 'Right click to select [Single release of turnout]' }, @@ -450,11 +450,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0303', + operateType: 'Switch_Section_Block', skinCode: '05', trainingName: 'Turnout section closure({7})', trainingRemark: 'Turnout section closure ', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '105', tip: 'Right click to select [Turnout section closure]' }, @@ -464,11 +464,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0304', + operateType: 'Switch_Section_Unblock', skinCode: '05', trainingName: 'Turnout section unsealing({7})', trainingRemark: 'Turnout section unsealing function', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '106', tip: 'Right click to select [Turnout section unsealing]' }, @@ -481,11 +481,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0305', + operateType: 'Switch_Turn', skinCode: '05', trainingName: 'Turnout rotation({7})', trainingRemark: 'Turnout rotation({15}turn{16})', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '107', tip: 'Right click to select [Turnout rotation]' }, @@ -495,11 +495,11 @@ export default { { maxDuration: 20, minDuration: 10, - operateType: '0306', + operateType: 'Switch_Fault_Unlock', skinCode: '05', trainingName: 'Turnout section fault unlocking({7})', trainingRemark: 'Turnout section fault unlocking function', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '109', tip: 'Right click to select [Turnout section fault unlocking]' }, @@ -512,11 +512,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0307', + operateType: 'Switch_Axis_Pre_Reset', skinCode: '05', trainingName: 'Turnout section axile pre reset({7})', trainingRemark: 'Turnout section axile pre reset function', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '110', tip: 'Right click to select [Turnout section axile pre reset]' }, @@ -529,11 +529,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0308', + operateType: 'Switch_Cut_Off', skinCode: '05', trainingName: 'Section resection({7})', trainingRemark: 'Section resection', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '111', tip: 'Right click to select [Section resection]' }, @@ -543,11 +543,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0309', + operateType: 'Switch_Active', skinCode: '05', trainingName: 'Section activation({7})', trainingRemark: 'Section activation function', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '112', tip: 'Right click to select [Section activation]' }, @@ -557,11 +557,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0310', + operateType: 'Switch_Set_Limit_Speed', skinCode: '05', trainingName: 'Set speed limit on the turnout section({7})', trainingRemark: 'Set speed limit on the section (speed limit value: 5)', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '113', tip: 'Right click to select [Set speed limit on the turnout section]' }, @@ -576,11 +576,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0311', + operateType: 'Switch_Cancel_Limit_Speed', skinCode: '05', trainingName: 'Cancel speed limit on the turnout section({7})', trainingRemark: 'Cancel speed limit on the turnout section', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '114', tip: 'Right click to select [Cancel speed limit on the turnout section]' }, @@ -595,11 +595,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0201', + operateType: 'Signal_Set_Route', skinCode: '05', trainingName: 'Route selection({3})', trainingRemark: 'Route selection', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '301', tip: 'Right click to select [Route selection]' }, @@ -611,11 +611,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0202', + operateType: 'Signal_Cancel_Route', skinCode: '05', trainingName: 'Cancel the route({3})', trainingRemark: 'Cancel the route', - trainingType: '02', + trainingType: 'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '303', tip: 'Right click to select [Cancel the route]' }, @@ -626,11 +626,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0202', + operateType: 'Signal_Cancel_Route', skinCode: '05', trainingName: 'Cancel the route({3})', trainingRemark: 'Cancel the route', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '303', tip: 'Right click to select [Cancel the route]' }, @@ -640,11 +640,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0203', + operateType: 'Signal_Block', skinCode: '05', trainingName: 'Signal closure({5})', trainingRemark: 'Signal closure', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '306', tip: 'Right click to select [Signal closure]' }, @@ -654,11 +654,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0204', + operateType: 'Signal_Unblock', skinCode: '05', trainingName: 'Signal unsealing({5})', trainingRemark: 'Signal unsealing', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '307', tip: 'Right click to select [Signal unsealing]' }, @@ -672,11 +672,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0205', + operateType: 'Signal_Close_Signal', skinCode: '05', trainingName: 'Signal Off({3})', trainingRemark: 'Signal Off', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '313', tip: 'Right click to select [Signal Off]' }, @@ -687,11 +687,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0206', + operateType: 'Signal_Reopen_Signal', skinCode: '05', trainingName: 'Signal reopen({3})', trainingRemark: 'Signal reopen', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '304', tip: 'Right click to select [Signal reopen]' }, @@ -702,11 +702,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0207', + operateType: 'Signal_Set_Guide', skinCode: '05', trainingName: 'Guide route handling({3})', trainingRemark: 'Guide route handling', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '308', tip: 'Right click to select [Guide route handling]' }, @@ -719,11 +719,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0208', + operateType: 'Signal_Open_Auto_Setting', skinCode: '05', trainingName: 'Start automatic routing({5})', trainingRemark: 'Start automatic routing', - trainingType: '02', + trainingType: 'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '315', tip: 'Right click to select [Start automatic routing]' }, @@ -734,11 +734,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0209', + operateType: 'Signal_Close_Auto_Setting', skinCode: '05', trainingName: 'Close automatic routing({5})', trainingRemark: 'Close automatic routing', - trainingType: '02', + trainingType: 'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '314', tip: 'Right click to select [Close automatic routing]' }, @@ -749,11 +749,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0210', + operateType: 'Signal_Find_Routes_Status', skinCode: '05', trainingName: 'Route control status query({5})', trainingRemark: 'Query the route control status ', - trainingType: '02', + trainingType: 'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '316', tip: 'Right click to select [Route control status query]' }, @@ -763,11 +763,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0211', + operateType: 'Signal_Set_CI_Auto', skinCode: '05', trainingName: 'Set Interlock for Auto Routing({5})', trainingRemark: 'Set Interlock for Auto Routing', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '309', tip: 'Right click to select [Set Interlock for Auto Routing]' }, @@ -777,11 +777,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0212', + operateType: 'Signal_Cancel_CI_Auto', skinCode: '05', trainingName: 'Cancel Interlock setting for Auto Routing({5})', trainingRemark: 'Cancel Interlock setting for Auto Routing', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '310', tip: 'Right click to select [Cancel Interlock setting for Auto Routing]' }, @@ -791,11 +791,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0213', + operateType: 'Signal_Set_CI_Auto_Trigger', skinCode: '05', trainingName: 'Set Interlock for Auto Trigger({5})', trainingRemark: 'Set Interlock for Auto Trigger', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '311', tip: 'Right click to select [Set Interlock for Auto Trigger]' }, @@ -805,11 +805,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0214', + operateType: 'Signal_Cancel_CI_Auto_Trigger', skinCode: '05', trainingName: 'Cancel Interlock setting for Auto Trigger({5})', trainingRemark: 'Cancel Interlock setting for Auto Trigger', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '312', tip: 'Right click to select[Cancel Interlock setting for Auto Trigger]' }, diff --git a/src/jmapNew/theme/xian_01/operationConfig.js b/src/jmapNew/theme/xian_01/operationConfig.js index b038248fa..dfbe061c1 100644 --- a/src/jmapNew/theme/xian_01/operationConfig.js +++ b/src/jmapNew/theme/xian_01/operationConfig.js @@ -1,42 +1,13 @@ -// 操作规则定义 -// {id: "1", trainingType: "01", name: "车站名称"} -// {id: "2", trainingType: "01", name: "车站控制模式编号"} -// {id: "3", trainingType: "02", name: "进路名称"} -// {id: "4", trainingType: "02", name: "进路编号"} -// {id: "5", trainingType: "02", name: "信号机名称"} -// {id: "6", trainingType: "02", name: "信号机编号"} - -// {id: "7", trainingType: "03", name: "道岔名称"} -// {id: "17", trainingType: "03", name: "道岔编码"} -// {id: "15", trainingType: "03", name: "道岔位置"} -// {id: "16", trainingType: "03", name: "道岔位置(反)"} -// {id: "21", trainingType: "03", name: "车站名称"} -// {id: "23", trainingType: "03", name: "车站编号"} -// {id: "24", trainingType: "03", name: "道岔计轴区段编号"} -// {id: "25", trainingType: "03", name: "道岔计轴区段名称"} - -// {id: "8", trainingType: "04", name: "物理区段名称"} -// {id: "9", trainingType: "04", name: "逻辑区段名称"} -// {id: "18", trainingType: "04", name: "逻辑区段编码"} -// {id: "19", trainingType: "04", name: "区段编号"} -// {id: "20", trainingType: "04", name: "车站名称"} -// {id: "22", trainingType: "04", name: "车站编号"} - -// {id: "10", trainingType: "05", name: "车站名称"} -// {id: "11", trainingType: "05", name: "站台行驶方向编号"} -// {id: "12", trainingType: "05", name: "站台行驶方向"} -// {id: "13", trainingType: "05", name: "站台行驶方向编号(反)"} -// {id: "14", trainingType: "05", name: "站台行驶方向(反)"} export default { list: [ { maxDuration: 20, minDuration: 15, - operateType: '0103', + operateType: 'CM_Apply_For_Center_Control', skinCode: '02', trainingName: '转为中控({1})', trainingRemark: '控制权限转换，站控转中控', - trainingType: '01', + trainingType: 'ControlConvertMenu', productTypes: ['02'], stepVOList: [ { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: '鼠标左键点击顶部菜单栏【控制模式转换】' }, @@ -51,11 +22,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0101', + operateType: 'CM_Apply_For_Station_Control', skinCode: '02', trainingName: '转为站控({1})', trainingRemark: '控制权限转换，中控转站控', - trainingType: '01', + trainingType: 'ControlConvertMenu', productTypes: ['01'], stepVOList: [ { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: '鼠标左键点击顶部菜单栏【控制模式转换】' }, @@ -70,11 +41,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0102', + operateType: 'CM_Force_Station_Control', skinCode: '02', trainingName: '强制站控({1})', trainingRemark: '控制权限转换，强制站控', - trainingType: '01', + trainingType: 'ControlConvertMenu', productTypes: ['01'], stepVOList: [ { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: '鼠标左键点击顶部菜单栏【控制模式转换】' }, @@ -90,11 +61,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0501', + operateType: 'Stand_Set_Hold_Train', skinCode: '02', trainingName: '站台扣车({10}-{12}站台)', trainingRemark: '设置扣车功能', - trainingType: '05', + trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【扣车】' }, @@ -104,11 +75,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0502', + operateType: 'Stand_Cancel_Hold_Train', skinCode: '02', trainingName: '站台取消扣车({10}-{12}站台)', trainingRemark: '设置取消扣车功能', - trainingType: '05', + trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' }, @@ -118,11 +89,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0503', + operateType: 'Stand_Force_Cancel_Hold_Train', skinCode: '02', trainingName: '强制取消扣车({10}-{12}站台)', trainingRemark: '强制取消扣车功能', - trainingType: '05', + trainingType: 'Stand', productTypes: ['01'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '506', tip: '鼠标右键菜单选择【强制取消扣车】' }, @@ -132,68 +103,68 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0504', + operateType: 'Stand_Whole_Line_Cancel_Hold_Train', skinCode: '02', trainingName: '全线取消扣车({10}-{12}站台)', trainingRemark: '全线取消扣车功能(默认上行全线/下行全线，不做选择)', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '508', tip: '鼠标右键菜单选择【全线取消扣车】' }, - { deviceType: '06', orderNum: 2, operateCode: '508', tip: '鼠标左键点击【确定】按钮', val: '{11}' } + { deviceType: '06', orderNum: 2, operateCode: '508', tip: '鼠标左键点击【确定】按钮' } ] }, { maxDuration: 15, minDuration: 8, - operateType: '0504', + operateType: 'Stand_Whole_Line_Cancel_Hold_Train', skinCode: '02', trainingName: '全线取消扣车({10}-{12}站台)', trainingRemark: '全线取消扣车功能(选择上/下行全线)', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '508', tip: '鼠标右键菜单选择【全线取消扣车】' }, { deviceType: '06', orderNum: 2, operateCode: '5081', tip: '鼠标右键菜单选择【{14}全线】', val: '{13}' }, - { deviceType: '06', orderNum: 3, operateCode: '508', tip: '鼠标左键点击【确定】按钮', val: '{13}' } + { deviceType: '06', orderNum: 3, operateCode: '508', tip: '鼠标左键点击【确定】按钮' } ] }, { maxDuration: 15, minDuration: 8, - operateType: '0505', + operateType: 'Stand_Set_Jump_Stop', skinCode: '02', trainingName: '站台跳停({10}-{12}站台)', trainingRemark: '设置跳停功能', - trainingType: '05', + trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【跳停】' }, - { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮', val: '{11}' } + { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮'} ] }, { maxDuration: 15, minDuration: 8, - operateType: '0506', + operateType: 'Stand_Cancel_Jump_Stop', skinCode: '02', trainingName: '取消跳停({10}-{12}站台)', trainingRemark: '设置取消跳停功能', - trainingType: '05', + trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' }, - { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮', val: '{11}' } + { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮'} ] }, { maxDuration: 8, minDuration: 5, - operateType: '0507', + operateType: 'Stand_View_Status', skinCode: '02', trainingName: '查询站台状态({10}-{12}站台)', trainingRemark: '查询站台状态功能', - trainingType: '05', + trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【查询站台状态】' }, @@ -203,44 +174,44 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0508', + operateType: 'Stand_Set_Park_Time', skinCode: '02', trainingName: '设置停站时间({10}-{12}站台)', trainingRemark: '设置停站时间(自动, 一直有效)', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' }, { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【自动】', val: '01' }, - { deviceType: '06', orderNum: 3, operateCode: '509', tip: '鼠标左键点击【确认】按钮', val: '01::20::true' }, - { deviceType: '06', orderNum: 4, operateCode: '5091', tip: '鼠标左键点击【确认】按钮', val: '01::20::true' } + { deviceType: '06', orderNum: 3, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }, + { deviceType: '06', orderNum: 4, operateCode: '5091', tip: '鼠标左键点击【确认】按钮' } ] }, { maxDuration: 15, minDuration: 8, - operateType: '0508', + operateType: 'Stand_Set_Park_Time', skinCode: '02', trainingName: '设置停站时间({10}-{12}站台)', trainingRemark: '设置停站时间(人工, 20秒, 一直有效)', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' }, { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【人工】', val: '02' }, { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' }, - { deviceType: '06', orderNum: 4, operateCode: '509', tip: '鼠标左键点击【确认】按钮', val: '02::20::true' }, - { deviceType: '06', orderNum: 5, operateCode: '5091', tip: '鼠标左键点击【确认】按钮', val: '02::20::true' } + { deviceType: '06', orderNum: 4, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }, + { deviceType: '06', orderNum: 5, operateCode: '5091', tip: '鼠标左键点击【确认】按钮'} ] }, { maxDuration: 15, minDuration: 8, - operateType: '0508', + operateType: 'Stand_Set_Park_Time', skinCode: '02', trainingName: '设置停站时间({10}-{12}站台)', trainingRemark: '设置停站时间(人工, 20秒, 一次有效)', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' }, @@ -254,44 +225,44 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0509', + operateType: 'Stand_Set_Run_Time', skinCode: '02', trainingName: '设置运行等级({10}-{12}站台)', trainingRemark: '设置运行等级(设置区间运行时间为60，一直有效)', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' }, { deviceType: '06', orderNum: 2, operateCode: '5101', tip: '鼠标左键点击，选择【60】', val: '60' }, - { deviceType: '06', orderNum: 3, operateCode: '510', tip: '鼠标左键点击【确认】按钮', val: '60::true' }, - { deviceType: '06', orderNum: 4, operateCode: '5102', tip: '鼠标左键点击【确认】按钮', val: '60::true' } + { deviceType: '06', orderNum: 3, operateCode: '510', tip: '鼠标左键点击【确认】按钮'}, + { deviceType: '06', orderNum: 4, operateCode: '5102', tip: '鼠标左键点击【确认】按钮'} ] }, + // { + // maxDuration: 15, + // minDuration: 8, + // operateType: 'Stand_Set_Run_Time', + // skinCode: '02', + // trainingName: '设置运行等级({10}-{12}站台)', + // trainingRemark: '设置运行等级(设置区间运行时间为60，一次有效)', + // trainingType: 'Stand', + // productTypes: ['02'], + // stepVOList: [ + // { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' }, + // { deviceType: '06', orderNum: 2, operateCode: '5101', tip: '鼠标左键点击，选择【60】', val: '60' }, + // { deviceType: '06', orderNum: 3, operateCode: '5103', tip: '鼠标左键点击，取消选择【一直有效】', val: 'false' }, + // { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮', val: '60::false' }, + // { deviceType: '06', orderNum: 5, operateCode: '5102', tip: '鼠标左键点击【确认】按钮', val: '60::false' } + // ] + // }, { maxDuration: 15, minDuration: 8, - operateType: '0509', - skinCode: '02', - trainingName: '设置运行等级({10}-{12}站台)', - trainingRemark: '设置运行等级(设置区间运行时间为60，一次有效)', - trainingType: '05', - productTypes: ['02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' }, - { deviceType: '06', orderNum: 2, operateCode: '5101', tip: '鼠标左键点击，选择【60】', val: '60' }, - { deviceType: '06', orderNum: 3, operateCode: '5103', tip: '鼠标左键点击，取消选择【一直有效】', val: 'false' }, - { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮', val: '60::false' }, - { deviceType: '06', orderNum: 5, operateCode: '5102', tip: '鼠标左键点击【确认】按钮', val: '60::false' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0510', + operateType: 'Stand_Early_Depart', skinCode: '02', trainingName: '设置提前发车({10}-{12}站台)', trainingRemark: '设置提前发车功能', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【设置提前发车】' }, @@ -301,11 +272,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0511', + operateType: 'Stand_Set_Reentry_Strategy', skinCode: '02', trainingName: '人工折返策略设置({10}-{12}站台)', trainingRemark: '人工折返策略设置功能', - trainingType: '05', + trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '511', tip: '鼠标右键菜单选择【人工折返策略设置】' }, @@ -317,11 +288,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0401', + operateType: 'Section_Fault_Unlock', skinCode: '02', trainingName: '区段故障解锁({8}{9})', trainingRemark: '故障解锁功能', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' }, @@ -334,11 +305,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0402', + operateType: 'Section_Cut_Off', skinCode: '02', trainingName: '区段切除({8}{9})', trainingRemark: '区段切除', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【区段切除】' }, @@ -348,11 +319,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0403', + operateType: 'Section_Active', skinCode: '02', trainingName: '区段激活({8}{9})', trainingRemark: '区段激活功能', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段激活】' }, @@ -362,11 +333,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0404', + operateType: 'Section_Axis_Pre_Reset', skinCode: '02', trainingName: '计轴预复位({8}{9})', trainingRemark: '计轴预复位功能', - trainingType: '04', + trainingType: 'Section', productTypes: ['01'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '409', tip: '鼠标右键菜单选择【区段计轴预复位】' }, @@ -379,11 +350,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0405', + operateType: 'Section_Block', skinCode: '02', trainingName: '区段封锁({8}{9})', trainingRemark: '区段封锁功能', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '403', tip: '鼠标右键菜单选择【区段封锁】' }, @@ -393,11 +364,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0406', + operateType: 'Section_Unblock', skinCode: '02', trainingName: '区段解封({8}{9})', trainingRemark: '区段解封功能', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' }, @@ -410,11 +381,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0407', + operateType: 'Section_Set_Limit_Speed', skinCode: '02', trainingName: '区段设置限速({8}{9})', trainingRemark: '区段设置限速功能（限速值：5）', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【区段设置限速】' }, @@ -429,11 +400,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0408', + operateType: 'Section_Cancel_Limit_Speed', skinCode: '02', trainingName: '区段取消限速({8}{9})', trainingRemark: '区段取消限速功能', - trainingType: '04', + trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '408', tip: '鼠标右键菜单选择【区段取消限速】' }, @@ -448,11 +419,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0301', + operateType: 'Switch_Single_Lock', skinCode: '02', trainingName: '道岔单锁({7})', trainingRemark: '道岔单锁功能', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' }, @@ -462,11 +433,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0302', + operateType: 'Switch_Single_Unlock', skinCode: '02', trainingName: '道岔单解({7})', trainingRemark: '道岔单解功能', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔单解】' }, @@ -479,11 +450,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0303', + operateType: 'Switch_Section_Block', skinCode: '02', trainingName: '道岔区段封闭({7})', trainingRemark: '道岔区段封闭功能', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔区段封闭】' }, @@ -493,11 +464,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0304', + operateType: 'Switch_Section_Unblock', skinCode: '02', trainingName: '道岔区段解封({7})', trainingRemark: '道岔区段解封功能', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔区段解封】' }, @@ -510,11 +481,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0305', + operateType: 'Switch_Turn', skinCode: '02', trainingName: '道岔转动({7})', trainingRemark: '道岔转动功能({15}转{16})', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '107', tip: '鼠标右键菜单选择【道岔转动】' }, @@ -524,11 +495,11 @@ export default { { maxDuration: 20, minDuration: 10, - operateType: '0306', + operateType: 'Switch_Fault_Unlock', skinCode: '02', trainingName: '道岔区段故障解锁({7})', trainingRemark: '道岔区段故障解锁功能', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【道岔区段故障解锁】' }, @@ -541,11 +512,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0307', + operateType: 'Switch_Axis_Pre_Reset', skinCode: '02', trainingName: '道岔区段计轴预复位({7})', trainingRemark: '道岔区段计轴预复位功能', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '110', tip: '鼠标右键菜单选择【道岔区段计轴预复位】' }, @@ -558,11 +529,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0308', + operateType: 'Switch_Cut_Off', skinCode: '02', trainingName: '区段切除({7})', trainingRemark: '区段切除', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【区段切除】' }, @@ -572,11 +543,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0309', + operateType: 'Switch_Active', skinCode: '02', trainingName: '区段激活({7})', trainingRemark: '区段激活功能', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【区段激活】' }, @@ -586,11 +557,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0310', + operateType: 'Switch_Set_Limit_Speed', skinCode: '02', trainingName: '道岔区段设置限速({7})', trainingRemark: '道岔区段设置限速功能（限速值：5）', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' }, @@ -605,11 +576,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0311', + operateType: 'Switch_Cancel_Limit_Speed', skinCode: '02', trainingName: '道岔区段取消限速({7})', trainingRemark: '道岔区段取消限速功能', - trainingType: '03', + trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: '114', tip: '鼠标右键菜单选择【道岔区段取消限速】' }, @@ -624,11 +595,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0201', + operateType: 'Signal_Set_Route', skinCode: '02', trainingName: '进路选排({3})', trainingRemark: '选择排列进路', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【进路选排】' }, @@ -640,11 +611,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0202', + operateType: 'Signal_Cancel_Route', skinCode: '02', trainingName: '进路取消({3})', trainingRemark: '进路取消', - trainingType: '02', + trainingType: 'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【进路取消】' }, @@ -655,11 +626,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0202', + operateType: 'Signal_Cancel_Route', skinCode: '02', trainingName: '进路取消({3})', trainingRemark: '进路取消', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【进路取消】' }, @@ -669,11 +640,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0203', + operateType: 'Signal_Block', skinCode: '02', trainingName: '信号封闭({5})', trainingRemark: '信号封闭', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封闭】' }, @@ -683,11 +654,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0204', + operateType: 'Signal_Unblock', skinCode: '02', trainingName: '信号解封({5})', trainingRemark: '信号解封', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' }, @@ -701,11 +672,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0205', + operateType: 'Signal_Close_Signal', skinCode: '02', trainingName: '信号关灯({3})', trainingRemark: '信号关灯', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '313', tip: '鼠标右键菜单选择【信号关灯】' }, @@ -716,11 +687,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0206', + operateType: 'Signal_Reopen_Signal', skinCode: '02', trainingName: '信号重开({3})', trainingRemark: '信号重开', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' }, @@ -731,11 +702,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0207', + operateType: 'Signal_Set_Guide', skinCode: '02', trainingName: '引导进路办理({3})', trainingRemark: '进路办理信号引导', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【引导进路办理】' }, @@ -748,11 +719,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0208', + operateType: 'Signal_Open_Auto_Setting', skinCode: '02', trainingName: '自排开({5})', trainingRemark: '自排开', - trainingType: '02', + trainingType: 'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【自排开】' }, @@ -763,11 +734,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0209', + operateType: 'Signal_Close_Auto_Setting', skinCode: '02', trainingName: '自排关({5})', trainingRemark: '自排关', - trainingType: '02', + trainingType: 'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【自排关】' }, @@ -778,11 +749,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0210', + operateType: 'Signal_Find_Routes_Status', skinCode: '02', trainingName: '查询进路控制状态({5})', trainingRemark: '查询进路控制状态', - trainingType: '02', + trainingType: 'Signal', productTypes: ['02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制模式】' }, @@ -792,11 +763,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0211', + operateType: 'Signal_Set_CI_Auto', skinCode: '02', trainingName: '设置联锁自动进路({5})', trainingRemark: '设置联锁自动进路', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【设置联锁自动进路】' }, @@ -806,11 +777,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0212', + operateType: 'Signal_Cancel_CI_Auto', skinCode: '02', trainingName: '取消联锁自动进路({5})', trainingRemark: '取消联锁自动进路', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【取消联锁自动进路】' }, @@ -820,11 +791,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0213', + operateType: 'Signal_Set_CI_Auto_Trigger', skinCode: '02', trainingName: '设置联锁自动触发({5})', trainingRemark: '设置联锁自动触发', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '311', tip: '鼠标右键菜单选择【设置联锁自动触发】' }, @@ -834,11 +805,11 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: '0214', + operateType: 'Signal_Cancel_CI_Auto_Trigger', skinCode: '02', trainingName: '取消联锁自动触发({5})', trainingRemark: '取消联锁自动触发', - trainingType: '02', + trainingType: 'Signal', productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '312', tip: '鼠标右键菜单选择【取消联锁自动触发】' }, diff --git a/src/jmapNew/theme/xian_01/operationConfigGlobal.js b/src/jmapNew/theme/xian_01/operationConfigGlobal.js deleted file mode 100644 index e99041826..000000000 --- a/src/jmapNew/theme/xian_01/operationConfigGlobal.js +++ /dev/null @@ -1,820 +0,0 @@ -export default { - list: [ - { - maxDuration: 20, - minDuration: 15, - operateType: '0103', - skinCode: '05', - trainingName: 'Switch to central control ({1})', - trainingRemark: 'Control permission conversion, switch station control to central control', - trainingType: '01', - productTypes: ['02'], - stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Left click the menu bar [control mode conversion]on the top' }, - { deviceType: 'bar', orderNum: 2, operateCode: '2041', tip: 'Left click [switch to central control] ' }, - { deviceType: '05', orderNum: 3, operateCode: '2042', tip: 'Left click to select the control area to be converted【{1}】', val: '{2}' }, - { deviceType: '05', orderNum: 4, operateCode: '204', tip: 'Left click [request to central control] ', val: '{2}' }, - { deviceType: '05', orderNum: 5, operateCode: '2043', tip: 'Left click [confirm]', val: '{2}' }, - { deviceType: '05', orderNum: 6, operateCode: '0013', tip: 'Left click [confirm]' }, - { deviceType: 'bar', orderNum: 7, operateCode: '000', tip: 'Left click [close] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0101', - skinCode: '05', - trainingName: 'Switch to station control ({1})', - trainingRemark: 'Control permission conversion, Force to station control', - trainingType: '01', - productTypes: ['01'], - stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Left click the menu bar [control mode conversion]on the top' }, - { deviceType: 'bar', orderNum: 2, operateCode: '2021', tip: 'Left click [switch to station control' }, - { deviceType: '05', orderNum: 3, operateCode: '2022', tip: 'Left click to select the control area to be converted【{1}】', val: '{2}' }, - { deviceType: '05', orderNum: 4, operateCode: '202', tip: 'Left click [request to station control', val: '{2}' }, - { deviceType: '05', orderNum: 5, operateCode: '2023', tip: 'Left click [confirm] ', val: '{2}' }, - { deviceType: '05', orderNum: 6, operateCode: '0013', tip: 'Left click [confirm] ' }, - { deviceType: 'bar', orderNum: 7, operateCode: '000', tip: 'Left click [close] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0102', - skinCode: '05', - trainingName: 'Force to station control ({1})', - trainingRemark: 'Control permission conversion,Force to station control', - trainingType: '01', - productTypes: ['01'], - stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: '0024', tip: 'Left click the menu bar [control mode conversion]on the top' }, - { deviceType: 'bar', orderNum: 2, operateCode: '2034', tip: 'Left click[Force to station control]' }, - { deviceType: 'bar', orderNum: 3, operateCode: '2035', tip: 'Left click to input the password [123456],then left click the [confirm]' }, - { deviceType: '05', orderNum: 4, operateCode: '2032', tip: 'Left click to select the control area to be converted【{1}】', val: '{2}' }, - { deviceType: '05', orderNum: 5, operateCode: '203', tip: 'Left click [Foece to station control', val: '{2}' }, - { deviceType: '05', orderNum: 6, operateCode: '2033', tip: 'Left click [confirm] ', val: '{2}' }, - { deviceType: '05', orderNum: 7, operateCode: '0013', tip: 'Left click [confirm] ' }, - { deviceType: 'bar', orderNum: 8, operateCode: '000', tip: 'Left click [close] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0501', - skinCode: '05', - trainingName: 'Detain Train({10}-{12}station)', - trainingRemark: 'Set the detaining function', - trainingType: '05', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '504', tip: 'Right click to select [Detain Train]' }, - { deviceType: '06', orderNum: 2, operateCode: '504', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0502', - skinCode: '05', - trainingName: 'Cancel Detaining({10}-{12}The platform)', - trainingRemark: 'Set cancelling detaining function', - trainingType: '05', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '505', tip: 'Right click to select [Cancel Detaining]]' }, - { deviceType: '06', orderNum: 2, operateCode: '505', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0503', - skinCode: '05', - trainingName: 'Force Canceling Detaining({10}-{12}The platform)', - trainingRemark: 'Force to cancel train detaining function', - trainingType: '05', - productTypes: ['01'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '506', tip: 'Right click to select [Force Canceling Detaining]' }, - { deviceType: '06', orderNum: 2, operateCode: '506', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0504', - skinCode: '05', - trainingName: 'Cancel train detaining along the whole line({10}-{12}The platform)', - trainingRemark: 'Cancel train detaining along the whole line (default the whole uplink and downlink )', - trainingType: '05', - productTypes: ['02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '508', tip: 'Right click to select [Cancel train detaining along the whole line]' }, - { deviceType: '06', orderNum: 2, operateCode: '508', tip: 'Left click [confirm] ', val: '{11}' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0504', - skinCode: '05', - trainingName: 'Cancel train detaining along the whole line({10}-{12}The platform)', - trainingRemark: 'Cancel train detaining along the whole line (select the uplink or downlink ))', - trainingType: '05', - productTypes: ['02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '508', tip: 'Right click to select [Cancel train detaining along the whole line]' }, - { deviceType: '06', orderNum: 2, operateCode: '5081', tip: 'Right click to select[{14}the whole line', val: '{13}' }, - { deviceType: '06', orderNum: 3, operateCode: '508', tip: 'Left click [confirm]', val: '{13}' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0505', - skinCode: '05', - trainingName: 'Skip this station to continue moving({10}-{12}The platform)', - trainingRemark: 'Set the skip to continue moving function', - trainingType: '05', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '502', tip: 'Right click to select [Skip this station to continue moving]' }, - { deviceType: '06', orderNum: 2, operateCode: '502', tip: 'Left click [confirm]', val: '{11}' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0506', - skinCode: '05', - trainingName: 'Cancel skiping({10}-{12}The platform)', - trainingRemark: 'Set cancelling skiping function', - trainingType: '05', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '503', tip: 'Right click to select [Cancel skiping]' }, - { deviceType: '06', orderNum: 2, operateCode: '503', tip: 'Left click [confirm]', val: '{11}' } - ] - }, - { - maxDuration: 8, - minDuration: 5, - operateType: '0507', - skinCode: '05', - trainingName: 'Query Platform status({10}-{12}The platform)', - trainingRemark: 'Query platform status function', - trainingType: '05', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '507', tip: 'Right click to select [Query Platform status]' }, - { deviceType: '06', orderNum: 2, operateCode: '0012', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0508', - skinCode: '05', - trainingName: 'Set the stop time({10}-{12}The platform)', - trainingRemark: 'Set the stop time (auto, permanent validity)', - trainingType: '05', - productTypes: ['02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right click to select [Set the stop time]' }, - { deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Left click to select [auto]', val: '01' }, - { deviceType: '06', orderNum: 3, operateCode: '509', tip: 'Left click [confirm] ', val: '01::20::true' }, - { deviceType: '06', orderNum: 4, operateCode: '5091', tip: 'Left click [confirm] ', val: '01::20::true' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0508', - skinCode: '05', - trainingName: 'Set the stop time({10}-{12}The platform)', - trainingRemark: 'Set the stop time (manual, 20 seconds, permanent validity)', - trainingType: '05', - productTypes: ['02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right click to select [Set the stop time]' }, - { deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Left click to select [manual]', val: '02' }, - { deviceType: '06', orderNum: 3, operateCode: '5094', tip: 'Set time [20]', val: '20' }, - { deviceType: '06', orderNum: 4, operateCode: '509', tip: 'Left click [confirm] ', val: '02::20::true' }, - { deviceType: '06', orderNum: 5, operateCode: '5091', tip: 'Left click [confirm]', val: '02::20::true' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0508', - skinCode: '05', - trainingName: 'Set the stop time({10}-{12}The platform)', - trainingRemark: 'Set the stop time (manual, 20 seconds, once valid )', - trainingType: '05', - productTypes: ['02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '509', tip: 'Right click to select [Set the stop time]' }, - { deviceType: '06', orderNum: 2, operateCode: '5092', tip: 'Left click to select [manual]', val: '02' }, - { deviceType: '06', orderNum: 3, operateCode: '5094', tip: 'Set time [20]', val: '20' }, - { deviceType: '06', orderNum: 4, operateCode: '5093', tip: 'Left click to select "once valid ".', val: 'false' }, - { deviceType: '06', orderNum: 5, operateCode: '509', tip: 'Left click [confirm] ', val: '02::20::false' }, - { deviceType: '06', orderNum: 6, operateCode: '5091', tip: 'Left click [confirm] ', val: '02::20::false' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0509', - skinCode: '05', - trainingName: 'Set Operation speed Level({10}-{12}The platform)', - trainingRemark: 'Set Operation speed Level(set the interval running time to 60, permanent validity)', - trainingType: '05', - productTypes: ['02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '510', tip: 'Right click to select [Set Operation speed Level]' }, - { deviceType: '06', orderNum: 2, operateCode: '5101', tip: 'Left click to select [60]', val: '60' }, - { deviceType: '06', orderNum: 3, operateCode: '510', tip: 'Left click [confirm] ', val: '60::true' }, - { deviceType: '06', orderNum: 4, operateCode: '5102', tip: 'Left click [confirm] ', val: '60::true' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0509', - skinCode: '05', - trainingName: 'Set Operation speed Level({10}-{12}The platform)', - trainingRemark: 'Set Operation speed Level (set the interval running time to 60, once valid )', - trainingType: '05', - productTypes: ['02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '510', tip: 'Right click to select [Set Operation speed Level]' }, - { deviceType: '06', orderNum: 2, operateCode: '5101', tip: 'Left click to select [60]', val: '60' }, - { deviceType: '06', orderNum: 3, operateCode: '5103', tip: 'Left click to cancel [permanent validity].', val: 'false' }, - { deviceType: '06', orderNum: 4, operateCode: '510', tip: 'Left click [confirm] ', val: '60::false' }, - { deviceType: '06', orderNum: 5, operateCode: '5102', tip: 'Left click [confirm] ', val: '60::false' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0510', - skinCode: '05', - trainingName: 'Set departure in advance({10}-{12}The platform)', - trainingRemark: 'Set departure inadvance function', - trainingType: '05', - productTypes: ['02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '501', tip: 'Right click to select [Set departure in advance]' }, - { deviceType: '06', orderNum: 2, operateCode: '501', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0511', - skinCode: '05', - trainingName: 'Manual return strategy setting({10}-{12}The platform)', - trainingRemark: 'Manual return strategy setting function', - trainingType: '05', - productTypes: ['02'], - stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '511', tip: 'Right click to select [Manual return strategy setting]' }, - { deviceType: '06', orderNum: 2, operateCode: '5111', tip: 'Left click to select [No return]".', val: '01' }, - { deviceType: '06', orderNum: 3, operateCode: '511', tip: 'Left click [confirm] ', val: '01' } - ] - }, - - { - maxDuration: 15, - minDuration: 8, - operateType: '0401', - skinCode: '05', - trainingName: 'Section fault unlocking({8}{9})', - trainingRemark: 'Fault unlocking', - trainingType: '04', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '402', tip: 'Right click to select [Section fault unlocking]' }, - { deviceType: '03', orderNum: 2, operateCode: '4026', tip: 'Left click [Execute] ' }, - { deviceType: '03', orderNum: 3, operateCode: '4024', tip: 'Left click [ok 1] ' }, - { deviceType: '03', orderNum: 4, operateCode: '4025', tip: 'Left click [ok 2] ' }, - { deviceType: '03', orderNum: 5, operateCode: '001', tip: 'Left click [close] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0402', - skinCode: '05', - trainingName: 'Section resection({8}{9})', - trainingRemark: 'Section resection', - trainingType: '04', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '405', tip: 'Right click to select [Section resection]' }, - { deviceType: '03', orderNum: 2, operateCode: '405', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0403', - skinCode: '05', - trainingName: 'Section activation({8}{9})', - trainingRemark: 'Section activation function', - trainingType: '04', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '406', tip: 'Right click to select [Section activation]' }, - { deviceType: '03', orderNum: 2, operateCode: '406', tip: 'Left click [confirm]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0404', - skinCode: '05', - trainingName: 'Axis pre-reset({8}{9})', - trainingRemark: 'Axis pre-reset function', - trainingType: '04', - productTypes: ['01'], - stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '409', tip: 'Right click to select [Axis pre-reset]' }, - { deviceType: '03', orderNum: 2, operateCode: '4091', tip: 'Left click [Execute]' }, - { deviceType: '03', orderNum: 3, operateCode: '4093', tip: 'Left click [confirm1]' }, - { deviceType: '03', orderNum: 4, operateCode: '4094', tip: 'Left click [confirm2]' }, - { deviceType: '03', orderNum: 5, operateCode: '001', tip: 'Left click [close]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0405', - skinCode: '05', - trainingName: 'Section blockade({8}{9})', - trainingRemark: 'Section blockade function', - trainingType: '04', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '403', tip: 'Right click to select [Section blockade]' }, - { deviceType: '03', orderNum: 2, operateCode: '403', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0406', - skinCode: '05', - trainingName: 'Section unblockade({8}{9})', - trainingRemark: 'Section unblockade function', - trainingType: '04', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '404', tip: 'Right click to select [Section unblockade]' }, - { deviceType: '03', orderNum: 2, operateCode: '4041', tip: 'Left click [Execute]' }, - { deviceType: '03', orderNum: 3, operateCode: '4043', tip: 'Left click [confirm1]' }, - { deviceType: '03', orderNum: 4, operateCode: '4044', tip: 'Left click [confirm2]' }, - { deviceType: '03', orderNum: 5, operateCode: '001', tip: 'Left click [close]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0407', - skinCode: '05', - trainingName: 'Set speed limit on the section({8}{9})', - trainingRemark: 'Set speed limit on the section (speed limit value: 5)', - trainingType: '04', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '407', tip: 'Right click to select [Set speed limit on the section]' }, - { deviceType: '03', orderNum: 2, operateCode: '4076', tip: 'Left click to select [speed limit 5] ', val: '5' }, - { deviceType: '03', orderNum: 3, operateCode: '4071', tip: 'Left click [Execute]' }, - { deviceType: '03', orderNum: 4, operateCode: '4072', tip: 'Left click [confirm]' }, - { deviceType: '03', orderNum: 5, operateCode: '4073', tip: 'Left click [confirm1]' }, - { deviceType: '03', orderNum: 6, operateCode: '4074', tip: 'Left click [confirm2]', val: '5' }, - { deviceType: '03', orderNum: 7, operateCode: '001', tip: 'Left click [close]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0408', - skinCode: '05', - trainingName: 'Cancel speed limit on the section({8}{9})', - trainingRemark: 'Cancel speed limit on the section', - trainingType: '04', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '408', tip: 'Right click to select [Cancel speed limit on the section]' }, - { deviceType: '03', orderNum: 2, operateCode: '4081', tip: 'Left click [Execute]' }, - { deviceType: '03', orderNum: 3, operateCode: '4082', tip: 'Left click [confirm] ' }, - { deviceType: '03', orderNum: 4, operateCode: '4083', tip: 'Left click [confirm1]' }, - { deviceType: '03', orderNum: 5, operateCode: '4084', tip: 'Left click [confirm2]', val: '5' }, - { deviceType: '03', orderNum: 6, operateCode: '001', tip: 'Left click [close]' } - ] - }, - - { - maxDuration: 15, - minDuration: 8, - operateType: '0301', - skinCode: '05', - trainingName: 'Single lock of turnout({7})', - trainingRemark: 'Single lock of turnout', - trainingType: '03', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '103', tip: 'Right click to select [Single lock of turnout]' }, - { deviceType: '02', orderNum: 2, operateCode: '103', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0302', - skinCode: '05', - trainingName: 'Single release of turnout({7})', - trainingRemark: 'Single release of turnout', - trainingType: '03', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '104', tip: 'Right click to select [Single release of turnout]' }, - { deviceType: '02', orderNum: 2, operateCode: '1041', tip: 'Left click [Execute]' }, - { deviceType: '02', orderNum: 3, operateCode: '1043', tip: 'Left click [confirm1] ' }, - { deviceType: '02', orderNum: 4, operateCode: '1044', tip: 'Left click [confirm2] ' }, - { deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Left click [close] '} - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0303', - skinCode: '05', - trainingName: 'Turnout section closure({7})', - trainingRemark: 'Turnout section closure ', - trainingType: '03', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '105', tip: 'Right click to select [Turnout section closure]' }, - { deviceType: '02', orderNum: 2, operateCode: '105', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0304', - skinCode: '05', - trainingName: 'Turnout section unsealing({7})', - trainingRemark: 'Turnout section unsealing function', - trainingType: '03', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '106', tip: 'Right click to select [Turnout section unsealing]' }, - { deviceType: '02', orderNum: 2, operateCode: '1061', tip: 'Left click [Execute]' }, - { deviceType: '02', orderNum: 3, operateCode: '1063', tip: 'Left click [confirm1]' }, - { deviceType: '02', orderNum: 4, operateCode: '1064', tip: 'Left click [confirm2]' }, - { deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Left click [close]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0305', - skinCode: '05', - trainingName: 'Turnout rotation({7})', - trainingRemark: 'Turnout rotation({15}turn{16})', - trainingType: '03', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '107', tip: 'Right click to select [Turnout rotation]' }, - { deviceType: '02', orderNum: 2, operateCode: '107', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 20, - minDuration: 10, - operateType: '0306', - skinCode: '05', - trainingName: 'Turnout section fault unlocking({7})', - trainingRemark: 'Turnout section fault unlocking function', - trainingType: '03', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '109', tip: 'Right click to select [Turnout section fault unlocking]' }, - { deviceType: '02', orderNum: 2, operateCode: '1091', tip: 'Left click [Execute]' }, - { deviceType: '02', orderNum: 3, operateCode: '1093', tip: 'Left click [confirm1]' }, - { deviceType: '02', orderNum: 4, operateCode: '1094', tip: 'Left click [confirm2]' }, - { deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Left click [close]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0307', - skinCode: '05', - trainingName: 'Turnout section axile pre reset({7})', - trainingRemark: 'Turnout section axile pre reset function', - trainingType: '03', - productTypes: ['01'], - stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '110', tip: 'Right click to select [Turnout section axile pre reset]' }, - { deviceType: '02', orderNum: 2, operateCode: '1101', tip: 'Left click [Execute]' }, - { deviceType: '02', orderNum: 3, operateCode: '1103', tip: 'Left click [confirm1]' }, - { deviceType: '02', orderNum: 4, operateCode: '1104', tip: 'Left click [confirm2]' }, - { deviceType: '02', orderNum: 5, operateCode: '001', tip: 'Left click [close]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0308', - skinCode: '05', - trainingName: 'Section resection({7})', - trainingRemark: 'Section resection', - trainingType: '03', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '111', tip: 'Right click to select [Section resection]' }, - { deviceType: '02', orderNum: 2, operateCode: '111', tip: 'Left click [confirm]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0309', - skinCode: '05', - trainingName: 'Section activation({7})', - trainingRemark: 'Section activation function', - trainingType: '03', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '112', tip: 'Right click to select [Section activation]' }, - { deviceType: '02', orderNum: 2, operateCode: '112', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0310', - skinCode: '05', - trainingName: 'Set speed limit on the turnout section({7})', - trainingRemark: 'Set speed limit on the section (speed limit value: 5)', - trainingType: '03', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '113', tip: 'Right click to select [Set speed limit on the turnout section]' }, - { deviceType: '02', orderNum: 2, operateCode: '1136', tip: 'Left click to select [speed limit 5] ', val: '5' }, - { deviceType: '02', orderNum: 3, operateCode: '1131', tip: 'Left click [Execute]' }, - { deviceType: '02', orderNum: 4, operateCode: '1132', tip: 'Left click [confirm]' }, - { deviceType: '02', orderNum: 5, operateCode: '1133', tip: 'Left click [confirm1]' }, - { deviceType: '02', orderNum: 6, operateCode: '1134', tip: 'Left click [confirm2]', val: '5' }, - { deviceType: '02', orderNum: 7, operateCode: '001', tip: 'Left click [close]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0311', - skinCode: '05', - trainingName: 'Cancel speed limit on the turnout section({7})', - trainingRemark: 'Cancel speed limit on the turnout section', - trainingType: '03', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '114', tip: 'Right click to select [Cancel speed limit on the turnout section]' }, - { deviceType: '02', orderNum: 2, operateCode: '1141', tip: 'Left click [Execute]' }, - { deviceType: '02', orderNum: 3, operateCode: '1142', tip: 'Left click [confirm] ' }, - { deviceType: '02', orderNum: 4, operateCode: '1143', tip: 'Left click [confirm1]' }, - { deviceType: '02', orderNum: 5, operateCode: '1144', tip: 'Left click [confirm2]', val: '5' }, - { deviceType: '02', orderNum: 6, operateCode: '001', tip: 'Left click [close]' } - ] - }, - - { - maxDuration: 15, - minDuration: 8, - operateType: '0201', - skinCode: '05', - trainingName: 'Route selection({3})', - trainingRemark: 'Route selection', - trainingType: '02', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '301', tip: 'Right click to select [Route selection]' }, - { deviceType: '04', orderNum: 2, operateCode: '3011', tip: 'Left click to select the route name【{3}】', val: '{4}' }, - { deviceType: '04', orderNum: 3, operateCode: '301', tip: 'Left click [confirm] ' }, - { deviceType: '04', orderNum: 4, operateCode: '3012', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0202', - skinCode: '05', - trainingName: 'Cancel the route({3})', - trainingRemark: 'Cancel the route', - trainingType: '02', - productTypes: ['02'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '303', tip: 'Right click to select [Cancel the route]' }, - { deviceType: '04', orderNum: 2, operateCode: '303', tip: 'Left click [confirm] ' }, - { deviceType: '04', orderNum: 3, operateCode: '3031', tip: 'Left click [confirm]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0202', - skinCode: '05', - trainingName: 'Cancel the route({3})', - trainingRemark: 'Cancel the route', - trainingType: '02', - productTypes: ['01'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '303', tip: 'Right click to select [Cancel the route]' }, - { deviceType: '04', orderNum: 2, operateCode: '303', tip: 'Left click [confirm]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0203', - skinCode: '05', - trainingName: 'Signal closure({5})', - trainingRemark: 'Signal closure', - trainingType: '02', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '306', tip: 'Right click to select [Signal closure]' }, - { deviceType: '04', orderNum: 2, operateCode: '306', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0204', - skinCode: '05', - trainingName: 'Signal unsealing({5})', - trainingRemark: 'Signal unsealing', - trainingType: '02', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '307', tip: 'Right click to select [Signal unsealing]' }, - { deviceType: '04', orderNum: 2, operateCode: '3071', tip: 'Left click [Execute]' }, - { deviceType: '04', orderNum: 3, operateCode: '3072', tip: 'Left click [confirm]' }, - { deviceType: '04', orderNum: 4, operateCode: '3073', tip: 'Left click [confirm1]' }, - { deviceType: '04', orderNum: 5, operateCode: '3074', tip: 'Left click [confirm2]' }, - { deviceType: '04', orderNum: 6, operateCode: '001', tip: 'Left click [close]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0205', - skinCode: '05', - trainingName: 'Signal Off({3})', - trainingRemark: 'Signal Off', - trainingType: '02', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '313', tip: 'Right click to select [Signal Off]' }, - { deviceType: '04', orderNum: 2, operateCode: '313', tip: 'Left click [confirm]' }, - { deviceType: '04', orderNum: 3, operateCode: '3131', tip: 'Left click [confirm]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0206', - skinCode: '05', - trainingName: 'Signal reopen({3})', - trainingRemark: 'Signal reopen', - trainingType: '02', - productTypes: ['01', '02'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '304', tip: 'Right click to select [Signal reopen]' }, - { deviceType: '04', orderNum: 2, operateCode: '304', tip: 'Left click [confirm]' }, - { deviceType: '04', orderNum: 3, operateCode: '3041', tip: 'Left click [confirm]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0207', - skinCode: '05', - trainingName: 'Guide route handling({3})', - trainingRemark: 'Guide route handling', - trainingType: '02', - productTypes: ['01'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '308', tip: 'Right click to select [Guide route handling]' }, - { deviceType: '04', orderNum: 2, operateCode: '3081', tip: 'Left click [Execute]' }, - { deviceType: '04', orderNum: 3, operateCode: '3083', tip: 'Left click [confirm1]' }, - { deviceType: '04', orderNum: 4, operateCode: '3084', tip: 'Left click [confirm2]' }, - { deviceType: '04', orderNum: 5, operateCode: '001', tip: 'Left click [close]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0208', - skinCode: '05', - trainingName: 'Start automatic routing({5})', - trainingRemark: 'Start automatic routing', - trainingType: '02', - productTypes: ['02'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '315', tip: 'Right click to select [Start automatic routing]' }, - { deviceType: '04', orderNum: 2, operateCode: '3151', tip: 'Left click to select the route based on the manual control state', val: '{6}' }, - { deviceType: '04', orderNum: 3, operateCode: '315', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0209', - skinCode: '05', - trainingName: 'Close automatic routing({5})', - trainingRemark: 'Close automatic routing', - trainingType: '02', - productTypes: ['02'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '314', tip: 'Right click to select [Close automatic routing]' }, - { deviceType: '04', orderNum: 2, operateCode: '3141', tip: 'Left click to select the first route', val: '{6}' }, - { deviceType: '04', orderNum: 3, operateCode: '314', tip: 'Left click [confirm]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0210', - skinCode: '05', - trainingName: 'Route control status query({5})', - trainingRemark: 'Query the route control status ', - trainingType: '02', - productTypes: ['02'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '316', tip: 'Right click to select [Route control status query]' }, - { deviceType: '04', orderNum: 2, operateCode: '316', tip: 'Left click [confirm] ' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0211', - skinCode: '05', - trainingName: 'Set Interlock for Auto Routing({5})', - trainingRemark: 'Set Interlock for Auto Routing', - trainingType: '02', - productTypes: ['01'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '309', tip: 'Right click to select [Set Interlock for Auto Routing]' }, - { deviceType: '04', orderNum: 2, operateCode: '309', tip: 'Left click [confirm]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0212', - skinCode: '05', - trainingName: 'Cancel Interlock setting for Auto Routing({5})', - trainingRemark: 'Cancel Interlock setting for Auto Routing', - trainingType: '02', - productTypes: ['01'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '310', tip: 'Right click to select [Cancel Interlock setting for Auto Routing]' }, - { deviceType: '04', orderNum: 2, operateCode: '310', tip: 'Left click [confirm]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0213', - skinCode: '05', - trainingName: 'Set Interlock for Auto Trigger({5})', - trainingRemark: 'Set Interlock for Auto Trigger', - trainingType: '02', - productTypes: ['01'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '311', tip: 'Right click to select [Set Interlock for Auto Trigger]' }, - { deviceType: '04', orderNum: 2, operateCode: '311', tip: 'Left click [confirm]' } - ] - }, - { - maxDuration: 15, - minDuration: 8, - operateType: '0214', - skinCode: '05', - trainingName: 'Cancel Interlock setting for Auto Trigger({5})', - trainingRemark: 'Cancel Interlock setting for Auto Trigger', - trainingType: '02', - productTypes: ['01'], - stepVOList: [ - { deviceType: '04', orderNum: 1, operateCode: '312', tip: 'Right click to select[Cancel Interlock setting for Auto Trigger]' }, - { deviceType: '04', orderNum: 2, operateCode: '312', tip: 'Left click [confirm]' } - ] - } - ] -}; diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js index 6e31fd9bb..677a96f61 100644 --- a/src/scripts/cmdPlugin/ValidateHandler.js +++ b/src/scripts/cmdPlugin/ValidateHandler.js @@ -60,6 +60,7 @@ class ValidateHandler { } } else if (operate.over) { // 最后一步校验 const standard = steps[order]; + console.log(operate, standard, operate.code == standard.code, operate.operation == standard.operation, operate.val == standard.val); if (operate && standard && operate.operation == standard.operation && operate.code == standard.code && @@ -68,6 +69,7 @@ class ValidateHandler { } } else if (order < steps.length) { // 普通步骤信息校验 const standard = steps[order]; + console.log(operate, standard, operate.code == standard.code, operate.operation == standard.operation, operate.val == standard.val); if (operate && standard && operate.code == standard.code && operate.operation == standard.operation && From f3022a6bf7dfd964044c0c10ef8fe20cfa6527be Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 18 Jun 2020 10:22:07 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=9C=BA=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/beijing_01/menus/menuSignal.vue | 4 +- .../components/menus/dialog/routeDetail.vue | 10 +- .../menus/dialog/routeHandControl.vue | 25 +- .../menus/dialog/routeHandControl.vue | 341 ------------------ .../theme/foshan_01/menus/menuSignal.vue | 4 +- .../menus/dialog/routeHandControl.vue | 307 ---------------- .../theme/ningbo_01/menus/menuSignal.vue | 4 +- 7 files changed, 32 insertions(+), 663 deletions(-) rename src/jmapNew/theme/{beijing_01 => components}/menus/dialog/routeHandControl.vue (94%) delete mode 100644 src/jmapNew/theme/foshan_01/menus/dialog/routeHandControl.vue delete mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue index 7258c84bd..ad5b7fc10 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue @@ -3,7 +3,7 @@ - + @@ -14,7 +14,7 @@ import PopMenu from '@/components/PopMenu'; import RouteControl from '@/jmapNew/theme/components/menus/dialog/routeControl'; import RouteSelection from './dialog/routeSelection'; -import RouteHandControl from './dialog/routeHandControl'; +import RouteHandControl from '@/jmapNew/theme/components/menus/dialog/routeHandControl'; import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; diff --git a/src/jmapNew/theme/components/menus/dialog/routeDetail.vue b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue index 30125ffd9..aa020aa89 100644 --- a/src/jmapNew/theme/components/menus/dialog/routeDetail.vue +++ b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue @@ -39,7 +39,7 @@ {{ scope.row.name }} - + @@ -122,7 +122,13 @@ export default { this.stationName = station.name; } } - this.tempData = tempData || []; + const routeList = JSON.parse(JSON.stringify(tempData || [])); + this.tempData = routeList; + this.tempData.forEach(route => { + if (route.turnBack) { + route.name = `${route.name}(Z)`; + } + }); } this.dialogShow = true; diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue similarity index 94% rename from src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue rename to src/jmapNew/theme/components/menus/dialog/routeHandControl.vue index 5035196d8..3182be0fd 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue @@ -2,7 +2,7 @@
{ + if (route.turnBack) { + route.name = `${route.name}(Z)`; + } + }); this.operation = operate.operation; } this.dialogShow = true; @@ -196,7 +207,7 @@ export default { this.dialogShow = false; this.$refs.tempTable.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); - mouseCancelState(this.selected); + // mouseCancelState(this.selected); }, changeCheck(check, code) { if (check) { diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/routeHandControl.vue deleted file mode 100644 index c5d2051e0..000000000 --- a/src/jmapNew/theme/foshan_01/menus/dialog/routeHandControl.vue +++ /dev/null @@ -1,341 +0,0 @@ - - - diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue index 5e0385080..25f974523 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ import RouteControl from '@/jmapNew/theme/components/menus/dialog/routeControl'; import RouteSelection from './dialog/routeSelection'; import RouteLock from './dialog/routeLock'; import RouteUnLock from './dialog/routeUnLock'; -import RouteHandControl from './dialog/routeHandControl'; +import RouteHandControl from '@/jmapNew/theme/components/menus/dialog/routeHandControl'; import RouterCommand from './dialog/routerCommand'; import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue deleted file mode 100644 index 2671a8003..000000000 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue +++ /dev/null @@ -1,307 +0,0 @@ - - - diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue index 4126ee37f..257e88e00 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ import PopMenu from '@/components/PopMenu'; import RouteControl from '@/jmapNew/theme/components/menus/dialog/routeControl'; import RouteSelection from './dialog/routeSelection'; import RouteUnLock from './dialog/routeUnLock'; -import RouteHandControl from './dialog/routeHandControl'; +import RouteHandControl from '@/jmapNew/theme/components/menus/dialog/routeHandControl'; import RouterCommand from './dialog/routerCommand'; import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; From cfa6445b020683779e942b72352ec36a16bf881d Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 18 Jun 2020 11:01:33 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=BA=E6=AE=B5?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/dialog/sectionControl.vue | 204 ------------------ .../theme/beijing_01/menus/menuSection.vue | 4 +- .../theme/beijing_01/menus/menuSwitch.vue | 4 +- .../menus/dialog/sectionControl.vue | 168 --------------- .../theme/chengdu_01/menus/menuSection.vue | 4 +- .../menus/dialog/sectionControl.vue | 167 -------------- .../theme/chengdu_03/menus/menuSection.vue | 9 +- .../theme/chengdu_03/menus/menuSwitch.vue | 4 +- .../menus/dialog/sectionControl.vue | 68 ++++-- .../theme/components/utils/menuOperate.js | 14 +- .../foshan_01/menus/dialog/sectionControl.vue | 188 ---------------- .../theme/foshan_01/menus/menuSection.vue | 4 +- .../fuzhou_01/menus/dialog/sectionControl.vue | 153 ------------- .../theme/fuzhou_01/menus/menuSection.vue | 7 +- .../menus/dialog/sectionControl.vue | 167 -------------- .../theme/haerbin_01/menus/menuSection.vue | 4 +- .../theme/ningbo_01/menus/menuSection.vue | 4 +- .../xian_01/menus/dialog/sectionControl.vue | 152 ------------- .../theme/xian_01/menus/menuSection.vue | 4 +- .../xian_02/menus/dialog/sectionControl.vue | 188 ---------------- .../theme/xian_02/menus/menuSection.vue | 4 +- 21 files changed, 89 insertions(+), 1432 deletions(-) delete mode 100644 src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue delete mode 100644 src/jmapNew/theme/chengdu_01/menus/dialog/sectionControl.vue delete mode 100644 src/jmapNew/theme/chengdu_03/menus/dialog/sectionControl.vue rename src/jmapNew/theme/{ningbo_01 => components}/menus/dialog/sectionControl.vue (71%) delete mode 100644 src/jmapNew/theme/foshan_01/menus/dialog/sectionControl.vue delete mode 100644 src/jmapNew/theme/fuzhou_01/menus/dialog/sectionControl.vue delete mode 100644 src/jmapNew/theme/haerbin_01/menus/dialog/sectionControl.vue delete mode 100644 src/jmapNew/theme/xian_01/menus/dialog/sectionControl.vue delete mode 100644 src/jmapNew/theme/xian_02/menus/dialog/sectionControl.vue diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue deleted file mode 100644 index 7e42d01a1..000000000 --- a/src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue +++ /dev/null @@ -1,204 +0,0 @@ - - - diff --git a/src/jmapNew/theme/beijing_01/menus/menuSection.vue b/src/jmapNew/theme/beijing_01/menus/menuSection.vue index b8cd5cca4..0e445e12a 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSection.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSection.vue @@ -1,7 +1,7 @@ @@ -19,7 +19,7 @@ import StandBackStrategy from './dialog/standBackStrategy'; import StandDetail from './dialog/standDetail'; import StandRunLevel from '@/jmapNew/theme/components/menus/dialog/standRunLevel'; import StandStopTime from '@/jmapNew/theme/components/menus/dialog/standStopTime'; -import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; +import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; import { OperateMode } from '@/scripts/ConstDic'; import {DeviceMenu } from '@/scripts/ConstDic'; diff --git a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue index 7a2e870dd..4de45b1c5 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue @@ -5,7 +5,7 @@ - +
@@ -15,7 +15,7 @@ import SectionControl from '@/jmapNew/theme/components/menus/dialog/sectionContr import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl'; import SpeedLimitControl from './dialog/speedLimitControl'; import AlxeEffective from './dialog/alxeEffective'; -import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; +import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; import { OperateMode } from '@/scripts/ConstDic'; import {DeviceMenu } from '@/scripts/ConstDic'; diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue index 42f36561b..baa53c968 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue @@ -1,7 +1,7 @@  - + @@ -75,7 +75,7 @@ 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 './dialog/childDialog/childDialog/noticeInfo'; +import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { EventBus } from '@/scripts/event-bus'; export default { diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue index 00248430d..af73fca24 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue @@ -1,10 +1,10 @@ diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControl.vue index 234f8f4aa..d060b3c4d 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControl.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControl.vue @@ -24,13 +24,13 @@ 取 消 - + - diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue index 00f07fa50..0d9309767 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue @@ -13,14 +13,14 @@ {{ $t('global.cancel') }} - + - diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmControl.vue index cf2e8cd93..4c2fc7b8f 100644 --- a/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmControl.vue +++ b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmControl.vue @@ -13,14 +13,14 @@ {{ $t('global.cancel') }} - + - diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue index 73417e455..8033ed857 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue @@ -24,13 +24,13 @@ 取 消 - + \ No newline at end of file + diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue index 6f4ea89d7..5e3ed5a50 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue @@ -1,59 +1,67 @@ \ No newline at end of file + diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue index 81f3ba9cf..c9df33d4f 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue @@ -29,13 +29,13 @@ 取 消 - + - diff --git a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue index 5e7296eb6..e4ca93df7 100644 --- a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue +++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue @@ -13,14 +13,14 @@ {{ $t('global.cancel') }} - + - diff --git a/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmControl.vue index c8ea62dee..056238311 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmControl.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmControl.vue @@ -24,13 +24,13 @@ 取 消 - + - diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/stationControl.vue index 94b9cc380..ef0a3edab 100644 --- a/src/jmapNew/theme/xian_02/menus/menuDialog/stationControl.vue +++ b/src/jmapNew/theme/xian_02/menus/menuDialog/stationControl.vue @@ -47,7 +47,7 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import TwoConfirmation from './childDialog/twoConfirmation'; -import {menuOperate, commitOperate} from '../utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; export default { name: 'StationControl', diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue index 7b11690ae..7b3a63bd8 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSection.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue @@ -20,7 +20,7 @@ import { mapGetters } from 'vuex'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; // import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; -import {menuOperate, commitOperate} from './utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; export default { diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue index 16c42919b..4f395cc9b 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue @@ -20,7 +20,7 @@ import RouteHandControl from './dialog/routeHandControl'; import RouterCommand from './dialog/routerCommand'; import RouteDetail from './dialog/routeDetail'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; -import {menuOperate, commitOperate} from './utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; // import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import { mapGetters } from 'vuex'; diff --git a/src/jmapNew/theme/xian_02/menus/menuStationControl.vue b/src/jmapNew/theme/xian_02/menus/menuStationControl.vue index 3e3aab18f..ad66af856 100644 --- a/src/jmapNew/theme/xian_02/menus/menuStationControl.vue +++ b/src/jmapNew/theme/xian_02/menus/menuStationControl.vue @@ -9,7 +9,7 @@ import PopMenu from '@/components/PopMenu'; import StationControl from './dialog/stationControl'; import { mapGetters } from 'vuex'; -import {menuOperate, commitOperate} from './utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; // import CMD from '@/scripts/cmdPlugin/CommandEnum'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue index 384e9f4c4..5be14c7c5 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue @@ -21,7 +21,7 @@ import { mapGetters } from 'vuex'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; -import {menuOperate, commitOperate} from './utils/menuOperate'; +import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; export default { name: 'SwitchMenu', diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue index 9b3d646f0..0a86f8296 100644 --- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue @@ -16,7 +16,6 @@ diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 85f9f7fe5..9426ce8b2 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -330,6 +330,12 @@ export const menuOperate = { cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL } }, + LimitControl: { + cancelSpeed: { + operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation, + cmdType: CMD.Fault.CMD_CANCEL_ALL_LIMIT_SPEED + } + }, Common: { setFault: { operation: OperationEvent.MixinCommand.stoppage.menu.operation, diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 73f6f7ee7..614d4ac0d 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -147,7 +147,8 @@ export default { { label: '站台', value: 'Stand' }, { label: '车站', value: 'Station' }, { label: '控制模式', value: 'ControlConvertMenu' }, - { label: '车次窗', value: 'TrainWindow' } + { label: '车次窗', value: 'TrainWindow' }, + { label: '全线限速', value: 'LimitControl' } ], QuestionTypeList: [ { label: '选择题', value: 'select' }, diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index b2c1c0d49..73452e650 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -255,6 +255,6 @@ export default { CMD_CANCEL_FAULT: {value: 'Cancel_Fault', label: '取消故障'} }, LimitControl: { - + CMD_CANCEL_ALL_LIMIT_SPEED: {value: 'Cancel_All_Limit_Speed', label: '取消全线临时限速'} } }; diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js index e8bc0e8e6..449f87221 100644 --- a/src/scripts/cmdPlugin/MenuContextHandler.js +++ b/src/scripts/cmdPlugin/MenuContextHandler.js @@ -23,6 +23,8 @@ class MenuContextHandler { control = store.getters['map/getStationCodeByTrain'](selected); } else if (selected._type == 'TrainWindow') { control = store.getters['map/getDeviceTrainWindowCodeByStationCode'](selected.code); + } else if (selected._type == 'LimitControl') { + return true; } else { control = store.getters['map/getDeviceStationCodeByStationCode'](selected.stationCode); } @@ -81,9 +83,13 @@ class MenuContextHandler { return; } const data = CommandHandler.getDefinition(elem.cmdType); + if (data) { // 判断指令是否显示 - if (data.simulationRole.toUpperCase() == type.toUpperCase() && data.controlMode.indexOf(status) > -1) { + if (data.operateObject == 'LimitControl') { + elem.show = true; + elem.disabled = false; + } else if (data.simulationRole.toUpperCase() == type.toUpperCase() && data.controlMode.indexOf(status) > -1) { elem.show = true; elem.disabled = this.checkDisabled(data, selected); } else { From aedf2b85fd750f8d54b8c6e41c9a51d2f064af3f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 18 Jun 2020 18:32:02 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E6=93=8D=E4=BD=9C=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= =?UTF-8?q?=EF=BC=88=E9=83=A8=E5=88=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/ningbo_01/menus/menuBar.vue | 11 +- .../theme/ningbo_01/menus/menuStation.vue | 36 +- .../theme/ningbo_01/menus/menuTrain.vue | 10 +- .../ningbo_01/menus/utils/menuItemStatus.js | 570 ------------------ 4 files changed, 17 insertions(+), 610 deletions(-) delete mode 100644 src/jmapNew/theme/ningbo_01/menus/utils/menuItemStatus.js diff --git a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue index d5f26e00f..cf1cbf579 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue @@ -100,7 +100,6 @@