From a17a02519db8d2ecc209294946a2ef61bde6e40c Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 2 Apr 2020 09:07:50 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=81=E6=B3=A2?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=AE=9E=E8=AE=AD=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningbo_01/menus/dialog/alxeEffective.vue | 50 +- .../ningbo_01/menus/dialog/routeUnLock.vue | 67 ++- .../ningbo_01/menus/dialog/sectionUnLock.vue | 80 +-- .../menus/dialog/speedLimitControl.vue | 10 +- .../ningbo_01/menus/dialog/switchUnLock.vue | 58 ++- .../theme/ningbo_01/menus/menuSection.vue | 4 +- .../theme/ningbo_01/menus/menuSignal.vue | 2 +- src/scripts/OperationConfig.js | 473 +++++++++++++++++- 8 files changed, 624 insertions(+), 120 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue index feb931dc6..114a3fa89 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue @@ -107,7 +107,6 @@ export default { loading: false, type: 'text', timeout: 1000, - timenum: 30, stepNum: 0, task: null, model: { @@ -189,18 +188,6 @@ export default { } }, watch: { - 'model.stationCode': function(code) { - this.randomSectionList = []; - this.sectionList.forEach(section => { - if (section.stationCode == this.model.stationCode) { - let name = section.name; - if (section.type == '02') { - name = section.name; - } - this.randomSectionList.push({ name: `${name}(${section.code})`, code: section.code }); - } - }); - } }, mounted() { this.$nextTick(() => { @@ -231,7 +218,10 @@ export default { this.model.sectionName = ''; this.model.confirmStationCode = ''; this.model.confirmSectionCode = ''; + this.model.sectionCode = ''; + this.model.stationCode = ''; if (selected) { + this.model.sectionCode = selected.code; if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) { if (selected.isSwitchSection) { const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode); @@ -251,7 +241,6 @@ export default { const section = this.$store.getters['map/getDeviceByCode'](selected.switchSectionCode); if (section) { this.model.sectionName = section.name; - this.model.sectionCode = section.code; } } @@ -275,6 +264,19 @@ export default { this.$store.dispatch('training/emitTipFresh'); this.mouseCancelState(this.selected); }, + getSectionList(code) { + this.randomSectionList = []; + this.sectionList.forEach(section => { + if (section.stationCode == code) { + let name = section.name; + if (section.type == '02') { + const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode); + name = `${sectionParent.name}-${section.name}`; + } + this.randomSectionList.push({ name: `${name}`, code: section.code }); + } + }); + }, waitSelectEvent() { if (!this.$store.state.menuOperation.break) { this.model.time -= 1; @@ -299,22 +301,17 @@ export default { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.type = 'password'; - this.model.time = this.timenum; + this.model.time = 60; this.task = setInterval(this.waitSelectEvent, this.timeout); } }); }, stationSelectChange(code) { - if (this.model.confirmStationCode === this.model.sectionCode) { - this.stepNum = 2; - } else { - this.model.time = 0; - } - console.log(code, 'code'); const operate = { operation: '', val: code }; + this.getSectionList(code); if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) { operate.operation = OperationEvent.Section.alxeEffective.choose1.operation; @@ -327,12 +324,6 @@ export default { }); }, sectionSelectChange(code) { - if (this.model.confirmSectionCode === this.model.sectionCode) { - this.stepNum = 2; - } else { - this.model.time = 0; - } - console.log(code, 'code'); const operate = { operation: '', val: code @@ -345,9 +336,7 @@ export default { } this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - this.$store.dispatch('menuOperation/handleBreakFlag', { - break: true - }); + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); }); }, /** 确认计轴恢复工作*/ @@ -382,6 +371,7 @@ export default { } }).catch((error) => { this.loading = false; + this.doClose(); this.$refs.noticeInfo.doShow(operate, error.message); }); } else { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue index fea19772d..c4c738f62 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue @@ -15,11 +15,11 @@
操作设备
- + - 确认 - + 确认 +
@@ -28,13 +28,13 @@
操作设备
- - - + + + - 确认 - + 确认 +
@@ -49,7 +49,9 @@
状态
-
+
+ {{ message }} +
关闭 @@ -73,8 +75,10 @@ export default { dialogShow: false, selected: null, operation: null, + message: '', messageText1: '', + signalCode: '', messageText2: '', timeCountConfirm: -1, disabledConfirm1: false, @@ -120,8 +124,10 @@ export default { methods: { doShow(operate, selected) { this.selected = selected; + this.message = ''; if (!this.dialogShow) { this.messageText1 = selected.name; + this.signalCode = selected.code; this.operation = operate.operation; } @@ -132,6 +138,13 @@ export default { }, doClose() { this.dialogShow = false; + this.messageText1 = ''; + this.messageText2 = ''; + this.message = ''; + this.signalCode = ''; + this.timeCountConfirm = -1; + this.disabledConfirm1 = false; + this.disabledConfirm2 = true; this.$store.dispatch('training/emitTipFresh'); this.mouseCancelState(this.selected); }, @@ -170,30 +183,34 @@ export default { }); }, confirm2() { - const operate = { - operation: OperationEvent.Signal.unlock.confirm2.operation, - cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK - }; + if (this.messageText2 == this.signalCode) { + const operate = { + operation: OperationEvent.Signal.unlock.confirm2.operation, + cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK + }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.messageText2 = '*****'; - this.disabledConfirm2 = true; - this.timeCountConfirm = -1; - } - }).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); - }); + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + if (valid) { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + this.messageText2 = '*****'; + this.disabledConfirm2 = true; + this.timeCountConfirm = -1; + } + }).catch((error) => { + this.$refs.noticeInfo.doShow(operate, error.message); + }); + } else { + this.message = '选择信号机错误'; + } }, commit() { const operate = { over: true, - operation: OperationEvent.Signal.unlock.confirm.operation, + operation: OperationEvent.Signal.unlock.confirm.operation }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.doClose(); }).catch((error) => { this.doClose(); diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue index 730534019..bc4a172ed 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue @@ -29,7 +29,7 @@
操作设备
- + @@ -49,7 +49,9 @@
状态
-
+
+ {{ message }} +
关闭 @@ -73,8 +75,10 @@ export default { dialogShow: false, selected: null, operation: null, + message: '', messageText1: '', + sectionCode: '', messageText2: '', timeCountConfirm: -1, disabledConfirm1: false, @@ -107,6 +111,18 @@ export default { return '区故解'; } return ''; + }, + sectionLists() { + const list = []; + this.sectionList.forEach(section => { + let name = section.name; + if (section.type == '02') { + const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode); + name = `${sectionParent.name}-${section.name}`; + } + list.push({ name: name, code: section.code }); + }); + return list; } }, mounted() { @@ -125,12 +141,14 @@ export default { methods: { doShow(operate, selected) { this.selected = selected; + this.message = ''; if (!this.dialogShow) { - this.messageText1 = `${selected.name}(${selected.code})`; - // if (selected.parentCode) { - // const parentSection = this.$store.getters['map/getDeviceByCode'](selected.parentCode); - // this.messageText1 = `${parentSection.name}${selected.name}`; - // } + this.messageText1 = selected.name; + this.sectionCode = selected.code; + if (selected.type == '02') { + const sectionParent = this.$store.getters['map/getDeviceByCode'](selected.parentCode); + this.messageText1 = `${sectionParent.name}-${selected.name}`; + } this.operation = operate.operation; } @@ -145,6 +163,8 @@ export default { this.disabledConfirm2 = true; this.timeCountConfirm = -1; this.messageText1 = ''; + this.message = ''; + this.sectionCode = ''; this.messageText2 = ''; this.$store.dispatch('training/emitTipFresh'); this.mouseCancelState(this.selected); @@ -196,29 +216,33 @@ export default { }); }, confirm2() { - const operate = { - operation: '', - cmdType: '' - }; + if (this.messageText2 == this.sectionCode) { + const operate = { + operation: '', + cmdType: '' + }; - if (this.operation == OperationEvent.Section.unlock.menu.operation) { - operate.operation = OperationEvent.Section.unlock.confirm2.operation; - operate.cmdType = CMD.Section.CMD_SECTION_UNBLOCK; - } else if (this.operation == OperationEvent.Section.fault.menu.operation) { - operate.operation = OperationEvent.Section.fault.confirm2.operation; - operate.cmdType = CMD.Section.CMD_SECTION_FAULT_UNLOCK; - } - - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.messageText2 = '*****'; - this.disabledConfirm2 = true; - this.timeCountConfirm = -1; + if (this.operation == OperationEvent.Section.unlock.menu.operation) { + operate.operation = OperationEvent.Section.unlock.confirm2.operation; + operate.cmdType = CMD.Section.CMD_SECTION_UNBLOCK; + } else if (this.operation == OperationEvent.Section.fault.menu.operation) { + operate.operation = OperationEvent.Section.fault.confirm2.operation; + operate.cmdType = CMD.Section.CMD_SECTION_FAULT_UNLOCK; } - }).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); - }); + + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + if (valid) { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + this.messageText2 = '*****'; + this.disabledConfirm2 = true; + this.timeCountConfirm = -1; + } + }).catch((error) => { + this.$refs.noticeInfo.doShow(operate, error.message); + }); + } else { + this.message = '选择区段错误'; + } }, commit() { const operate = { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue index 12d1d58a1..40fb9821d 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue @@ -378,18 +378,24 @@ export default { /** 区段设置限速*/ operate.operation = OperationEvent.Section.setSpeed.order.operation; operate.message = `在【${this.name}】区段，区段设置限速${this.speed}km/h，确认下达吗？`; + if (this.speed == 0) { + operate.message = `在【${this.name}】区段，区段取消限速，确认下达吗？`; + } } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) { /** 区段取消限速*/ operate.operation = OperationEvent.Section.cancelSpeed.order.operation; - operate.message = `在【${this.name}】区段，区段取消限速${this.speed}km/h，确认下达吗？`; + operate.message = `在【${this.name}】区段，区段取消限速，确认下达吗？`; } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) { /** 道岔设置限速*/ operate.operation = OperationEvent.Switch.setSpeed.order.operation; operate.message = `在【${this.name}】区段，道岔设置限速${this.speed}km/h，确认下达吗？`; + if (this.speed == 0) { + operate.message = `在【${this.name}】区段，道岔区段取消限速，确认下达吗？`; + } } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) { /** 区段取消限速*/ operate.operation = OperationEvent.Switch.cancelSpeed.order.operation; - operate.message = `在【${this.name}】区段，道岔取消限速${this.speed}km/h，确认下达吗？`; + operate.message = `在【${this.name}】区段，道岔区段取消限速，确认下达吗？`; } this.setMessage('请点击“确认1”按钮，确认命令！'); diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue index 382f23406..4694819d4 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue @@ -29,7 +29,7 @@
道岔
- + @@ -49,7 +49,9 @@
状态
-
+
+ {{ message }} +
关闭 @@ -73,8 +75,10 @@ export default { dialogShow: false, selected: null, operation: null, + message: '', messageText1: '', + switchCode: '', messageText2: '', timeCountConfirm: -1, disabledConfirm1: false, @@ -125,8 +129,10 @@ export default { methods: { doShow(operate, selected) { this.selected = selected; + this.message = ''; if (!this.dialogShow) { this.messageText1 = selected.name; + this.switchCode = selected.code; this.operation = operate.operation; } @@ -139,6 +145,8 @@ export default { this.dialogShow = false; this.messageText1 = ''; this.messageText2 = ''; + this.message = ''; + this.switchCode = ''; this.timeCountConfirm = -1; this.disabledConfirm1 = false; this.disabledConfirm2 = true; @@ -192,28 +200,32 @@ export default { }); }, confirm2() { - const operate = { - operation: '', - cmdType: '' - }; - if (this.operation == OperationEvent.Switch.unlock.menu.operation) { - operate.operation = OperationEvent.Switch.unlock.confirm2.operation; - operate.cmdType = CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK; - } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) { - operate.operation = OperationEvent.Switch.unblock.confirm2.operation; - operate.cmdType = CMD.Switch.CMD_SWITCH_UNBLOCK; - } - - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.messageText2 = '*****'; - this.disabledConfirm2 = true; - this.timeCountConfirm = -1; + if (this.messageText2 == this.switchCode) { + const operate = { + operation: '', + cmdType: '' + }; + if (this.operation == OperationEvent.Switch.unlock.menu.operation) { + operate.operation = OperationEvent.Switch.unlock.confirm2.operation; + operate.cmdType = CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK; + } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) { + operate.operation = OperationEvent.Switch.unblock.confirm2.operation; + operate.cmdType = CMD.Switch.CMD_SWITCH_UNBLOCK; } - }).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); - }); + + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + if (valid) { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + this.messageText2 = '*****'; + this.disabledConfirm2 = true; + this.timeCountConfirm = -1; + } + }).catch((error) => { + this.$refs.noticeInfo.doShow(operate, error.message); + }); + } else { + this.message = '选择道岔错误'; + } }, commit() { const operate = { diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue index ce1d7d9be..c3b909c87 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue @@ -51,12 +51,12 @@ export default { cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK }, { - label: '区段激活跟踪', + label: '区段跟踪激活', handler: this.active, cmdType: CMD.Section.CMD_SECTION_ACTIVE }, { - label: '区段切除跟踪', + label: '区段跟踪切除', handler: this.split, cmdType: CMD.Section.CMD_SECTION_CUT_OFF }, diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue index a3c0cb378..230612add 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue @@ -124,7 +124,7 @@ export default { cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE }, { - label: '取消列车进路', + label: '取消进路', handler: this.cancelTrainRoute, cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE }, diff --git a/src/scripts/OperationConfig.js b/src/scripts/OperationConfig.js index 85fb67199..cf241917e 100644 --- a/src/scripts/OperationConfig.js +++ b/src/scripts/OperationConfig.js @@ -3462,7 +3462,7 @@ export const OperationList = { trainingName: '扣车({10}-{12} 站台)', trainingRemark: '设置扣车功能', trainingType: '05', - productTypes: ['02'], // 产品类型 01 现地 02 行调 + productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【扣车】' }, { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' } @@ -3476,7 +3476,7 @@ export const OperationList = { trainingName: '取消扣车({10}-{12} 站台)', trainingRemark: '取消扣车功能', trainingType: '05', - productTypes: ['02'], // 产品类型 01 现地 02 行调 + productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' }, { deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' } @@ -3518,7 +3518,7 @@ export const OperationList = { trainingName: '提前发车({10}-{12}站台)', trainingRemark: '提前发车功能', trainingType: '05', - productTypes: ['02'], + productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【提前发车】' }, { deviceType: '06', orderNum: 2, operateCode: '501', tip: '鼠标左键点击【确定】按钮' } @@ -3669,13 +3669,30 @@ export const OperationList = { trainingName: '查看站台信息({10}-{12}站台)', trainingRemark: '查看站台信息功能', trainingType: '05', - productTypes: ['02'], + productTypes: ['01', '02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【查看站台信息】' }, { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' } ] }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0402', + skinCode: '06', + trainingName: '区段故障解锁({8}{9})', + trainingRemark: '区段故障解锁', + trainingType: '04', + productTypes: ['02'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' }, + { deviceType: '03', orderNum: 2, operateCode: '4024', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '4028', tip: '鼠标左键选择({8}{9})区段', val: '' }, + { deviceType: '03', orderNum: 4, operateCode: '4025', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 5, operateCode: '402', tip: '鼠标左键点击【关闭】按钮' } + ] + }, { maxDuration: 15, minDuration: 8, @@ -3684,7 +3701,7 @@ export const OperationList = { trainingName: '区段跟踪切除({8}{9})', trainingRemark: '区段跟踪切除', trainingType: '04', - productTypes: ['02'], + productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【区段跟踪切除】' }, { deviceType: '03', orderNum: 2, operateCode: '405', tip: '鼠标左键点击【确定】按钮' } @@ -3698,7 +3715,7 @@ export const OperationList = { trainingName: '区段跟踪激活({8}{9})', trainingRemark: '区段跟踪激活功能', trainingType: '04', - productTypes: ['02'], + productTypes: ['01', '02'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段跟踪激活】' }, { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' } @@ -3708,7 +3725,7 @@ export const OperationList = { maxDuration: 15, minDuration: 8, operateType: '0407', - skinCode: '02', + skinCode: '06', trainingName: '设置临时限速({8}{9})', trainingRemark: '设置临时限速功能（限速值：5）', trainingType: '04', @@ -3727,7 +3744,7 @@ export const OperationList = { maxDuration: 15, minDuration: 8, operateType: '0407', - skinCode: '02', + skinCode: '06', trainingName: '设置临时限速({8}{9})', trainingRemark: '设置临时限速功能（限速值：自动）', trainingType: '04', @@ -3741,7 +3758,38 @@ export const OperationList = { { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' }, { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } ] - } + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0405', + skinCode: '06', + trainingName: '区段封锁({8}{9})', + trainingRemark: '区段封锁功能', + trainingType: '04', + productTypes: ['01'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '403', tip: '鼠标右键菜单选择【区段封锁】' }, + { deviceType: '03', orderNum: 2, operateCode: '403', tip: '鼠标左键点击【确定】按钮' } + ] + }, + // { + // maxDuration: 15, + // minDuration: 8, + // operateType: '0406', + // skinCode: '06', + // trainingName: '区段解封({8}{9})', + // trainingRemark: '区段解封功能', + // trainingType: '04', + // productTypes: ['01'], + // stepVOList: [ + // { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' }, + // { deviceType: '03', orderNum: 2, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' }, + // { deviceType: '03', orderNum: 3, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '' }, + // { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' }, + // { deviceType: '03', orderNum: 5, operateCode: '404', tip: '鼠标左键点击【关闭】按钮' } + // ] + // }, // { // maxDuration: 15, // minDuration: 8, @@ -3760,6 +3808,413 @@ export const OperationList = { // { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【关闭】按钮' } // ] // } + + { + maxDuration: 15, + minDuration: 8, + operateType: '0313', + skinCode: '06', + trainingName: '定操({7})', + trainingRemark: '定操({7})', + trainingType: '03', + productTypes: ['01', '02'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键菜单选择【定操】' }, + { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0313', // 0313 新增定位字典 + skinCode: '06', + trainingName: '反操({7})', + trainingRemark: '反操({7})', + trainingType: '03', + productTypes: ['01', '02'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【反操】' }, + { deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0308', + skinCode: '06', + trainingName: '区段切除({7})', + trainingRemark: '区段切除', + trainingType: '03', + productTypes: ['02'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【区段切除】' }, + { deviceType: '02', orderNum: 2, operateCode: '111', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0309', + skinCode: '06', + trainingName: '区段激活({7})', + trainingRemark: '区段激活功能', + trainingType: '03', + productTypes: ['02'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【区段激活】' }, + { deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' } + ] + }, + // { + // maxDuration: 15, + // minDuration: 8, + // operateType: '0314', + // skinCode: '02', + // trainingName: '确认计轴有效({8}{9})', + // trainingRemark: '确认计轴有效功能', + // trainingType: '04', + // productTypes: ['02'], + // stepVOList: [ + // { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' }, + // { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' }, + // { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' }, + // { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' }, + // { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, + // { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【关闭】按钮' } + // ] + // } + { + maxDuration: 15, + minDuration: 8, + operateType: '0301', + skinCode: '06', + trainingName: '道岔单锁({7})', + trainingRemark: '道岔单锁功能', + trainingType: '03', + productTypes: ['01'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' }, + { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' } + ] + }, + // { + // maxDuration: 15, + // minDuration: 8, + // operateType: '0302', + // skinCode: '06', + // trainingName: '道岔单解({7})', + // trainingRemark: '道岔单解功能', + // trainingType: '03', + // productTypes: ['01'], + // stepVOList: [ + // { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【区段解封】' }, + // { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' }, + // { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择({8}{9})区段', val: '' }, + // { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' }, + // { deviceType: '03', orderNum: 5, operateCode: '104', tip: '鼠标左键点击【关闭】按钮' } + // ] + // }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0303', + skinCode: '06', + trainingName: '道岔封锁({7})', + trainingRemark: '道岔封锁功能', + trainingType: '03', + productTypes: ['01'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' }, + { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' } + ] + }, + // { + // maxDuration: 15, + // minDuration: 8, + // operateType: '0304', + // skinCode: '06', + // trainingName: '道岔解封({7})', + // trainingRemark: '道岔解封功能', + // trainingType: '03', + // productTypes: ['01'], + // stepVOList: [ + // { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【区段解封】' }, + // { deviceType: '03', orderNum: 2, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' }, + // { deviceType: '03', orderNum: 3, operateCode: '1066', tip: '鼠标左键选择({8}{9})区段', val: '' }, + // { deviceType: '03', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' }, + // { deviceType: '03', orderNum: 5, operateCode: '106', tip: '鼠标左键点击【关闭】按钮' } + // ] + // }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0310', + skinCode: '06', + trainingName: '道岔区段设置限速({7})', + trainingRemark: '道岔区段设置限速功能（限速值：10）', + trainingType: '03', + productTypes: ['01', '02'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' }, + { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值5】', val: '10' }, + { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' }, + { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' }, + { deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' }, + { deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' }, + { deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0310', + skinCode: '06', + trainingName: '道岔区段设置限速({7})', + trainingRemark: '道岔区段设置限速功能（限速值：不限）', + trainingType: '03', + productTypes: ['01', '02'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' }, + { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值: 不限】', val: '0' }, + { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' }, + { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' }, + { deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' }, + { deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' }, + { deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } + ] + }, + + { + maxDuration: 15, + minDuration: 8, + operateType: '0201', + skinCode: '06', + trainingName: '排列进路({3})', + trainingRemark: '排列进路', + trainingType: '02', + productTypes: ['01', '02'], + 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: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0202', + skinCode: '06', + trainingName: '取消进路({3})', + trainingRemark: '取消进路', + trainingType: '02', + productTypes: ['01', '02'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消进路】' }, + { deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 8, + minDuration: 5, + operateType: '0206', + skinCode: '06', + trainingName: '信号重开({3} 进路)', + trainingRemark: '信号重开功能', + trainingType: '02', + productTypes: ['01', '02'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' }, + { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0208', + skinCode: '06', + trainingName: '进路交自动控({5})', + trainingRemark: '进路交自动控', + trainingType: '02', + productTypes: ['01', '02'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' }, + { deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择【{3}】进路', val: '{4}' }, + { deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0209', + skinCode: '06', + trainingName: '进路交人工控({5})', + trainingRemark: '进路交人工控', + trainingType: '02', + productTypes: ['01', '02'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路交人工控】' }, + { deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择【{3}】进路', val: '{4}' }, + { deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0211', + skinCode: '06', + trainingName: '设置通过模式({5})', + trainingRemark: '设置通过模式', + trainingType: '02', + productTypes: ['02'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【设置通过模式】' }, + { deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0211', + skinCode: '06', + trainingName: 'Fleet进路办理({5})', + trainingRemark: 'Fleet进路办理', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【Fleet进路办理】' }, + { deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0212', + skinCode: '06', + trainingName: '取消通过模式({5})', + trainingRemark: '取消通过模式', + trainingType: '02', + productTypes: ['02'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【取消通过模式】' }, + { deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0212', + skinCode: '06', + trainingName: 'Fleet进路取消({5})', + trainingRemark: 'Fleet进路取消', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【Fleet进路取消】' }, + { deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0212', + skinCode: '06', + trainingName: '人工解锁进路({5})', + trainingRemark: '人工解锁进路', + trainingType: '02', + productTypes: ['01', '02'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '318', tip: '鼠标右键菜单选择【人工解锁进路】' }, + { deviceType: '04', orderNum: 2, operateCode: '318', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0212', + skinCode: '06', + trainingName: '信号机引导办理({5})', + trainingRemark: '信号机引导办理', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【信号机引导办理】' }, + { deviceType: '04', orderNum: 2, operateCode: '308', tip: '鼠标左键点击【确定】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0203', + skinCode: '06', + trainingName: '信号封锁({5})', + trainingRemark: '信号封闭', + trainingType: '02', + productTypes: ['02'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封闭】' }, + { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' } + ] + }, + // { + // maxDuration: 15, + // minDuration: 8, + // operateType: '0204', + // skinCode: '06', + // trainingName: '信号解封({5})', + // trainingRemark: '信号解封功能', + // trainingType: '02', + // productTypes: ['01'], + // stepVOList: [ + // { deviceType: '03', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' }, + // { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' }, + // { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择({8}{9})区段', val: '' }, + // { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' }, + // { deviceType: '03', orderNum: 5, operateCode: '307', tip: '鼠标左键点击【关闭】按钮' } + // ] + // }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0210', + skinCode: '06', + trainingName: '查询进路控制状态({5})', + trainingRemark: '查询进路控制状态', + trainingType: '02', + productTypes: ['01', '02'], + stepVOList: [ + { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制模式】' }, + { deviceType: '04', orderNum: 2, operateCode: '316', tip: '鼠标左键点击【确定】按钮' } + ] + }, + + { + maxDuration: 20, + minDuration: 15, + operateType: '0103', + skinCode: '06', + trainingName: '请求遥控({1})', + trainingRemark: '控制权限转换，站控转中控', + trainingType: '01', + productTypes: ['02'], + stepVOList: [ + { deviceType: '05', orderNum: 1, operateCode: '202', tip: '鼠标左键点击顶部菜单栏【请求遥控】' }, + { deviceType: '05', orderNum: 2, operateCode: '202', tip: '鼠标左键点击【应用】' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0101', + skinCode: '06', + trainingName: '请求站控({1})', + trainingRemark: '控制权限转换，中控转站控', + trainingType: '01', + productTypes: ['01'], + stepVOList: [ + { deviceType: '05', orderNum: 1, operateCode: '204', tip: '鼠标左键点击顶部菜单栏【请求站控】' }, + { deviceType: '05', orderNum: 2, operateCode: '204', tip: '鼠标左键点击【应用】' } + ] + } ] } }; From 10170588554147cfba7a013c94fac5ff4d469af2 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 2 Apr 2020 09:48:55 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=AB=99=E5=8F=B0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/bejing_01.js | 4 +++- src/jmapNew/config/skinCode/chengdu_01.js | 3 +++ src/jmapNew/config/skinCode/chengdu_03.js | 7 +++++-- src/jmapNew/config/skinCode/foshan_01.js | 5 ++++- src/jmapNew/config/skinCode/haerbin_01.js | 1 + src/jmapNew/config/skinCode/ningbo_01.js | 7 ++++--- src/jmapNew/shape/StationStand/index.js | 12 ++++++------ 7 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js index 7ba21df8a..79ed83dc1 100644 --- a/src/jmapNew/config/skinCode/bejing_01.js +++ b/src/jmapNew/config/skinCode/bejing_01.js @@ -276,6 +276,7 @@ class SkinCode extends defaultStyle { }, reentry: {}, // 站台折返策略 detainCar: { // 扣车 + position: -1, // 扣车标识在站台上显示方向 text: 'H', // 扣车显示内容 offset: { x: -8, y: 13 }, // 扣车偏移量 centerTrainColor: '#FFFFFF', // 中心扣车颜色 @@ -285,7 +286,8 @@ class SkinCode extends defaultStyle { fontWeight: 'normal' }, stopTime: { // 停站时间 - offset: { x: -40, y: 10 }, // 运行时间偏移量 + position: 1, // 停站时间方向 + offset: { x: -8, y: 25 }, // 运行时间偏移量 textColor: '#FFFFFF', // 停站时间字体颜色 textFontSize: 8 }, diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js index 5bdd87705..5b9e79353 100644 --- a/src/jmapNew/config/skinCode/chengdu_01.js +++ b/src/jmapNew/config/skinCode/chengdu_01.js @@ -225,6 +225,7 @@ class SkinCode extends defaultStyle { }, reentry: {}, // 站台折返策略 detainCar: { // 扣车 + position: -1, // 扣车标识在站台上显示方向 text: 'H', // 扣车显示内容 offset: {x: -8, y: 13}, // 扣车偏移量 centerTrainColor: 'white', // 中心扣车颜色 @@ -234,11 +235,13 @@ class SkinCode extends defaultStyle { fontWeight: 'normal' }, stopTime: { // 停站时间 + position: 1, // 停站时间方向 offset: {x: -8, y: -4}, // 运行时间偏移量 textColor: 'white', // 停站时间字体颜色 textFontSize: 12 }, jump: { + position: 1, // 停跳方向 text: '跳', // 停跳显示内容 offset: {x: -8, y: 10}, textColor: '#00ffcc', // 停跳文字颜色 diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index c1bec15a9..a7f266b64 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -231,8 +231,9 @@ class SkinCode extends defaultStyle { }, reentry: {}, // 站台折返策略 detainCar: { // 扣车 + position: -1, // 扣车标识在站台上显示方向 text: '扣', // 扣车显示内容 - offset: {x: -8, y: 13}, // 扣车偏移量 + offset: {x: -8, y: 20}, // 扣车偏移量 centerTrainColor: '#C0C0C0', // 中心扣车颜色 andCenterTrainColor: '#C0C0C0', // 车站+中心扣车颜色 detainTrainTextColor: '#E4EF50', // 车站扣除文字颜色 @@ -240,11 +241,13 @@ class SkinCode extends defaultStyle { fontWeight: 'normal' }, stopTime: { // 停站时间 - offset: {x: -50, y: 10}, // 运行时间偏移量 + position: -1, // 停站时间方向 + offset: {x: -8, y: 10}, // 运行时间偏移量 textColor: '#FFFFFF', // 停站时间字体颜色 textFontSize: 10 }, jump: { + position: 1, // 停跳方向 text: '跳', // 停跳显示内容 offset: {x: -8, y: 10}, textColor: '#00ffcc', // 停跳文字颜色 diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js index a731e536d..0e0a0025a 100644 --- a/src/jmapNew/config/skinCode/foshan_01.js +++ b/src/jmapNew/config/skinCode/foshan_01.js @@ -220,6 +220,7 @@ class SkinCode extends defaultStyle { }, reentry: {}, // 站台折返策略 detainCar: { // 扣车 + position: 1, // 扣车标识在站台上显示方向 text: 'H', // 扣车显示内容 offset: {x: -8, y: 13}, // 扣车偏移量 centerTrainColor: '#FFFFFF', // 中心扣车颜色 @@ -229,11 +230,13 @@ class SkinCode extends defaultStyle { fontWeight: 'normal' }, stopTime: { // 停站时间 - offset: {x: 37, y: 5}, // 停站时间偏移量 + position: 1, // 停站时间方向 + offset: {x: -8, y: 5}, // 停站时间偏移量 textColor: '#C0C0C0', // 停站时间字体颜色 textFontSize: 11 }, jump: { + position: 1, // 停跳方向 text: 'S', // 停跳显示内容 offset: {x: -8, y: -5}, textColor: '#5376B3', // 停跳文字颜色 diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index c29d0e859..53b07a9d6 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -227,6 +227,7 @@ class SkinCode extends defaultStyle { }, reentry: {}, // 站台折返策略 detainCar: { // 扣车 + position: 1, // 扣车标识在站台上显示方向 text: 'H', // 扣车显示内容 fontSize: 18, // 扣车字体大小 offset: { x: 60, y: -20 }, // 扣车偏移量 diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index d05a0e75c..a4581ca85 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -329,8 +329,9 @@ class SkinCode extends defaultStyle { }, reentry: {}, // 站台折返策略 detainCar: { // 扣车 - text: 'H', // 扣车显示内容 - offset: { x: -8, y: 0 }, // 扣车偏移量 + position: 1, // 扣车标识在站台上显示方向 + text: 'H', // 扣车显示内容 + offset: { x: -8, y: 10 }, // 扣车偏移量 centerTrainColor: 'white', // 中心扣车颜色 andCenterTrainColor: 'red', // 车站+中心扣车颜色 detainTrainTextColor: '#E4EF50', // 车站扣除文字颜色 @@ -338,7 +339,7 @@ class SkinCode extends defaultStyle { fontWeight: 'normal' }, stopTime: { // 停站时间 - offset: { x: -40, y: -5 }, // 运行时间偏移量 + offset: { x: -8, y: 4 }, // 运行时间偏移量 textColor: 'white', // 停站时间字体颜色 textFontSize: 10 // 停站时间字体大小 }, diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js index e707615a3..766b40ee1 100644 --- a/src/jmapNew/shape/StationStand/index.js +++ b/src/jmapNew/shape/StationStand/index.js @@ -133,8 +133,8 @@ class StationStand extends Group { /** 站台扣车*/ const detainD = model.right ? 1 : -1; - const detainX = model.position.x - (detainD) * (style.StationStand.detainCar.offset.x - model.width / 2); - const detainY = model.position.y + (detainD) * (style.StationStand.detainCar.offset.y - model.height / 2); + const detainX = model.position.x - style.StationStand.detainCar.position * detainD * (style.StationStand.detainCar.offset.x - model.width / 2); + const detainY = model.position.y + detainD * (style.StationStand.detainCar.offset.y - model.height / 2); this.detain = new EDetain({ zlevel: this.zlevel, z: this.z, @@ -150,8 +150,8 @@ class StationStand extends Group { /** 停站时间*/ if (style.StationStand.stopTime.offset) { const timeDrict = model.right ? 1 : -1; - const timeX = model.position.x + timeDrict * style.StationStand.stopTime.offset.x; - const timeY = model.position.y + timeDrict * style.StationStand.stopTime.offset.y; + const timeX = model.position.x + style.StationStand.stopTime.position * timeDrict * (style.StationStand.stopTime.offset.x - model.width / 2); + const timeY = model.position.y + timeDrict * (style.StationStand.stopTime.offset.y - model.height / 2); this.time = new ETime({ zlevel: this.zlevel, z: this.z + 1, @@ -180,9 +180,9 @@ class StationStand extends Group { /** 列车停跳 */ if (style.StationStand.common.haveJumpShow) { const jumpDirct = model.right ? -1 : 1; - const jumpX = model.position.x - jumpDirct * (style.StationStand.jump.offset.x - model.width / 2); + const jumpX = model.position.x - jumpDirct * style.StationStand.jump.position * (style.StationStand.jump.offset.x - model.width / 2); const jumpY = model.position.y + jumpDirct * style.StationStand.jump.offset.y; - const jumpCX = model.position.x - jumpDirct * (style.StationStand.jump.offset.x - model.width / 2); + const jumpCX = model.position.x - jumpDirct * style.StationStand.jump.position * (style.StationStand.jump.offset.x - model.width / 2); const jumpCY = model.position.y + jumpDirct * style.StationStand.jump.offset.y; this.jump = new EJump({ zlevel: this.zlevel, From 8117a31c805c52d5d08f7cbb55d2419204759292 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 2 Apr 2020 10:51:47 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/fuzhou_01.js | 11 +- .../ningbo_01/menus/dialog/alxeEffective.vue | 34 ++-- .../menus/dialog/childDialog/popupAlarm.vue | 151 ++++++++++-------- .../menus/dialog/routeHandControl.vue | 69 ++++---- .../ningbo_01/menus/dialog/routeSelection.vue | 3 +- src/scripts/OperationConfig.js | 12 +- src/scripts/cmdPlugin/ValidateHandler.js | 1 + src/utils/baseUrl.js | 19 --- .../mapoperate/switch/switchModle.vue | 2 +- 9 files changed, 138 insertions(+), 164 deletions(-) delete mode 100644 src/utils/baseUrl.js diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js index 5d039fa98..afd405d6f 100644 --- a/src/jmapNew/config/skinCode/fuzhou_01.js +++ b/src/jmapNew/config/skinCode/fuzhou_01.js @@ -211,7 +211,8 @@ class SkinCode extends defaultStyle { }, standEmergent: { // 紧急关闭 mergentR: 4, // 站台紧急关闭半径 - offset: {x: 0, y: 40}, // 站台紧急关闭偏移量 + insideOffset: { x: 0, y: 25 }, // 内站台紧急关闭偏移量 + outsideOffset: { x: 0, y: -25 }, // 外站台紧急关闭偏移量 closeColor: '#F61107' // 站台紧急关闭颜色 }, reentry: { // 站台折返策略 @@ -394,8 +395,12 @@ class SkinCode extends defaultStyle { core: { length: 6 // 道岔单边长度 }, - block: { // 道岔封锁配置 - blockName: 'default' // 默认道岔封锁类型 + jointImg: { // 道岔 A B C D四元素属性配置 + trapezoidLength: 8, // 直角梯形元素默认长度 + block: false, // 联合图形封锁状态 + flashingColors: '#D600D5', // 联合图形封锁闪烁显示颜色 + fork: false, // 挤岔专用（如有挤岔操作 变为true） + forKColor: 'red' // 挤岔颜色 配合挤岔专用 }, arcBlcok: { // 圆形封锁图形 show: false, // 显示 diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue index 114a3fa89..c25c4d969 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue @@ -223,27 +223,19 @@ export default { if (selected) { this.model.sectionCode = selected.code; if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) { - if (selected.isSwitchSection) { - const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode); - if (section) { - this.model.sectionName = section.name; - } + const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode); + if (section) { + this.model.sectionName = `${section.name}-${selected.name}(${selected.code})`; } else { - const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode); - if (section) { - this.model.sectionName = section.name; - this.model.sectionName = `${section.name}-${selected.name}`; - } else { - this.model.sectionName = `${selected.name}`; - } + this.model.sectionName = `${selected.name}(${selected.code})`; } } else if (selected._type.toUpperCase() === 'Switch'.toUpperCase()) { - const section = this.$store.getters['map/getDeviceByCode'](selected.switchSectionCode); + const section = this.$store.getters['map/getDeviceByCode'](selected.sectionParentCode); if (section) { - this.model.sectionName = section.name; + this.model.sectionName = `${section.name}(${section.code})`; + this.model.sectionCode = section.code; } } - const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode); if (station) { this.model.stationName = station.name; @@ -268,10 +260,10 @@ export default { this.randomSectionList = []; this.sectionList.forEach(section => { if (section.stationCode == code) { - let name = section.name; + let name = `${section.name}(${section.code})`; if (section.type == '02') { const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode); - name = `${sectionParent.name}-${section.name}`; + name = `${sectionParent.name}-${section.name}(${section.code})`; } this.randomSectionList.push({ name: `${name}`, code: section.code }); } @@ -364,10 +356,10 @@ export default { if (valid) { this.type = 'text'; this.stopTask(); - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$refs.popupAlarm.doShow( - Object.assign(this.operate, {val: operate.val}), [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`] - ); + // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + // this.$refs.popupAlarm.doShow( + // Object.assign(this.operate, {val: operate.val}), [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`] + // ); } }).catch((error) => { this.loading = false; diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue index 98cfc9f16..7c8195fc5 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue @@ -1,84 +1,93 @@ \ No newline at end of file + diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue index 822c8b42a..1b9bf35ce 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue @@ -39,7 +39,7 @@ v-model="changeList[scope.$index]" style="text-align: center; display: block;" :disabled="scope.row.disabled" - @change="changeCheck(changeList[scope.$index],scope.row.code)" + @change="changeCheck(changeList[scope.$index], scope.row.code)" /> @@ -116,13 +116,12 @@ export default { return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; }, domIdChoose() { - if (this.dialogShow) { - if (this.operation == OperationEvent.Signal.humanControl.menu.operation) { - return OperationEvent.Signal.humanControl.choose.domId; - } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) { - return OperationEvent.Signal.atsAutoControl.choose.domId; - } + if (this.operation == OperationEvent.Signal.humanControl.menu.operation) { + return OperationEvent.Signal.humanControl.choose.domId; + } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) { + return OperationEvent.Signal.atsAutoControl.choose.domId; } + return ''; }, domIdConfirm() { return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : ''; @@ -133,6 +132,7 @@ export default { } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) { return '进路交自动控'; } + return ''; } }, watch: { @@ -205,6 +205,7 @@ export default { } if (this.selection.length > 0) { this.commitDisabled = false; + this.handleChooseChange(); } else { this.commitDisabled = true; } @@ -237,43 +238,27 @@ export default { this.commitDisabled = true; } }, - // serializeCodeListWithSeparator(sep) { - // const codeList = []; - // if (this.selection && this.selection.length) { - // this.selection.forEach(elem => { - // codeList.push(elem.code); - // }); - // } - // return codeList.join(sep); - // }, - // handleChooseChange(selection) { - // this.selection = selection; - // if (selection && selection.length) { - // const operate = { - // repeat: true, - // type: MapDeviceType.Signal.type, - // operation: '', - // val: this.serializeCodeListWithSeparator('::'), - // selection: selection - // }; + handleChooseChange() { + const codeList = this.selection.map(elem => { return elem; }); + const operate = { + operation: '', + val: codeList.join('::') + }; - // if (this.operation == OperationEvent.Signal.humanControl.menu.operation) { - // /** 进路交人工控*/ - // operate.operation = OperationEvent.Signal.humanControl.choose.operation; - // } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) { - // /** 进路交自动控*/ - // operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation; - // } + if (this.operation == OperationEvent.Signal.humanControl.menu.operation) { + /** 进路交人工控*/ + operate.operation = OperationEvent.Signal.humanControl.choose.operation; + } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) { + /** 进路交自动控*/ + operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation; + } - // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { - // if (valid) { - // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - // } - // }); - // } else if (!selection) { - // this.$messageBox(`请选择一条数据`); - // } - // }, + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + if (valid) { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + } + }); + }, commit() { if (this.operation == OperationEvent.Signal.humanControl.menu.operation) { /** 进路交人工控*/ diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue index a1028e3bc..2d2286ee7 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue @@ -166,7 +166,8 @@ export default { // 设置选中指令 const operate = { - operation: OperationEvent.Signal.arrangementRoute.choose.operation + operation: OperationEvent.Signal.arrangementRoute.choose.operation, + val: row.code }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { diff --git a/src/scripts/OperationConfig.js b/src/scripts/OperationConfig.js index cf241917e..32edd18d5 100644 --- a/src/scripts/OperationConfig.js +++ b/src/scripts/OperationConfig.js @@ -3805,7 +3805,7 @@ export const OperationList = { // { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' }, // { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' }, // { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, - // { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【关闭】按钮' } + // { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } // ] // } @@ -3880,7 +3880,7 @@ export const OperationList = { // { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' }, // { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' }, // { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, - // { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【关闭】按钮' } + // { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } // ] // } { @@ -4116,7 +4116,7 @@ export const OperationList = { { maxDuration: 15, minDuration: 8, - operateType: '0212', + operateType: '0215', skinCode: '06', trainingName: '人工解锁进路({5})', trainingRemark: '人工解锁进路', @@ -4130,7 +4130,7 @@ export const OperationList = { { maxDuration: 15, minDuration: 8, - operateType: '0212', + operateType: '0216', skinCode: '06', trainingName: '信号机引导办理({5})', trainingRemark: '信号机引导办理', @@ -4195,7 +4195,7 @@ export const OperationList = { trainingName: '请求遥控({1})', trainingRemark: '控制权限转换，站控转中控', trainingType: '01', - productTypes: ['02'], + productTypes: ['02'], // 行调请求中控 stepVOList: [ { deviceType: '05', orderNum: 1, operateCode: '202', tip: '鼠标左键点击顶部菜单栏【请求遥控】' }, { deviceType: '05', orderNum: 2, operateCode: '202', tip: '鼠标左键点击【应用】' } @@ -4209,7 +4209,7 @@ export const OperationList = { trainingName: '请求站控({1})', trainingRemark: '控制权限转换，中控转站控', trainingType: '01', - productTypes: ['01'], + productTypes: ['01'], // 现地请求站控 stepVOList: [ { deviceType: '05', orderNum: 1, operateCode: '204', tip: '鼠标左键点击顶部菜单栏【请求站控】' }, { deviceType: '05', orderNum: 2, operateCode: '204', tip: '鼠标左键点击【应用】' } diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js index 1e69bf282..744c36766 100644 --- a/src/scripts/cmdPlugin/ValidateHandler.js +++ b/src/scripts/cmdPlugin/ValidateHandler.js @@ -52,6 +52,7 @@ class ValidateHandler { const order = Handler.getOrder(); let valid = false; + debugger; if (operate.over && steps.length == 1) { // 右键菜单直接发送校验 if (operate && steps[0] && operate.code == steps[0].code && diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js deleted file mode 100644 index acaa7a611..000000000 --- a/src/utils/baseUrl.js +++ /dev/null @@ -1,19 +0,0 @@ - -export function getBaseUrl() { - let BASE_API; - if (process.env.NODE_ENV === 'development') { - // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; - // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 - // BASE_API = 'http://192.168.3.6:9000'; // 旭强 - // BASE_API = 'http://192.168.3.41:9000'; // 张赛 - // BASE_API = 'http://192.168.3.82:9000'; // 杜康 - // BASE_API = 'http://192.168.3.41:9000'; // 张赛 - // BASE_API = 'http://b29z135112.zicp.vip'; - // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 - // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 - } else { - BASE_API = process.env.VUE_APP_BASE_API; - } - return BASE_API; -} diff --git a/src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue b/src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue index 303df9cf9..bf7f18113 100644 --- a/src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue +++ b/src/views/newMap/newMapdraft/mapoperate/switch/switchModle.vue @@ -126,7 +126,7 @@ export default { methods:{ deviceChange(code) { this.$emit('setCenter', code); - this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code)); + this.setModel(this.$store.getters['map/getDeviceByCode'](code)); }, setModel(data) { this.$refs.dataform.resetFields(); From 4bce310d4f7c3d8669ff0a5becc607a1ccd28600 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 2 Apr 2020 11:10:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=A6=8F=E5=B7=9E=E7=9A=AE=E8=82=A4?= =?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/jmapNew/config/skinCode/fuzhou_01.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js index afd405d6f..21583a081 100644 --- a/src/jmapNew/config/skinCode/fuzhou_01.js +++ b/src/jmapNew/config/skinCode/fuzhou_01.js @@ -223,7 +223,7 @@ class SkinCode extends defaultStyle { }, detainCar: { // 扣车 text: 'H', // 扣车显示内容 - position: -1, // 扣车方向 + position: 1, // 扣车方向 offset: {x: -8, y: -6}, // 扣车偏移量 trainColor: '#E4EF50', // 车站扣车颜色 centerTrainColor: '#FFFFFF', // 中心扣车颜色 @@ -240,6 +240,8 @@ class SkinCode extends defaultStyle { offset: {x: -8, y: 6}, // 运行等级偏移量 textColor: '#FFFFFF' // 停站等级字体颜色 }, + trainStop: {}, // 停车标志 + trainDepart: {}, // 停车计时 text: { fontSize: 11, // 字体大小 fontWeight: 'normal', // 字体粗细 From 864cbd04200d9efc5f63ee577dcd65f7e5eca500 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 2 Apr 2020 11:20:35 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - src/utils/baseUrl.js | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 src/utils/baseUrl.js diff --git a/.gitignore b/.gitignore index 424ec74dd..b3798daf9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ yarn-debug.log* yarn-error.log* package-lock.json tests/**/coverage/ -src/utils/baseUrl.js # Editor directories and files .idea diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js new file mode 100644 index 000000000..e9046878d --- /dev/null +++ b/src/utils/baseUrl.js @@ -0,0 +1,18 @@ +export function getBaseUrl() { + let BASE_API; + if (process.env.NODE_ENV === 'development') { + // BASE_API = 'https://joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 + // BASE_API = 'http://192.168.3.6:9000'; // 旭强 + // BASE_API = 'http://192.168.3.41:9000'; // 张赛 + // BASE_API = 'http://192.168.3.82:9000'; // 杜康 + // BASE_API = 'http://192.168.3.41:9000'; // 张赛 + // BASE_API = 'http://b29z135112.zicp.vip'; + // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 + // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 + } else { + BASE_API = process.env.VUE_APP_BASE_API; + } + return BASE_API; +} From 75df1f7d2d8fe7f22e099c3eb503862cd5e19cd3 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 2 Apr 2020 14:46:21 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E8=80=83=E8=AF=95&?= =?UTF-8?q?=E6=95=99=E5=AD=A6=E6=B7=BB=E5=8A=A0=E5=88=87=E6=8D=A2=E9=9B=86?= =?UTF-8?q?=E4=B8=AD=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/haerbin_01/menus/menuButton.vue | 5 ++-- .../theme/haerbin_01/menus/menuSection.vue | 29 +------------------ src/scripts/cmdPlugin/ValidateHandler.js | 1 - src/views/newMap/displayNew/index.vue | 25 ++++++++++++++-- src/views/newMap/displayNew/menuExam.vue | 24 +++++++++++++++ src/views/newMap/displayNew/menuLesson.vue | 24 +++++++++++++++ 6 files changed, 74 insertions(+), 34 deletions(-) diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index 3d0e7f516..2af6b698e 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -26,9 +26,8 @@ :data="tempData" border :cell-style="tableStyle" - style="width: 100%;background: #E0E0E0;border: none;outline: none;" + style="width: 100%;background: #E0E0E0;border: none;outline: none; height: 56px" size="mini" - height="56" class="haerbin_table" highlight-current-row :show-header="false" @@ -107,7 +106,7 @@ export default { { name: '重复开放', cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, operate: OperationEvent.Signal.reopenSignal.menu, show: false }, { name: '封锁信号', cmdType: CMD.Signal.CMD_SIGNAL_BLOCK, operate: OperationEvent.Signal.lock.menu, show: false }, { name: '解封信号', cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK, operate: OperationEvent.Signal.unlock.menu, show: false }, - { name: '关单信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.cancelAutoTrigger.menu, show: false } + { name: '关单信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menu, show: false } ], routeParamList: [ { name: 'ATP进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menu, show: false }, diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSection.vue b/src/jmapNew/theme/haerbin_01/menus/menuSection.vue index 5eda9c020..50c2225aa 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuSection.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuSection.vue @@ -42,34 +42,7 @@ export default { return { menu: [], menuNormal: { - Local: [ - // { - // label: '区段故障解锁', - // handler: this.fault, - // cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK - // }, - { - label: '区段封锁', - handler: this.lock, - cmdType: CMD.Section.CMD_SECTION_BLOCK - }, - { - label: '区段解封', - handler: this.unlock, - cmdType: CMD.Section.CMD_SECTION_UNBLOCK - }, - { - label: '区段设置限速', - handler: this.setSpeed, - cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED - - }, - { - label: '区段取消限速', - handler: this.cancelSpeed, - cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED - } - ], + Local: [], Center: [ // { // label: '区段故障解锁', diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js index 744c36766..1e69bf282 100644 --- a/src/scripts/cmdPlugin/ValidateHandler.js +++ b/src/scripts/cmdPlugin/ValidateHandler.js @@ -52,7 +52,6 @@ class ValidateHandler { const order = Handler.getOrder(); let valid = false; - debugger; if (operate.over && steps.length == 1) { // 右键菜单直接发送校验 if (operate && steps[0] && operate.code == steps[0].code && diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index 66f552b1a..68eb448ec 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -4,9 +4,30 @@ - + - + {{ formatUsedTime }} + + +
@@ -41,6 +44,24 @@ export default { offsetBottom: { type: Number, required: true + }, + showSelectStation: { + type: Boolean, + default() { + return false; + } + }, + stationList: { + type: Array, + default() { + return []; + } + }, + showStation: { + type: String, + default() { + return ''; + } } }, data() { @@ -152,6 +173,9 @@ export default { refresh() { this.isDisable = false; this.$store.dispatch('training/end', null); + }, + switchStationMode(val) { + this.$emit('switchStationMode', val); } } }; diff --git a/src/views/newMap/displayNew/menuLesson.vue b/src/views/newMap/displayNew/menuLesson.vue index a0d1977f9..df4991610 100644 --- a/src/views/newMap/displayNew/menuLesson.vue +++ b/src/views/newMap/displayNew/menuLesson.vue @@ -9,6 +9,9 @@ {{ formatUsedTime }} {{ $t('display.lesson.score') }}{{ formatScore }} + + +
@@ -55,6 +58,24 @@ export default { offsetBottom: { type: Number, required: true + }, + showSelectStation: { + type: Boolean, + default() { + return false; + } + }, + stationList: { + type: Array, + default() { + return []; + } + }, + showStation: { + type: String, + default() { + return ''; + } } }, data() { @@ -201,6 +222,9 @@ export default { } else { buttons.setAttribute('style', ''); } + }, + switchStationMode(val) { + this.$emit('switchStationMode', val); } } }; From dd26f5fd96ad0c28665042ac98b2014e5955d9cc Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 2 Apr 2020 15:00:28 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=81=E6=B3=A2?= =?UTF-8?q?=E4=B8=80=E5=8F=B7=E7=BA=BF=E5=AE=9E=E8=AE=AD=E6=AD=A5=E9=AA=A4?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../childDialog/confirmControlSpeed.vue | 272 +++++++++--------- .../ningbo_01/menus/dialog/routeDetail.vue | 4 +- .../ningbo_01/menus/dialog/sectionUnLock.vue | 30 +- .../menus/dialog/speedLimitControl.vue | 6 +- .../menus/dialog/standBulkBuckleTrain.vue | 7 +- .../ningbo_01/menus/dialog/switchUnLock.vue | 28 +- src/scripts/OperationConfig.js | 251 ++++++++-------- src/scripts/cmdPlugin/OperationHandler.js | 4 + src/scripts/cmdPlugin/ValidateHandler.js | 2 +- .../mapsystemNew/plugin/trainingtip.vue | 2 +- 10 files changed, 336 insertions(+), 270 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue index a73f00076..d1962a1d9 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue @@ -1,148 +1,156 @@ \ No newline at end of file + diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue index fa74d117a..237066fbb 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue @@ -41,8 +41,6 @@ @@ -134,7 +132,7 @@ export default { commit() { const operate = { over: true, - operation: OperationEvent.Signal.detail.menu.operation, + operation: OperationEvent.Signal.detail.menu.operation }; this.loading = true; diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue index bc4a172ed..fc8144152 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue @@ -93,16 +93,36 @@ export default { return this.dialogShow && !this.$store.state.menuOperation.break; }, domIdChoose() { - return this.dialogShow ? OperationEvent.Section.unlock.choose.domId : ''; + if (this.operation == OperationEvent.Section.unlock.menu.operation) { + return OperationEvent.Section.unlock.choose.domId; + } else if (this.operation == OperationEvent.Section.fault.menu.operation) { + return OperationEvent.Section.fault.choose.domId; + } + return ''; }, confirmId1() { - return this.dialogShow ? OperationEvent.Section.unlock.confirm1.domId : ''; + if (this.operation == OperationEvent.Section.unlock.menu.operation) { + return OperationEvent.Section.unlock.confirm1.domId; + } else if (this.operation == OperationEvent.Section.fault.menu.operation) { + return OperationEvent.Section.fault.confirm1.domId; + } + return ''; }, confirmId2() { - return this.dialogShow ? OperationEvent.Section.unlock.confirm2.domId : ''; + if (this.operation == OperationEvent.Section.unlock.menu.operation) { + return OperationEvent.Section.unlock.confirm2.domId; + } else if (this.operation == OperationEvent.Section.fault.menu.operation) { + return OperationEvent.Section.fault.confirm2.domId; + } + return ''; }, domIdConfirm() { - return this.dialogShow ? OperationEvent.Section.unlock.confirm.domId : ''; + if (this.operation == OperationEvent.Section.unlock.menu.operation) { + return OperationEvent.Section.unlock.confirm.domId; + } else if (this.operation == OperationEvent.Section.fault.menu.operation) { + return OperationEvent.Section.fault.confirm.domId; + } + return ''; }, title() { if (this.operation == OperationEvent.Section.unlock.menu.operation) { @@ -218,6 +238,7 @@ export default { confirm2() { if (this.messageText2 == this.sectionCode) { const operate = { + over: true, operation: '', cmdType: '' }; @@ -246,7 +267,6 @@ export default { }, commit() { const operate = { - over: true, operation: '' }; diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue index 40fb9821d..b3d52ff6f 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue @@ -238,7 +238,7 @@ export default { return ''; }, domIdClose() { - return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; + return this.dialogShow ? OperationEvent.Command.close.menu.domId : ''; }, isCancelSpeed() { return this.operation == OperationEvent.Section.cancelSpeed.menu.operation || this.operation == OperationEvent.Switch.cancelSpeed.menu.operation; @@ -350,7 +350,8 @@ export default { }, speedSelectChange(val) { const operate = { - operation: '' + operation: '', + val: val }; if (this.operation == OperationEvent.Section.setSpeed.menu.operation) { @@ -529,7 +530,6 @@ export default { }, close() { const operate = { - type: this.type, operation: OperationEvent.Command.close.menu.operation }; this.writeRecord({ order: ++this.order, date: now(), context: '点击关闭', result: '' }); diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue index bd11783bd..803660914 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue @@ -76,7 +76,12 @@ export default { return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : ''; }, chooseId() { - return this.dialogShow ? OperationEvent.StationStand.setBulkBuckleTrain.choose.domId : ''; + if (this.operation == OperationEvent.StationStand.setBulkBuckleTrain.menu.operation) { + return OperationEvent.StationStand.setBulkBuckleTrain.choose.domId; + } else if (this.operation == OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation) { + return OperationEvent.StationStand.cancelBulkBuckleTrain.choose.domId; + } + return ''; }, title() { if (this.operation == OperationEvent.StationStand.setBulkBuckleTrain.menu.operation) { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue index 4694819d4..1058ad313 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue @@ -93,16 +93,36 @@ export default { return this.dialogShow && !this.$store.state.menuOperation.break; }, domIdChoose() { - return this.dialogShow ? OperationEvent.Switch.unlock.choose.domId : ''; + if (this.operation == OperationEvent.Switch.unlock.menu.operation) { + return OperationEvent.Switch.unlock.choose.domId; + } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) { + return OperationEvent.Switch.unblock.choose.domId; + } + return ''; }, confirmId1() { - return this.dialogShow ? OperationEvent.Switch.unlock.confirm1.domId : ''; + if (this.operation == OperationEvent.Switch.unlock.menu.operation) { + return OperationEvent.Switch.unlock.confirm1.domId; + } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) { + return OperationEvent.Switch.unblock.confirm1.domId; + } + return ''; }, confirmId2() { - return this.dialogShow ? OperationEvent.Switch.unlock.confirm2.domId : ''; + if (this.operation == OperationEvent.Switch.unlock.menu.operation) { + return OperationEvent.Switch.unlock.confirm2.domId; + } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) { + return OperationEvent.Switch.unblock.confirm2.domId; + } + return ''; }, domIdConfirm() { - return this.dialogShow ? OperationEvent.Switch.unlock.confirm.domId : ''; + if (this.operation == OperationEvent.Switch.unlock.menu.operation) { + return OperationEvent.Switch.unlock.confirm.domId; + } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) { + return OperationEvent.Switch.unblock.confirm.domId; + } + return ''; }, title() { if (this.operation == OperationEvent.Switch.unlock.menu.operation) { diff --git a/src/scripts/OperationConfig.js b/src/scripts/OperationConfig.js index 32edd18d5..8576c3568 100644 --- a/src/scripts/OperationConfig.js +++ b/src/scripts/OperationConfig.js @@ -5,18 +5,29 @@ // {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: "站台行驶方向(反)"} -// {id: "15", trainingType: "03", name: "道岔位置"} -// {id: "16", trainingType: "03", name: "道岔位置(反)"} + export const OperationList = { '01': { list: [] @@ -3684,13 +3695,13 @@ export const OperationList = { trainingName: '区段故障解锁({8}{9})', trainingRemark: '区段故障解锁', trainingType: '04', - productTypes: ['02'], + productTypes: ['01'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' }, { deviceType: '03', orderNum: 2, operateCode: '4024', tip: '鼠标左键点击【确定】按钮' }, { deviceType: '03', orderNum: 3, operateCode: '4028', tip: '鼠标左键选择({8}{9})区段', val: '' }, { deviceType: '03', orderNum: 4, operateCode: '4025', tip: '鼠标左键点击【确定】按钮' }, - { deviceType: '03', orderNum: 5, operateCode: '402', tip: '鼠标左键点击【关闭】按钮' } + { deviceType: '03', orderNum: 5, operateCode: '4023', tip: '鼠标左键点击【关闭】按钮' } ] }, { @@ -3731,7 +3742,7 @@ export const OperationList = { trainingType: '04', productTypes: ['02'], stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【区段设置限速】' }, + { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' }, { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值5】', val: '5' }, { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' }, @@ -3750,7 +3761,7 @@ export const OperationList = { trainingType: '04', productTypes: ['02'], stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【区段设置限速】' }, + { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' }, { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值自动】', val: '0' }, { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' }, @@ -3773,54 +3784,54 @@ export const OperationList = { { deviceType: '03', orderNum: 2, operateCode: '403', tip: '鼠标左键点击【确定】按钮' } ] }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0406', - // skinCode: '06', - // trainingName: '区段解封({8}{9})', - // trainingRemark: '区段解封功能', - // trainingType: '04', - // productTypes: ['01'], - // stepVOList: [ - // { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' }, - // { deviceType: '03', orderNum: 2, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 3, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '' }, - // { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 5, operateCode: '404', tip: '鼠标左键点击【关闭】按钮' } - // ] - // }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0409', - // skinCode: '02', - // trainingName: '确认计轴有效({8}{9})', - // trainingRemark: '确认计轴有效功能', - // trainingType: '04', - // productTypes: ['02'], - // stepVOList: [ - // { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' }, - // { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' }, - // { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' }, - // { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' }, - // { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, - // { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } - // ] - // } + { + maxDuration: 15, + minDuration: 8, + operateType: '0406', + skinCode: '06', + trainingName: '区段解封({8}{9})', + trainingRemark: '区段解封功能', + trainingType: '04', + productTypes: ['01'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' }, + { deviceType: '03', orderNum: 2, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '{19}' }, + { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 5, operateCode: '4042', tip: '鼠标左键点击【关闭】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0409', + skinCode: '06', + trainingName: '确认计轴有效({8}{9})', + trainingRemark: '确认计轴有效功能', + trainingType: '04', + productTypes: ['02'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' }, + { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' }, + { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{20}', val: '{22}' }, + { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '{19}' }, + { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, + { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } + ] + }, { maxDuration: 15, minDuration: 8, - operateType: '0313', + operateType: '0312', skinCode: '06', trainingName: '定操({7})', trainingRemark: '定操({7})', trainingType: '03', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键菜单选择【定操】' }, - { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】按钮' } + { deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标左键菜单选择【定操】' }, + { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【{7}】按钮' } ] }, { @@ -3865,24 +3876,24 @@ export const OperationList = { { deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' } ] }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0314', - // skinCode: '02', - // trainingName: '确认计轴有效({8}{9})', - // trainingRemark: '确认计轴有效功能', - // trainingType: '04', - // productTypes: ['02'], - // stepVOList: [ - // { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' }, - // { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' }, - // { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' }, - // { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' }, - // { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, - // { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } - // ] - // } + { + maxDuration: 15, + minDuration: 8, + operateType: '0314', + skinCode: '06', + trainingName: '确认计轴有效({8}{9})', + trainingRemark: '确认计轴有效功能', + trainingType: '03', + productTypes: ['02'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' }, + { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' }, + { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{21}', val: '{23}' }, + { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({25})', val: '{24}' }, + { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' }, + { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } + ] + }, { maxDuration: 15, minDuration: 8, @@ -3897,23 +3908,23 @@ export const OperationList = { { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' } ] }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0302', - // skinCode: '06', - // trainingName: '道岔单解({7})', - // trainingRemark: '道岔单解功能', - // trainingType: '03', - // productTypes: ['01'], - // stepVOList: [ - // { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【区段解封】' }, - // { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择({8}{9})区段', val: '' }, - // { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 5, operateCode: '104', tip: '鼠标左键点击【关闭】按钮' } - // ] - // }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0302', + skinCode: '06', + trainingName: '道岔单解({7})', + trainingRemark: '道岔单解功能', + trainingType: '03', + productTypes: ['01'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【区段解封】' }, + { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择({7})区段', val: '{17}' }, + { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 5, operateCode: '1042', tip: '鼠标左键点击【关闭】按钮' } + ] + }, { maxDuration: 15, minDuration: 8, @@ -3928,34 +3939,34 @@ export const OperationList = { { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' } ] }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0304', - // skinCode: '06', - // trainingName: '道岔解封({7})', - // trainingRemark: '道岔解封功能', - // trainingType: '03', - // productTypes: ['01'], - // stepVOList: [ - // { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【区段解封】' }, - // { deviceType: '03', orderNum: 2, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 3, operateCode: '1066', tip: '鼠标左键选择({8}{9})区段', val: '' }, - // { deviceType: '03', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 5, operateCode: '106', tip: '鼠标左键点击【关闭】按钮' } - // ] - // }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0304', + skinCode: '06', + trainingName: '道岔解封({7})', + trainingRemark: '道岔解封功能', + trainingType: '03', + productTypes: ['01'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【区段解封】' }, + { deviceType: '03', orderNum: 2, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '1066', tip: '鼠标左键选择({7})区段', val: '{17}' }, + { deviceType: '03', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 5, operateCode: '1062', tip: '鼠标左键点击【关闭】按钮' } + ] + }, { maxDuration: 15, minDuration: 8, operateType: '0310', skinCode: '06', - trainingName: '道岔区段设置限速({7})', - trainingRemark: '道岔区段设置限速功能（限速值：10）', + trainingName: '设置临时限速({7})', + trainingRemark: '设置临时限速功能（限速值：10）', trainingType: '03', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' }, + { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' }, { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值5】', val: '10' }, { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' }, @@ -3969,12 +3980,12 @@ export const OperationList = { minDuration: 8, operateType: '0310', skinCode: '06', - trainingName: '道岔区段设置限速({7})', - trainingRemark: '道岔区段设置限速功能（限速值：不限）', + trainingName: '设置临时限速({7})', + trainingRemark: '设置临时限速功能（限速值：不限）', trainingType: '03', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' }, + { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' }, { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值: 不限】', val: '0' }, { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' }, @@ -4149,29 +4160,29 @@ export const OperationList = { trainingName: '信号封锁({5})', trainingRemark: '信号封闭', trainingType: '02', - productTypes: ['02'], + productTypes: ['01'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封闭】' }, { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' } ] }, - // { - // maxDuration: 15, - // minDuration: 8, - // operateType: '0204', - // skinCode: '06', - // trainingName: '信号解封({5})', - // trainingRemark: '信号解封功能', - // trainingType: '02', - // productTypes: ['01'], - // stepVOList: [ - // { deviceType: '03', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' }, - // { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择({8}{9})区段', val: '' }, - // { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' }, - // { deviceType: '03', orderNum: 5, operateCode: '307', tip: '鼠标左键点击【关闭】按钮' } - // ] - // }, + { + maxDuration: 15, + minDuration: 8, + operateType: '0204', + skinCode: '06', + trainingName: '信号解封({5})', + trainingRemark: '信号解封功能', + trainingType: '02', + productTypes: ['01'], + stepVOList: [ + { deviceType: '03', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' }, + { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择({5})区段', val: '{6}' }, + { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' }, + { deviceType: '03', orderNum: 5, operateCode: '3072', tip: '鼠标左键点击【关闭】按钮' } + ] + }, { maxDuration: 15, minDuration: 8, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 914dc1650..35fd8bfec 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -1540,6 +1540,10 @@ export const OperationEvent = { menu: { operation: '516', domId: '_Tips-Stand-cancelBulkBuckleTrain-Menu' + }, + choose: { + operation: '5161', + domId: '_Tips-Stand-cancelBulkBuckleTrain-Choose' } }, // 区间列车数量限制 diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js index 744c36766..299a518db 100644 --- a/src/scripts/cmdPlugin/ValidateHandler.js +++ b/src/scripts/cmdPlugin/ValidateHandler.js @@ -52,7 +52,7 @@ class ValidateHandler { const order = Handler.getOrder(); let valid = false; - debugger; + // debugger; if (operate.over && steps.length == 1) { // 右键菜单直接发送校验 if (operate && steps[0] && operate.code == steps[0].code && diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue index 8262336b7..9ad892bbe 100644 --- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue +++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue @@ -133,7 +133,7 @@ export default { const domId = OperationHandler.getDomIdByOperation(step.operation); const btnDom = document.getElementById(domId); if (btnDom) { - const offset = getDomOffset(btnDom, true); + const offset = getDomOffset(btnDom); if (offset.x == 0 && offset.y == 0) { return null; }