From a617144386b084a0ae1fc204838e2922b3769229 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 22 Nov 2021 14:08:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=97=E4=BA=AC=E4=BA=8C?=
=?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/shape/graph/StationStand/index.js | 4 +
.../theme/nanjing_02/menus/menuButton.vue | 15 +-
.../theme/nanjing_02/operationConfig.js | 787 +++++++++++++-----
src/scripts/cmdPlugin/OperationHandler.js | 24 +-
.../mapsystemNew/plugin/trainingtip.vue | 121 ++-
5 files changed, 674 insertions(+), 277 deletions(-)
diff --git a/src/jmapNew/shape/graph/StationStand/index.js b/src/jmapNew/shape/graph/StationStand/index.js
index 658777efd..72085d312 100644
--- a/src/jmapNew/shape/graph/StationStand/index.js
+++ b/src/jmapNew/shape/graph/StationStand/index.js
@@ -224,6 +224,10 @@ class StationStand extends Group {
rect = this.stationPlatform.getBoundingRect();
break;
}
+ case 'StandDetain': {
+ rect = this.detainNormal.getBoundingRect();
+ break;
+ }
default: {
rect = this.getBoundingRect();
break;
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index b6ed26e02..5cebc115c 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -246,7 +246,7 @@
@@ -411,6 +411,9 @@ export default {
setJumpStopId() {
return OperationEvent.StationStand.setJumpStop.menuButton.domId;
},
+ setBulkBuckleTrainId() {
+ return OperationEvent.StationStand.setBulkBuckleTrain.menuButton.domId;
+ },
cr1ConfrimId() {
return OperationEvent.Command.commandHaerbin.confrimCr1.domId;
},
@@ -1312,7 +1315,7 @@ export default {
] : [
{ name: '轨区设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
{ name: '轨区消限', commandTip: '取消对轨道区段的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
- { name: '强行消限', commandTip: '强行取消对轨道区段的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
+ { name: '强行消限', commandTip: '强行取消对轨道区段的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.forceCancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
{ name: '强解区段', commandTip: '解锁进路中的轨道区段', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
{ name: '预复位', commandTip: '预重置计轴区段', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.axlePreReset.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' },
{ name: '封锁区段', commandTip: '禁止通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
@@ -1348,7 +1351,7 @@ export default {
{ name: '预复位', commandTip: '预重置道岔区段', cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET, operate: OperationEvent.Switch.axlePreReset.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
{ name: '封锁道岔', commandTip: '禁止通过道岔区段排列进路', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '解封道岔', commandTip: '允许通过道岔区段排列进路', cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK, operate: OperationEvent.Switch.unblock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
- { name: '强行消限', commandTip: '强行取消对轨道区段的限速', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
+ { name: '强行消限', commandTip: '强行取消对轨道区段的限速', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.forceCancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
] : [
{ name: '单独锁定', commandTip: '锁定道岔，阻止转换', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '转换道岔', commandTip: '转换道岔', cmdType: CMD.Switch.CMD_SWITCH_TURN, operate: OperationEvent.Switch.turnout.menuButton, disabledCb: (stationControl) => !this.modeMatch },
@@ -1370,7 +1373,7 @@ export default {
{ name: '车队单开', commandTip: '对单架信号机开启车队模式，主要是信号机不关闭的情况下排列所有进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.setAutoInterlock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '车队单关', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.cancelAutoInterlock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
- { name: '设置保护', commandTip: '设置保护', cmdType: CMD.Signal.CMD_SIGNAL_SET_OVERLAP, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
+ { name: '设置保护', commandTip: '设置保护', cmdType: CMD.Signal.CMD_SIGNAL_SET_OVERLAP, operate: OperationEvent.Signal.setOverlap.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
] : [
{ name: '关闭信号', commandTip: '设置信号机为关闭状态', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (stationControl) => !this.modeMatch },
@@ -1385,8 +1388,8 @@ export default {
{ name: '设置保护', commandTip: '设置保护', cmdType: CMD.Signal.CMD_SIGNAL_SET_OVERLAP, operate: OperationEvent.Signal.setOverlap.menuButton, disabledCb: (stationControl) => !this.modeMatch },
// { name: '开放引导', commandTip: '开放引导信号', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.guide.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
- { name: '开启车队', commandTip: '对单架信号机开启车队模式，主要是信号机不关闭的情况下排列所有进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
- { name: '取消车队', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }
+ { name: '开启车队', commandTip: '对单架信号机开启车队模式，主要是信号机不关闭的情况下排列所有进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.setAutoInterlock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
+ { name: '取消车队', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.cancelAutoInterlock.menuButton, disabledCb: (stationControl) => !this.modeMatch }
// { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
];
this.stationParamList = this.$store.state.training.prdType === '01' ? [
diff --git a/src/jmapNew/theme/nanjing_02/operationConfig.js b/src/jmapNew/theme/nanjing_02/operationConfig.js
index 43623fdcc..2f879a480 100644
--- a/src/jmapNew/theme/nanjing_02/operationConfig.js
+++ b/src/jmapNew/theme/nanjing_02/operationConfig.js
@@ -32,11 +32,11 @@
export default {
list: [
- {
+ {
maxDuration: 15,
minDuration: 8,
operateType: 'Section_Block',
- skinCode: '07',
+ skinCode: '14',
trainingName: '封锁岔芯({8}{9})',
trainingRemark: '封锁岔芯功能',
trainingType: 'Section',
@@ -45,215 +45,459 @@ export default {
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4031', tip: '鼠标左键点击【封锁岔芯】' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
- ],
- config: {
- sectionTypes: ['05']
- }
+ ],
+ config: {
+ sectionTypes: ['05']
+ }
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Section_Unblock',
- skinCode: '07',
+ skinCode: '14',
trainingName: '解封岔芯({8}{9})',
trainingRemark: '解封岔芯功能',
trainingType: 'Section',
- productTypes: ['01', '02'],
+ productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4047', tip: '鼠标左键点击【解封岔芯】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
- ],
- config: {
- sectionTypes: ['05']
- }
- },
- {
+ ],
+ config: {
+ sectionTypes: ['05']
+ }
+ },
+ {
maxDuration: 15,
minDuration: 8,
operateType: 'Section_Set_Limit_Speed',
- skinCode: '07',
+ skinCode: '14',
trainingName: '岔芯设限({8}{9})',
trainingRemark: '岔芯设限设置限速功能（限速值：25）',
trainingType: 'Section',
- productTypes: ['01', '02'],
+ productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
- { deviceType: '03', orderNum: 2, operateCode: '4077', tip: '鼠标左键点击【岔芯设限】按钮' },
- { deviceType: '03', orderNum: 3, operateCode: 'com01', tip: '鼠标左键点击【25 km/h】按钮', val: '25 km/h' },
- { deviceType: '03', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+ { deviceType: '03', orderNum: 2, operateCode: '4077', tip: '鼠标左键点击【岔芯设限】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: 'com01', tip: '鼠标左键点击【25 km/h】按钮', val: '25 km/h' },
+ { deviceType: '03', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
- { deviceType: '03', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
- ],
- config: {
- sectionTypes: ['05']
- }
+ { deviceType: '03', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
+ ],
+ config: {
+ sectionTypes: ['05']
+ }
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Section_Cancel_Limit_Speed',
- skinCode: '07',
+ skinCode: '14',
trainingName: '岔芯消限({8}{9})',
trainingRemark: '岔芯消限取消限速功能',
trainingType: 'Section',
- productTypes: ['01', '02'],
+ productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4086', tip: '鼠标左键点击【岔芯消限】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
- ],
- config: {
- sectionTypes: ['05']
- }
- },
- {
+ ],
+ config: {
+ sectionTypes: ['05']
+ }
+ },
+ {
maxDuration: 15,
minDuration: 8,
operateType: 'Section_Fault_Unlock',
- skinCode: '02',
+ skinCode: '14',
trainingName: '强解岔芯({8}{9})',
trainingRemark: '强解岔芯功能',
trainingType: 'Section',
- productTypes: ['01', '02'],
+ productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4029', tip: '鼠标左键点击【强解岔芯】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
- ],
- config: {
- sectionTypes: ['05']
- }
- },
+ ],
+ config: {
+ sectionTypes: ['05']
+ }
+ },
{
maxDuration: 15,
minDuration: 8,
operateType: 'Section_Block',
- skinCode: '07',
+ skinCode: '14',
trainingName: '封锁区段({8}{9})',
trainingRemark: '封锁区段功能',
trainingType: 'Section',
- productTypes: ['01', '02'],
+ productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4031', tip: '鼠标左键点击【封锁区段】' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
- ],
- config: {
- sectionTypes: ['01', '02']
- }
+ ],
+ config: {
+ sectionTypes: ['01', '02']
+ }
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Section_Unblock',
- skinCode: '07',
+ skinCode: '14',
trainingName: '解封区段({8}{9})',
trainingRemark: '解封区段功能',
trainingType: 'Section',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4047', tip: '鼠标左键点击【解封区段】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
- ],
- config: {
- sectionTypes: ['01', '02']
- }
- },
+ ],
+ config: {
+ sectionTypes: ['01', '02']
+ }
+ },
{
maxDuration: 15,
minDuration: 8,
operateType: 'Section_Set_Limit_Speed',
- skinCode: '07',
+ skinCode: '14',
trainingName: '轨区设限({8}{9})',
trainingRemark: '区段设置限速功能（限速值：25）',
trainingType: 'Section',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
- { deviceType: '03', orderNum: 2, operateCode: '4077', tip: '鼠标左键点击【轨区设限】按钮' },
- { deviceType: '03', orderNum: 3, operateCode: 'com01', tip: '鼠标左键点击【25 km/h】按钮', val: '25 km/h' },
- { deviceType: '03', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+ { deviceType: '03', orderNum: 2, operateCode: '4077', tip: '鼠标左键点击【轨区设限】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: 'com01', tip: '鼠标左键点击【25 km/h】按钮', val: '25 km/h' },
+ { deviceType: '03', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
- { deviceType: '03', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
- ],
- config: {
- sectionTypes: ['01', '02']
- }
+ { deviceType: '03', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
+ ],
+ config: {
+ sectionTypes: ['01', '02']
+ }
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Section_Cancel_Limit_Speed',
- skinCode: '07',
+ skinCode: '14',
trainingName: '轨区消限({8}{9})',
trainingRemark: '区段取消限速功能',
trainingType: 'Section',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4086', tip: '鼠标左键点击【轨区消限】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
- ],
- config: {
- sectionTypes: ['01', '02']
- }
- },
+ ],
+ config: {
+ sectionTypes: ['01', '02']
+ }
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Section_Cancel_Limit_Speed',
+ skinCode: '14',
+ trainingName: '强行消限({8}{9})',
+ trainingRemark: '区段强行取消限速功能',
+ trainingType: 'Section',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '4261', tip: '鼠标左键点击【强行消限】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+ { deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+ { deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
+ ],
+ config: {
+ sectionTypes: ['01', '02']
+ }
+ },
{
maxDuration: 15,
minDuration: 8,
operateType: 'Section_Fault_Unlock',
- skinCode: '02',
+ skinCode: '14',
trainingName: '强解区段({8}{9})',
trainingRemark: '强解区段功能',
trainingType: 'Section',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4029', tip: '鼠标左键点击【强解区段】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
- ],
- config: {
- sectionTypes: ['01', '02']
- }
- },
- {
+ ],
+ config: {
+ sectionTypes: ['01', '02']
+ }
+ },
+ {
maxDuration: 15,
minDuration: 8,
operateType: 'Section_Axis_Pre_Reset',
- skinCode: '02',
+ skinCode: '14',
trainingName: '预复位({8}{9})',
trainingRemark: '预复位功能',
trainingType: 'Section',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4096', tip: '鼠标左键点击【预复位】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
- ]
- },
-
- {
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '上行不折返({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '4241', tip: '鼠标左键点击【上行不折返】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '下行不折返({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '4242', tip: '鼠标左键点击【下行不折返】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '上行省缺折返({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '4243', tip: '鼠标左键点击【上行省缺折返】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '下行省缺折返({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '4244', tip: '鼠标左键点击【下行省缺折返】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '上行换端({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '4245', tip: '鼠标左键点击【上行换端】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '下行换端({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '4246', tip: '鼠标左键点击【下行换端】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '上行自动折返({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '4247', tip: '鼠标左键点击【上行自动折返】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '下行自动折返({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '4248', tip: '鼠标左键点击【下行自动折返】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '折返DTO({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '417', tip: '鼠标左键点击【折返DTO】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '取消折返({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '418', tip: '鼠标左键点击【取消折返】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '自动折返({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '419', tip: '鼠标左键点击【自动折返】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '换上至下({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '420', tip: '鼠标左键点击【换上至下】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Reentry_Strategy',
+ skinCode: '14',
+ trainingName: '换下至上({8}{9})',
+ trainingRemark: '设置折返策略功能',
+ trainingType: 'Section',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '421', tip: '鼠标左键点击【换下至上】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Early_Depart',
+ skinCode: '14',
+ trainingName: '终止站停-上({8}{9})',
+ trainingRemark: '设置提前发车功能',
+ trainingType: 'Section',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '422', tip: '鼠标左键点击【终止站停-上】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮'}
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Early_Depart',
+ skinCode: '14',
+ trainingName: '终止站停-下({8}{9})',
+ trainingRemark: '设置提前发车功能',
+ trainingType: 'Section',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
+ { deviceType: '03', orderNum: 2, operateCode: '423', tip: '鼠标左键点击【终止站停-下】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Turn',
- skinCode: '07',
+ skinCode: '14',
trainingName: '转换道岔({7})',
trainingRemark: '转换道岔({7})',
trainingType: 'Switch',
@@ -263,51 +507,55 @@ export default {
{ deviceType: '02', orderNum: 2, operateCode: '1071', tip: '鼠标左键点击【转换道岔】按钮' },
{ deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
- },
- {
+ },
+ {
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Force_Turn',
- skinCode: '07',
+ skinCode: '14',
trainingName: '强行转岔({7})',
trainingRemark: '强行转岔({7})',
trainingType: 'Switch',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '02', orderNum: 2, operateCode: '1081', tip: '鼠标左键点击【强行转岔】按钮' },
- { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+ { deviceType: '02', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+ { deviceType: '02', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
- },
- {
+ },
+ {
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Squeeze_Recovery',
- skinCode: '07',
+ skinCode: '14',
trainingName: '挤岔恢复({7})',
trainingRemark: '挤岔恢复({7})',
trainingType: 'Switch',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '02', orderNum: 2, operateCode: '11a0', tip: '鼠标左键点击【挤岔恢复】按钮' },
- { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+ { deviceType: '02', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+ { deviceType: '02', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
- },
- {
+ },
+ {
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Axle_Pre_Reset',
- skinCode: '07',
+ skinCode: '14',
trainingName: '预复位({7})',
trainingRemark: '预复位({7})',
trainingType: 'Switch',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '02', orderNum: 2, operateCode: '1106', tip: '鼠标左键点击【预复位】按钮' },
- { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
- { deviceType: '02', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+ { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+ { deviceType: '02', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
@@ -315,7 +563,7 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Single_Lock',
- skinCode: '07',
+ skinCode: '14',
trainingName: '单独锁定({7})',
trainingRemark: '单独锁定功能',
trainingType: 'Switch',
@@ -330,11 +578,11 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Single_Unlock',
- skinCode: '07',
+ skinCode: '14',
trainingName: '道岔单解({7})',
trainingRemark: '道岔单解功能',
trainingType: 'Switch',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '02', orderNum: 2, operateCode: '1047', tip: '鼠标左键点击【取消锁定】按钮' },
@@ -347,7 +595,7 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Block',
- skinCode: '07',
+ skinCode: '14',
trainingName: '道岔封锁({7})',
trainingRemark: '道岔封锁功能',
trainingType: 'Switch',
@@ -362,11 +610,11 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Unblock',
- skinCode: '07',
+ skinCode: '14',
trainingName: '解封道岔({7})',
trainingRemark: '解封道岔功能',
trainingType: 'Switch',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '02', orderNum: 2, operateCode: '1067', tip: '鼠标左键点击【解封道岔】按钮' },
@@ -375,43 +623,43 @@ export default {
{ deviceType: '02', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
- {
- maxDuration: 15,
- minDuration: 8,
- operateType: 'Switch_Section_Block',
- skinCode: '07',
- trainingName: '封锁道岔({7})',
- trainingRemark: '封锁道岔功能',
- trainingType: 'Switch',
- productTypes: ['01', '02'],
- stepVOList: [
- { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
- { deviceType: '03', orderNum: 2, operateCode: '1052', tip: '鼠标左键点击【封锁道岔】' },
- { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
- ]
- },
- {
- maxDuration: 15,
- minDuration: 8,
- operateType: 'Switch_Section_Unblock',
- skinCode: '07',
- trainingName: '封锁道岔({7})',
- trainingRemark: '封锁道岔功能',
- trainingType: 'Switch',
- productTypes: ['01', '02'],
- stepVOList: [
- { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
- { deviceType: '03', orderNum: 2, operateCode: '1052', tip: '鼠标左键点击【封锁道岔】按钮' },
- { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
- { deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
- { deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
- ]
- },
+ // {
+ // maxDuration: 15,
+ // minDuration: 8,
+ // operateType: 'Switch_Section_Block',
+ // skinCode: '14',
+ // trainingName: '封锁道岔({7})',
+ // trainingRemark: '封锁道岔功能',
+ // trainingType: 'Switch',
+ // productTypes: ['01', '02'],
+ // stepVOList: [
+ // { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
+ // { deviceType: '03', orderNum: 2, operateCode: '1052', tip: '鼠标左键点击【封锁道岔】' },
+ // { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ // ]
+ // },
+ // {
+ // maxDuration: 15,
+ // minDuration: 8,
+ // operateType: 'Switch_Section_Unblock',
+ // skinCode: '14',
+ // trainingName: '封锁道岔({7})',
+ // trainingRemark: '封锁道岔功能',
+ // trainingType: 'Switch',
+ // productTypes: ['01', '02'],
+ // stepVOList: [
+ // { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
+ // { deviceType: '03', orderNum: 2, operateCode: '1052', tip: '鼠标左键点击【封锁道岔】按钮' },
+ // { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+ // { deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+ // { deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
+ // ]
+ // },
{
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Fault_Unlock',
- skinCode: '02',
+ skinCode: '14',
trainingName: '强解道岔({7})',
trainingRemark: '强解道岔',
trainingType: 'Switch',
@@ -428,32 +676,49 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Set_Limit_Speed',
- skinCode: '02',
+ skinCode: '14',
trainingName: '岔区设限({7})',
trainingRemark: '岔区设限功能（限速值：25）',
trainingType: 'Switch',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
- { deviceType: '03', orderNum: 2, operateCode: '1137', tip: '鼠标左键点击【岔区设限】按钮' },
- { deviceType: '03', orderNum: 3, operateCode: 'com01', tip: '鼠标左键点击【25 km/h】按钮', val: '25 km/h' },
+ { deviceType: '03', orderNum: 2, operateCode: '1137', tip: '鼠标左键点击【岔区设限】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: 'com01', tip: '鼠标左键点击【25 km/h】按钮', val: '25 km/h' },
{ deviceType: '03', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
- { deviceType: '03', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
+ { deviceType: '03', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Switch_Cancel_Limit_Speed',
- skinCode: '02',
+ skinCode: '14',
trainingName: '道岔轨区消限({7})',
- trainingRemark: '轨区消限功能',
+ trainingRemark: '岔区消限功能',
trainingType: 'Switch',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
- { deviceType: '03', orderNum: 2, operateCode: '1146', tip: '鼠标左键点击【轨区消限】按钮' },
+ { deviceType: '03', orderNum: 2, operateCode: '1146', tip: '鼠标左键点击【岔区消限】按钮' },
+ { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+ { deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+ { deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Switch_Cancel_Limit_Speed',
+ skinCode: '14',
+ trainingName: '道岔轨区强行消限({7})',
+ trainingRemark: '岔区强行消限功能',
+ trainingType: 'Switch',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
+ { deviceType: '03', orderNum: 2, operateCode: '11b1', tip: '鼠标左键点击【强行消限】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
@@ -463,7 +728,7 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Set_Route',
- skinCode: '07',
+ skinCode: '14',
trainingName: '排列进路({3})',
trainingRemark: '排列进路功能',
trainingType: 'Signal',
@@ -473,14 +738,14 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
{ deviceType: '04', orderNum: 3, operateCode: '3013', tip: '鼠标左键点击【排列进路】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
- ],
- // config:{routeType:'ATP'}
+ ]
+ // config:{routeType:'ATP'}
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Cancel_Route',
- skinCode: '07',
+ skinCode: '14',
trainingName: '取消进路({3})',
trainingRemark: '取消进路',
trainingType: 'Signal',
@@ -490,18 +755,18 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
{ deviceType: '04', orderNum: 3, operateCode: '3032', tip: '鼠标左键点击【取消进路】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
- ],
+ ]
// config:{routeType:'ATP'}
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Block',
- skinCode: '07',
+ skinCode: '14',
trainingName: '封锁信号({5})',
trainingRemark: '封锁信号',
trainingType: 'Signal',
- productTypes: ['01','02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3062', tip: '鼠标左键点击【封锁信号】按钮' },
@@ -512,7 +777,7 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Unblock',
- skinCode: '07',
+ skinCode: '14',
trainingName: '解封信号({5})',
trainingRemark: '解封信号',
trainingType: 'Signal',
@@ -529,11 +794,11 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Open_Auto_Setting',
- skinCode: '07',
+ skinCode: '14',
trainingName: '自排单开({5})',
trainingRemark: '自排单开',
trainingType: 'Signal',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3153', tip: '鼠标左键点击【自排单开】按钮' },
@@ -544,11 +809,11 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Close_Auto_Setting',
- skinCode: '07',
+ skinCode: '14',
trainingName: '自排单关({5})',
trainingRemark: '自排单关',
trainingType: 'Signal',
- productTypes: ['01', '02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3143', tip: '鼠标左键点击【自排单关】按钮' },
@@ -559,7 +824,7 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Close_Signal',
- skinCode: '07',
+ skinCode: '14',
trainingName: '关闭信号({3})',
trainingRemark: '关闭信号',
trainingType: 'Signal',
@@ -574,22 +839,22 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Reopen_Signal',
- skinCode: '07',
+ skinCode: '14',
trainingName: '开放信号({3})',
trainingRemark: '开放信号',
trainingType: 'Signal',
- productTypes: ['01','02'],
+ productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3042', tip: '鼠标左键点击【开放信号】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
},
- // {
+ // {封锁道岔功能
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Signal_Set_Route',
- // skinCode: '07',
+ // skinCode: '14',
// trainingName: '联锁进路({3})',
// trainingRemark: '联锁进路',
// trainingType: 'Signal',
@@ -606,7 +871,7 @@ export default {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Signal_Cancel_Route',
- // skinCode: '07',
+ // skinCode: '14',
// trainingName: '取消联锁({3})',
// trainingRemark: '取消联锁',
// trainingType: 'Signal',
@@ -623,7 +888,7 @@ export default {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Signal_Set_Route',
- // skinCode: '07',
+ // skinCode: '14',
// trainingName: '联锁进路({3})',
// trainingRemark: '联锁进路',
// trainingType: 'Signal',
@@ -640,7 +905,7 @@ export default {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Signal_Cancel_Route',
- // skinCode: '07',
+ // skinCode: '14',
// trainingName: '取消联锁({3})',
// trainingRemark: '取消联锁',
// trainingType: 'Signal',
@@ -657,7 +922,7 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Set_Guide',
- skinCode: '07',
+ skinCode: '14',
trainingName: '开放引导({5})',
trainingRemark: '开放引导功能',
trainingType: 'Signal',
@@ -666,16 +931,16 @@ export default {
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3087', tip: '鼠标左键点击【开放引导】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
- { deviceType: '04', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+ { deviceType: '04', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '04', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
],
- config: {onlySignalOP:true}
+ config: {onlySignalOP:true}
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Set_CI_Auto_Trigger',
- skinCode: '07',
+ skinCode: '14',
trainingName: '追踪单开({5})',
trainingRemark: '追踪单开',
trainingType: 'Signal',
@@ -690,7 +955,7 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Cancel_CI_Auto_Trigger',
- skinCode: '07',
+ skinCode: '14',
trainingName: '追踪单关({5})',
trainingRemark: '追踪单关',
trainingType: 'Signal',
@@ -700,20 +965,20 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: '3122', tip: '鼠标左键点击【追踪单关】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
- },
+ },
- {
+ {
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Set_CI_Auto',
- skinCode: '07',
- trainingName: '车队单开({5})',
- trainingRemark: '车队单开',
+ skinCode: '14',
+ trainingName: '开启车队({5})',
+ trainingRemark: '开启车队',
trainingType: 'Signal',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
- { deviceType: '04', orderNum: 2, operateCode: '3092', tip: '鼠标左键点击【车队单开】按钮' },
+ { deviceType: '04', orderNum: 2, operateCode: '3092', tip: '鼠标左键点击【开启车队】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
},
@@ -721,29 +986,43 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Signal_Cancel_CI_Auto',
- skinCode: '07',
- trainingName: '车队单关({5})',
- trainingRemark: '车队单关',
+ skinCode: '14',
+ trainingName: '取消车队({5})',
+ trainingRemark: '取消车队',
trainingType: 'Signal',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
- { deviceType: '04', orderNum: 2, operateCode: '3102', tip: '鼠标左键点击【车队单关】按钮' },
+ { deviceType: '04', orderNum: 2, operateCode: '3102', tip: '鼠标左键点击【取消车队】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
- },
-
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Signal_Set_OverLap',
+ skinCode: '14',
+ trainingName: '设置保护({5})',
+ trainingRemark: '设置保护',
+ trainingType: 'Signal',
+ productTypes: ['01', '02'],
+ stepVOList: [
+ { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
+ { deviceType: '04', orderNum: 2, operateCode: '3231', tip: '鼠标左键点击【设置保护】按钮' },
+ { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
{
maxDuration: 15,
minDuration: 8,
operateType: 'Stand_Set_Hold_Train',
- skinCode: '07',
+ skinCode: '14',
trainingName: '扣车({10})',
trainingRemark: '扣车',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
- { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台', subType:'StationPlatform'},
+ { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台H标识', subType:'StandDetain'},
{ deviceType: '04', orderNum: 2, operateCode: '5041', tip: '鼠标左键点击【此站扣车】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
@@ -751,15 +1030,30 @@ export default {
{
maxDuration: 15,
minDuration: 8,
- operateType: 'Stand_Cancel_Hold_Train',
- skinCode: '07',
- trainingName: '取消设置({10})',
- trainingRemark: '取消扣车',
+ operateType: 'Stand_Cancel_Setting',
+ skinCode: '14',
+ trainingName: '恢复原状({10})',
+ trainingRemark: '恢复原状',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
- { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台', subType:'StationPlatform'},
- { deviceType: '04', orderNum: 2, operateCode: '520', tip: '鼠标左键点击【取消设置】按钮' },
+ { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台H标识', subType:'StandDetain'},
+ { deviceType: '04', orderNum: 2, operateCode: '520', tip: '鼠标左键点击【恢复原状】按钮' },
+ { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Stand_Set_Hold_Train_Batch',
+ skinCode: '14',
+ trainingName: '连续扣车({10})',
+ trainingRemark: '连续扣车',
+ trainingType: 'Stand',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台H标识', subType: 'StandDetain'},
+ { deviceType: '04', orderNum: 2, operateCode: '5152', tip: '鼠标左键点击【连续扣车】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
},
@@ -767,22 +1061,22 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'Stand_Set_Jump_Stop',
- skinCode: '07',
+ skinCode: '14',
trainingName: '此站不停({10})',
trainingRemark: '此站不停',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
- { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台', subType:'StationPlatform'},
+ { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台H标识', subType:'StandDetain'},
{ deviceType: '04', orderNum: 2, operateCode: '5025', tip: '鼠标左键点击【此站不停】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
},
- {
+ {
maxDuration: 15,
minDuration: 8,
operateType: 'CM_Receive_Control',
- skinCode: '07',
+ skinCode: '14',
trainingName: '接收控制({1})',
trainingRemark: '接收控制',
trainingType: 'ControlConvertMenu',
@@ -797,7 +1091,7 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'CM_Surrender_Control',
- skinCode: '07',
+ skinCode: '14',
trainingName: '交出控制({1})',
trainingRemark: '交出控制',
trainingType: 'ControlConvertMenu',
@@ -807,20 +1101,20 @@ export default {
{ deviceType: '05', orderNum: 2, operateCode: '2044', tip: '鼠标左键点击【交出控制】按钮' },
{ deviceType: '05', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
- },
- {
+ },
+ {
maxDuration: 15,
minDuration: 8,
operateType: 'CM_Force_Station_Control',
- skinCode: '07',
+ skinCode: '14',
trainingName: '强行站控({1})',
trainingRemark: '强行站控',
trainingType: 'ControlConvertMenu',
productTypes: ['01'],
stepVOList: [
{ deviceType: 'mbm', orderNum: 1, operateCode: '2036', tip: '鼠标左键点击【强行站控】按钮' },
- { deviceType: '05', orderNum: 2, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
- { deviceType: '05', orderNum: 3, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+ { deviceType: '05', orderNum: 2, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+ { deviceType: '05', orderNum: 3, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '05', orderNum: 4, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
@@ -828,7 +1122,7 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'CM_Receive_Control',
- skinCode: '07',
+ skinCode: '14',
trainingName: '接收控制({1})',
trainingRemark: '接收控制',
trainingType: 'ControlConvertMenu',
@@ -842,7 +1136,7 @@ export default {
maxDuration: 15,
minDuration: 8,
operateType: 'CM_Surrender_Control',
- skinCode: '07',
+ skinCode: '14',
trainingName: '交出控制({1})',
trainingRemark: '交出控制',
trainingType: 'ControlConvertMenu',
@@ -851,12 +1145,12 @@ export default {
{ deviceType: 'mbm', orderNum: 1, operateCode: '2044', tip: '鼠标左键点击【交出控制】按钮' },
{ deviceType: '05', orderNum: 2, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
- },
- {
+ },
+ {
maxDuration: 15,
minDuration: 8,
operateType: 'Station_Close_AllSignal',
- skinCode: '07',
+ skinCode: '14',
trainingName: '关站信号({26})',
trainingRemark: '关站信号',
trainingType: 'Station',
@@ -866,6 +1160,81 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: '6114', tip: '鼠标左键点击【关站信号】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
- }
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Station_CIArea_Close_AllSignal',
+ skinCode: '14',
+ trainingName: '关区信号({26})',
+ trainingRemark: '关区信号',
+ trainingType: 'Station',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+ { deviceType: '04', orderNum: 2, operateCode: '6124', tip: '鼠标左键点击【关站信号】按钮' },
+ { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Station_Open_Auto_Setting',
+ skinCode: '14',
+ trainingName: '自排全开({26})',
+ trainingRemark: '自排全开',
+ trainingType: 'Station',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+ { deviceType: '04', orderNum: 2, operateCode: '6061', tip: '鼠标左键点击【自排全开】按钮' },
+ { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Station_Close_Auto_Setting',
+ skinCode: '14',
+ trainingName: '自排全关({26})',
+ trainingRemark: '自排全关',
+ trainingType: 'Station',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+ { deviceType: '04', orderNum: 2, operateCode: '6051', tip: '鼠标左键点击【自排全关】按钮'},
+ { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Station_Set_CI_Auto_Trigger',
+ skinCode: '14',
+ trainingName: '追踪全开({26})',
+ trainingRemark: '追踪全开',
+ trainingType: 'Station',
+ productTypes: ['02'],
+ stepVOList: [
+ { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+ { deviceType: '04', orderNum: 2, operateCode: '6011', tip: '鼠标左键点击【追踪全开】按钮' },
+ { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Station_Cancel_CI_Auto_Trigger',
+ skinCode: '14',
+ trainingName: '追踪全关({26})',
+ trainingRemark: '追踪全关',
+ trainingType: 'Station',
+ productTypes: ['02'],
+ stepVOList:[
+ { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+ { deviceType: '04', orderNum: 2, operateCode: '6021', tip: '鼠标左键点击【追踪全关】按钮'},
+ { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+ ]
+ }
]
};
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 49660220a..45d21d38c 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -1126,6 +1126,17 @@ export const OperationEvent = {
operation: '11a1',
domId: '_Tips-Switch-Squeeze-Recovery-MenuButton{TOP}'
}
+ },
+ // 取消速度
+ forceCancelSpeed: {
+ menu: {
+ operation: '11b',
+ domId: '_Tips-Switch-ForceCancelSpeed-Menu{TOP}'
+ },
+ menuButton: {
+ operation: '11b1',
+ domId: '_Tips-Switch-ForceCancelSpeed-Menu{BOTTOM}'
+ }
}
},
@@ -1698,6 +1709,7 @@ export const OperationEvent = {
domId: '_Tips-Signal-cancelinterlock-Menu{BOTTOM}'
}
},
+ // 设置保护
setOverlap: {
menuButton: {
operation: '3211',
@@ -2207,6 +2219,17 @@ export const OperationEvent = {
operation: '425',
domId: '_Tips-Section-EarlyDeparture-menuBtn'
}
+ },
+ // 取消速度
+ forceCancelSpeed: {
+ menu: {
+ operation: '426',
+ domId: '_Tips-Section-ForceCancelSpeed-Menu{TOP}'
+ },
+ menuButton: {
+ operation: '4261',
+ domId: '_Tips-Section-ForceCancelSpeed-Menu{BOTTOM}'
+ }
}
},
@@ -3503,7 +3526,6 @@ class OperationHandler {
if (!this.domIdOperationRel) {
this.domIdOperationRel = this.generateDomIdOperationRel();
}
-
return this.domIdOperationRel[operation];
}
diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
index 73454dc51..bbb1ce740 100644
--- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
+++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
@@ -32,70 +32,70 @@ export default {
},
watch: {
'$store.state.training.tipEvent': function (val) {
- setTimeout(() => { this.tipInit(); }, 300);
- this.$nextTick(function() {
- this.tipInit();
- });
+ setTimeout(() => { this.tipInit(); }, 300);
+ this.$nextTick(function() {
+ this.tipInit();
+ });
}
},
methods: {
tipInit() {
- this.$store.dispatch('training/isTeachMode').then(() => {
- this.tipShow = true;
- const offset = this.$store.state.config.canvasOffset;
- if (this.$store.state.training.trainingStart) {
- const order = this.$store.state.training.order;
- const steps = this.$store.state.training.steps;
+ this.$store.dispatch('training/isTeachMode').then(() => {
+ this.tipShow = true;
+ const offset = this.$store.state.config.canvasOffset;
+ if (this.$store.state.training.trainingStart) {
+ const order = this.$store.state.training.order;
+ const steps = this.$store.state.training.steps;
- if (order > -1 && order < steps.length) {
- const step = steps[order];
- const distance = 5;
- this.tip = step.tip;
- /** 如果mbm或者bar的处理*/
- if (step.type === 'mbm' || step.type === 'bar') {
- const position = this.getOtherTipPoint(step);
- if (position) {
- this.position = position;
- this.position.y -= distance;
- this.popTipShow();
- }
- } else if (step.code) {
- /** 默认是shape类型，如果找不到坐标，则可以认为是存在code的dailog*/
- const position = this.getShapeTipPoint(step);
- if (position) {
- this.position = {
- x: position.x + offset.x,
- y: position.y + offset.y - distance
- };
- this.popTipShow();
- } else {
- const position = this.getOtherTipPoint(step);
- if (position) {
- this.position = position;
- this.position.y -= distance;
- this.popTipShow();
- }
- }
- } else {
- /** 不存在code字段的dialog处理*/
- const position = this.getOtherTipPoint(step);
- if (position) {
- this.position = position;
- this.position.y -= distance;
- this.popTipShow();
- } else {
- this.popTipHide();
- }
- }
- } else {
- this.tipShow = false;
- }
- } else {
- this.tipShow = false;
- }
- }).catch(() => {
- this.tipShow = false;
- });
+ if (order > -1 && order < steps.length) {
+ const step = steps[order];
+ const distance = 5;
+ this.tip = step.tip;
+ /** 如果mbm或者bar的处理*/
+ if (step.type === 'mbm' || step.type === 'bar') {
+ const position = this.getOtherTipPoint(step);
+ if (position) {
+ this.position = position;
+ this.position.y -= distance;
+ this.popTipShow();
+ }
+ } else if (step.code) {
+ /** 默认是shape类型，如果找不到坐标，则可以认为是存在code的dailog*/
+ const position = this.getShapeTipPoint(step);
+ if (position) {
+ this.position = {
+ x: position.x + offset.x,
+ y: position.y + offset.y - distance
+ };
+ this.popTipShow();
+ } else {
+ const position = this.getOtherTipPoint(step);
+ if (position) {
+ this.position = position;
+ this.position.y -= distance;
+ this.popTipShow();
+ }
+ }
+ } else {
+ /** 不存在code字段的dialog处理*/
+ const position = this.getOtherTipPoint(step);
+ if (position) {
+ this.position = position;
+ this.position.y -= distance;
+ this.popTipShow();
+ } else {
+ this.popTipHide();
+ }
+ }
+ } else {
+ this.tipShow = false;
+ }
+ } else {
+ this.tipShow = false;
+ }
+ }).catch(() => {
+ this.tipShow = false;
+ });
},
popTipShow() {
this.popShow = true;
@@ -124,7 +124,6 @@ export default {
code: newStep.code,
subDeviceType: subDeviceType
});
-
if (position) {
if (position.x < 0) {
position.x = 0;
@@ -144,7 +143,7 @@ export default {
// 获取地图菜单按钮和对话框按钮提示显示位置
getOtherTipPoint(step) {
const domId = OperationHandler.getDomIdByOperation(step.operation);
- const btnDom = document.getElementById(domId);
+ const btnDom = document.getElementById(domId);
if (btnDom) {
const offset = getDomOffset(btnDom);
if (offset.x == 0 && offset.y == 0) {