From 97d8a66ccbfa3cb04dced9106ce91ac39328d7e1 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 22 Jan 2021 16:55:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=81=93=E5=B2=94=E7=9A=84=E6=95=85?= =?UTF-8?q?=E9=9A=9C=E5=92=8C=E9=A2=84=E5=A4=8D=E4=BD=8D=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/haerbin_01.js | 4 ++-- src/jmapNew/config/skinCode/nanjing_02.js | 13 +++++++------ src/jmapNew/shape/Section/EblockLines.js | 3 +++ src/jmapNew/shape/Section/index.js | 23 ++++++++++++++++------- src/scripts/cmdPlugin/Config.js | 3 ++- 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index 10dea3cf8..5f394e279 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -6,7 +6,7 @@ class SkinCode extends defaultStyle { super(); this.fontFamily = '宋体'; this[deviceType.Section] = { - elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionBlock', 'speedLimitName'], + elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionMiddle', 'speedLimitName'], active: { routeColor: false // 进路触发颜色 }, @@ -103,7 +103,7 @@ class SkinCode extends defaultStyle { z: -1, activeStroke: '#2EBFBF' }, - sectionBlock: { + sectionMiddle: { z: 2 }, // 计轴 speedLimit: { // 限速元素 diff --git a/src/jmapNew/config/skinCode/nanjing_02.js b/src/jmapNew/config/skinCode/nanjing_02.js index 98e1a0c04..88444d257 100644 --- a/src/jmapNew/config/skinCode/nanjing_02.js +++ b/src/jmapNew/config/skinCode/nanjing_02.js @@ -6,7 +6,7 @@ class SkinCode extends defaultStyle { super(); this.fontFamily = '宋体'; this[deviceType.Section] = { - elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionBlock', 'separator', 'speedLimitName'], + elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionMiddle', 'separator', 'speedLimitName'], active: { routeColor: false // 进路触发颜色 }, @@ -89,7 +89,6 @@ class SkinCode extends defaultStyle { unCommunicationOccupiedColor: '#A600A6', // 区段非通讯车占用颜色 紫色 routeLockColor: '#00FF00', // 区段路由锁定颜色 空闲且被进路征用 protectiveLockColor: '#9DFF6E', // 区段保护锁闭 - blockColor: '#0010FF', // 区段封锁颜色 深蓝色 faultLockColor: '#9B4A0A', // 区段故障锁定颜色 @@ -101,15 +100,17 @@ class SkinCode extends defaultStyle { protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁 logicalColor: '#FFFF00', // 逻辑区段颜色 (未用) logicalTextColor: '#FFFFFF' // 逻辑区段名称颜色 (未用) - + }, + sectionMiddle: { + blockColor: '#0010FF', // 区段封锁颜色 深蓝色 + preResetColor: '#FFBEC9', // 区段计轴预复位 + z: 2 }, lineBorder: { // 哈尔滨点击背景 元素 z: -1, activeStroke: '#2EBFBF' }, - sectionBlock: { - z: 2 - }, // 计轴 + // 计轴 speedLimit: { // 限速元素 z: 2, width: 1, // 限速线的宽短 diff --git a/src/jmapNew/shape/Section/EblockLines.js b/src/jmapNew/shape/Section/EblockLines.js index 1557a28a5..b3b2b12f9 100644 --- a/src/jmapNew/shape/Section/EblockLines.js +++ b/src/jmapNew/shape/Section/EblockLines.js @@ -16,6 +16,9 @@ export default class ELines extends Group { this.model = model; this.zlevel = model.zlevel; this.z = model.z; + if (model.modelData.type === '01' && model.modelData.logicSectionCodeList && model.modelData.logicSectionCodeList.length) { + return; + } this.create(); } diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index 5a0bc429c..24f9b903a 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -55,7 +55,7 @@ export default class Section extends Group { 'destinationText': ETextName, // 目的码名称 'line': ELines, // 创建区段 'lineBorder': ELines, // 哈尔滨线路点击背景色 - 'sectionBlock': EblockLines, // 哈尔滨线路区段（封锁显示） + 'sectionMiddle': EblockLines, // 哈尔滨线路区段（封锁显示） 'stopRouteImg': EStopRouteImg, // 宁波三线路特有 'axle': EAxle, // 计轴 (西安二号线 ) 'separator': ESeparator, // 分隔符 @@ -88,8 +88,8 @@ export default class Section extends Group { if (this.line) { this.line.setCrossUnBlock(); this.line.stopAnimation(true); - this.sectionBlock && this.sectionBlock.hide(); // 因此特殊区段 - this.sectionBlock && this.sectionBlock.stopAnimation(); + this.sectionMiddle && this.sectionMiddle.hide(); // 因此特殊区段 + this.sectionMiddle && this.sectionMiddle.stopAnimation(); if (this.model.type == '01' && this.model.parentCode) { this.line.setStyle({stroke:'#5b5b5b'}); } else { @@ -189,10 +189,10 @@ export default class Section extends Group { /** 封锁 06*/ block(routeLock) { - if (this.sectionBlock && this.model.type !== '03') { - this.sectionBlock.setStyle({stroke: this.style.Section.line.blockColor}); - this.sectionBlock.show(); - routeLock && this.style.Section.line.routeBlockFlashing && this.sectionBlock.animateStyle(true, [ + if (this.sectionMiddle && this.model.type !== '03' && this.style.Section.sectionMiddle && this.style.Section.sectionMiddle.blockColor) { + this.sectionMiddle.setStyle({stroke: this.style.Section.line.blockColor}); + this.sectionMiddle.show(); + routeLock && this.style.Section.line.routeBlockFlashing && this.sectionMiddle.animateStyle(true, [ { time: 500, styles: { stroke: this.style.backgroundColor } }, { time: 1000, styles: { stroke: this.style.Section.line.blockColor } } ]); @@ -289,6 +289,13 @@ export default class Section extends Group { this.line && this.line.setStyle({stroke: '#7F7F7F'}); this.name && this.name.setStyle({textFill: '#7F7F7f'}); } + /** 计轴预复位 */ + preReset(blockade) { + if (this.style.Section.sectionMiddle && this.style.Section.sectionMiddle.preResetColor && !blockade) { // 南京二号线 + this.sectionMiddle.setStyle({stroke: this.style.Section.sectionMiddle.preResetColor}); + this.sectionMiddle.show(); + } + } // 南京二号线 setSwitchSectionColor(section1, section2) { section1 && section1.instance && section1.instance.line.setStyle({ stroke: this.style.Switch.sectionAction.spareColor }); @@ -354,6 +361,8 @@ export default class Section extends Group { model.nctOccupied && this.unCommunicationOccupied(); /** 通信车占用状态 */ model.ctOccupied && this.communicationOccupied(); + // 计轴预复位 + model.preReset && this.preReset(model.blockade); /** 区段切除*/ model.cutOff && this.sectionCutOff(); /** 是否限速*/ diff --git a/src/scripts/cmdPlugin/Config.js b/src/scripts/cmdPlugin/Config.js index 127970360..178ec14ba 100644 --- a/src/scripts/cmdPlugin/Config.js +++ b/src/scripts/cmdPlugin/Config.js @@ -39,7 +39,8 @@ export const deviceFaultType = { {label: '失表', value: 'SPLIT'}, {label: '定位失表', value: 'NORMAL_SPLIT'}, {label: '反位失表', value: 'REVERSE_SPLIT'}, - {label: '挤岔', value: 'SQUEEZE'} + {label: '挤岔', value: 'SQUEEZE'}, + {label: '计轴故障', value: 'AXLE_FAULT'} // {label: '道岔区段计轴故障', value: 'AXLE_FAULT'} ], StationStand: [ From 584a30a634ac68e38cc5c79f527dc5f76a4803e2 Mon Sep 17 00:00:00 2001 From: lVAL Date: Fri, 22 Jan 2021 17:39:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=8C=BA=E6=AE=B5?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=BB=BA=E5=88=97=E8=BD=A6=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E8=8F=9C=E5=8D=95=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?operate=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/ningbo_03/menus/menuBar.vue | 167 +++++++++++------- .../menus/menuDialog/initSignalBlock.vue | 90 +++++----- .../menuDialog/initializeSignalCanBlock.vue | 82 ++++----- .../menus/menuDialog/signalCanBlock.vue | 30 ++-- .../theme/ningbo_03/menus/menuSection.vue | 21 ++- src/scripts/cmdPlugin/OperationHandler.js | 145 ++++++++++++++- 6 files changed, 370 insertions(+), 165 deletions(-) diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue index e4e76c153..5a06858d1 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue @@ -245,6 +245,7 @@ export default { } }, data() { + console.log(OperationEvent.Command.commandNingBo.line_stand) return { classA: -1, classB: -1, @@ -256,7 +257,7 @@ export default { Local: [ // { // title: '窗口(W)', - // operate: OperationEvent.Command.mBar.system, + // operate: '', // children: [ // { // title: '报警', @@ -412,118 +413,139 @@ export default { }, { title: '线路(G)', - operate: '', + operate: OperationEvent.Command.commandNingBo.line, children: [ { title: '站台', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_stand, children: [ { title: '开放/关闭', - click: this.standOpenOrClose + click: this.standOpenOrClose, + operate: OperationEvent.Command.commandNingBo.line_stand_openOrClose }, { title: '设置/取消扣车', - click: this.setStandDetain + click: this.setStandDetain, + operate: OperationEvent.Command.commandNingBo.line_stand_holdOrNot }, { title: '设置站间列车数量', - // click: this.setIntervalStopNumber - click: this.undeveloped + click: this.undeveloped, + operate: OperationEvent.Command.commandNingBo.line_stand_trainNum }, { title: '分配停站时间', - click: this.setAllocateTime + click: this.setAllocateTime, + operate: OperationEvent.Command.commandNingBo.line_stand_stopTime }, { title: '授权转移', - click: this.authorizeTransfer + click: this.authorizeTransfer, + operate: OperationEvent.Command.commandNingBo.line_stand_transfer }, { title: '显示', - click: this.showStandDetail + click: this.showStandDetail, + operate: OperationEvent.Command.commandNingBo.line_stand_detail } ] }, { title: '道岔', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_switch, children: [ { - title: '命令', + title: '命令', + operate: OperationEvent.Command.commandNingBo.line_switch_cmd, click: this.setSwitchCommand }, { - title: '封锁', + title: '封锁', + operate: OperationEvent.Command.commandNingBo.line_switch_block, click: this.setBlockSwitch }, { - title: '解除封锁', + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo.line_switch_unblock, click: this.setUnblockSwitch }, { - title: '请求动岔/请求或授权/取消', + title: '请求动岔/请求或授权/取消', + operate: OperationEvent.Command.commandNingBo.line_switch_empower, click: this.setSwitchActive }, { - title: '显示', + title: '显示', + operate: OperationEvent.Command.commandNingBo.line_switch_detail, click: this.showSwitchDetail } ] }, { title: '信号机', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_signal, children: [ { - title: '引导', + title: '引导', + operate: OperationEvent.Command.commandNingBo.line_signal_guide, click: this.setSignalGuide }, { - title: '取消允许锁闭', + title: '取消允许锁闭', + operate: OperationEvent.Command.commandNingBo.line_signal_lockOrNot, click: this.setSignalCanBlock }, { - title: '进路/命令', + title: '进路/命令', + operate: OperationEvent.Command.commandNingBo.line_signal_cmd, click: this.setRouteCommand }, { - title: '信号指示模式', + title: '信号指示模式', + operate: OperationEvent.Command.commandNingBo.line_signal_indicator, click: this.setSignalModel }, { - title: '封锁', + title: '封锁', + operate: OperationEvent.Command.commandNingBo.line_signal_block, click: this.setSignalBlock }, { - title: '解除封锁', + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo.line_signal_unblock, click: this.setSignalCancelBlock }, { - title: '显示', + title: '显示', + operate: OperationEvent.Command.commandNingBo.line_signal_detail, click: this.showSignalDetail } ] }, { title: '轨道', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_section, children: [ { - title: '开放', + title: '开放', + operate: OperationEvent.Command.commandNingBo.line_section_open, click: this.handleOpenSection }, { - title: '关闭', + title: '关闭', + operate: OperationEvent.Command.commandNingBo.line_section_close, click: this.handleCloseSection }, { - title: '临时限速', + title: '临时限速', + operate: OperationEvent.Command.commandNingBo.line_section_limitSpeed, click: this.handleLimitSpeed }, { - title: '显示', + title: '显示', + operate: OperationEvent.Command.commandNingBo.line_section_detail, click: this.handleSectionShow } ] @@ -887,121 +909,142 @@ export default { }, { title: '线路(G)', - operate: '', + operate: OperationEvent.Command.commandNingBo.line, children: [ - { + { title: '站台', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_stand, children: [ { title: '开放/关闭', - click: this.standOpenOrClose + click: this.standOpenOrClose, + operate: OperationEvent.Command.commandNingBo.line_stand_openOrClose }, { title: '设置/取消扣车', - click: this.setStandDetain + click: this.setStandDetain, + operate: OperationEvent.Command.commandNingBo.line_stand_holdOrNot }, { title: '设置站间列车数量', - click: this.setIntervalStopNumber + click: this.undeveloped, + operate: OperationEvent.Command.commandNingBo.line_stand_trainNum }, { title: '分配停站时间', - click: this.setAllocateTime + click: this.setAllocateTime, + operate: OperationEvent.Command.commandNingBo.line_stand_stopTime }, { title: '授权转移', - click: this.authorizeTransfer + click: this.authorizeTransfer, + operate: OperationEvent.Command.commandNingBo.line_stand_transfer }, { title: '显示', - click: this.showStandDetail + click: this.showStandDetail, + operate: OperationEvent.Command.commandNingBo.line_stand_detail } ] }, { title: '道岔', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_switch, children: [ { - title: '命令', + title: '命令', + operate: OperationEvent.Command.commandNingBo.line_switch_cmd, click: this.setSwitchCommand }, { - title: '封锁', + title: '封锁', + operate: OperationEvent.Command.commandNingBo.line_switch_block, click: this.setBlockSwitch }, { - title: '解除封锁', + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo.line_switch_unblock, click: this.setUnblockSwitch }, { - title: '请求动岔/请求或授权/取消', + title: '请求动岔/请求或授权/取消', + operate: OperationEvent.Command.commandNingBo.line_switch_empower, click: this.setSwitchActive }, { - title: '显示', + title: '显示', + operate: OperationEvent.Command.commandNingBo.line_switch_detail, click: this.showSwitchDetail } ] }, - { + { title: '信号机', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_signal, children: [ - { - title: '引导', + title: '引导', + operate: OperationEvent.Command.commandNingBo.line_signal_guide, click: this.setSignalGuide }, { - title: '取消允许锁闭', + title: '取消允许锁闭', + operate: OperationEvent.Command.commandNingBo.line_signal_lockOrNot, click: this.setSignalCanBlock }, { - title: '进路/命令', + title: '进路/命令', + operate: OperationEvent.Command.commandNingBo.line_signal_cmd, click: this.setRouteCommand }, { - title: '信号指示模式', + title: '信号指示模式', + operate: OperationEvent.Command.commandNingBo.line_signal_indicator, click: this.setSignalModel }, { - title: '封锁', + title: '封锁', + operate: OperationEvent.Command.commandNingBo.line_signal_block, click: this.setSignalBlock }, { - title: '解除封锁', + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo.line_signal_unblock, click: this.setSignalCancelBlock }, { - title: '显示', + title: '显示', + operate: OperationEvent.Command.commandNingBo.line_signal_detail, click: this.showSignalDetail } ] }, - { + { title: '轨道', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_section, children: [ { - title: '开放', + title: '开放', + operate: OperationEvent.Command.commandNingBo.line_section_open, click: this.handleOpenSection }, { - title: '关闭', + title: '关闭', + operate: OperationEvent.Command.commandNingBo.line_section_close, click: this.handleCloseSection }, { - title: '临时限速', + title: '临时限速', + operate: OperationEvent.Command.commandNingBo.line_section_limitSpeed, click: this.handleLimitSpeed }, { - title: '显示', + title: '显示', + operate: OperationEvent.Command.commandNingBo.line_section_detail, click: this.handleSectionShow } ] - }, + }, { title: '闭塞区段', operate: '', @@ -1234,7 +1277,7 @@ export default { return true; }, initMenu(menu) { - const type = State2SimulationMap[this.$store.state.training.prdType]; + const type = State2SimulationMap[this.$store.state.training.prdType]; this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode); this.clickEvent(); this.closeMenu(true); diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue index 7bad76a30..d6058c012 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue @@ -1,48 +1,50 @@ diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 44d2efb5c..1639f04cf 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -234,7 +234,8 @@ export const OperationEvent = { operation: '0082', domId: '_Tips-commandHaerbin-confirmCr2{BOTTOM}' } - }, + }, + // 西安 commandXian: { confirm: { operation: '009', @@ -248,7 +249,145 @@ export const OperationEvent = { operation: '0092', domId: '_Tips-commandXian-requestBar{TOP}' } - } + }, + // 宁波三 + commandNingBo: { + //线路 + line: { + operation: '00a', + domId: '_Tips-ningBo-line{TOP}' + }, + //站台 + line_stand: { + operation: '00a0', + domId: '_Tips-ningBo-line-stand{TOP}' + }, + //开放或关闭 + line_stand_openOrClose: { + operation: '00a01', + domId: '_Tips-ningBo-line-stand-openOrClose{TOP}' + }, + //设置或取消扣车 + line_stand_holdOrNot: { + operation: '00a02', + domId: '_Tips-ningBo-line_stand_holdOrNote{TOP}' + }, + //设置站间列车数量 + line_stand_trainNum: { + operation: '00a03', + domId: '_Tips-ningBo-line_stand_trainNum{TOP}' + }, + //设置站间停站时间 + line_stand_stopTime: { + operation: '00a04', + domId: '_Tips-ningBo-line_stand_stopTime{TOP}' + }, + //授权转移 + line_stand_transfer: { + operation: '00a05', + domId: '_Tips-ningBo-line_stand_transfer{TOP}' + }, + //显示 + line_stand_detail: { + operation: '00a06', + domId: '_Tips-ningBo-line_stand_detail{TOP}' + }, + //道岔 + line_switch: { + operation: '00a1', + domId: '_Tips-ningBo-line-switch{TOP}' + }, + //命令 + line_switch_cmd: { + operation: '00a11', + domId: '_Tips-ningBo-line-switch-cmd{TOP}' + }, + //封锁 + line_switch_block: { + operation: '00a12', + domId: '_Tips-ningBo-line-switch-block{TOP}' + }, + //解除封锁 + line_switch_unblock: { + operation: '00a13', + domId: '_Tips-ningBo-line-switch-unblock{TOP}' + }, + //请求动岔/请求/授权 + line_switch_empower: { + operation: '00a14', + domId: '_Tips-ningBo-line-switch-empower{TOP}' + }, + //显示 + line_switch_detail: { + operation: '00a15', + domId: '_Tips-ningBo-line-switch-detail{TOP}' + }, + //信号机 + line_signal: { + operation: '00a2', + domId: '_Tips-ningBo-line-signal{TOP}' + }, + //引导 + line_signal_guide: { + operation: '00a21', + domId: '_Tips-ningBo-line-signal-guide{TOP}' + }, + //取消允许锁闭 + line_signal_lockOrNot: { + operation: '00a22', + domId: '_Tips-ningBo-line-signal-lockOrNot{TOP}' + }, + //进路 + line_signal_cmd: { + operation: '00a23', + domId: '_Tips-ningBo-line-signal-cmd{TOP}' + }, + //信号指示模式 + line_signal_indicator: { + operation: '00a24', + domId: '_Tips-ningBo-line-signal-indicator{TOP}' + }, + //封锁 + line_signal_block: { + operation: '00a25', + domId: '_Tips-ningBo-line-signal-block{TOP}' + }, + //解封 + line_signal_unblock: { + operation: '00a26', + domId: '_Tips-ningBo-line-signal-unblock{TOP}' + }, + //显示 + line_signal_detail: { + operation: '00a27', + domId: '_Tips-ningBo-line-signal-detail{TOP}' + }, + //轨道 + line_section: { + operation: '00a3', + domId: '_Tips-ningBo-line-section{TOP}' + }, + //开放 + line_section_open: { + operation: '00a31', + domId: '_Tips-ningBo-line-section-open{TOP}' + }, + //关闭 + line_section_close: { + operation: '00a32', + domId: '_Tips-ningBo-line-section-close{TOP}' + }, + //临时限速 + line_section_limitSpeed: { + operation: '00a33', + domId: '_Tips-ningBo-line-section-limitSpeed{TOP}' + }, + //显示 + line_section_detail: { + operation: '00a34', + domId: '_Tips-ningBo-line-section-detail{TOP}' + } + } }, // 站台概要表 StandTable: { @@ -2597,6 +2736,8 @@ export const OperationEvent = { }; +console.log(OperationEvent); + import { MapDeviceType } from './Config.js'; class OperationHandler { From d2d854b0c0d7d539026302e35a2f7acdb8243dba Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 22 Jan 2021 17:46:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=A2=84=E5=A4=8D=E4=BD=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/foshan_01.js | 4 ++++ src/jmapNew/config/skinCode/fuzhou_01.js | 6 ++++- .../theme/components/utils/menuOperate.js | 2 +- .../theme/foshan_01/menus/menuButton.vue | 3 ++- .../theme/foshan_01/menus/menuSection.vue | 24 +++++++++++++++++++ .../menus/dialog/switchCmdControl.vue | 2 +- .../theme/fuzhou_01/menus/menuSwitch.vue | 2 +- .../theme/fuzhou_01/operationConfig.js | 2 +- .../theme/fuzhou_01/operationConfigGlobal.js | 2 +- .../menus/dialog/switchCmdControl.vue | 2 +- .../menus/dialog/switchCmdControl.vue | 2 +- .../theme/nanjing_02/menus/menuButton.vue | 2 +- .../xian_01/menus/dialog/switchCmdControl.vue | 2 +- .../theme/xian_01/menus/menuSwitch.vue | 2 +- src/jmapNew/theme/xian_01/operationConfig.js | 2 +- src/scripts/cmdPlugin/CommandEnum.js | 2 +- src/utils/baseUrl.js | 4 ++-- 17 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js index ae5e1df6e..3616fb85c 100644 --- a/src/jmapNew/config/skinCode/foshan_01.js +++ b/src/jmapNew/config/skinCode/foshan_01.js @@ -98,6 +98,10 @@ class SkinCode extends defaultStyle { logicalTextColor: '#FFFFFF', // 逻辑区段名称颜色 (未用) invalidColor: '#A25100' // 区段ARB故障颜色 }, + sectionMiddle: { + preResetColor: '#4169E1', // 区段计轴预复位 + z: 2 + }, speedLimit: { // 限速元素 z: 2, width: 1, // 限速线的宽短 diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js index 36288a20e..d2eadb400 100644 --- a/src/jmapNew/config/skinCode/fuzhou_01.js +++ b/src/jmapNew/config/skinCode/fuzhou_01.js @@ -6,7 +6,7 @@ class SkinCode extends defaultStyle { super(); this.fontFamily = '宋体'; this[deviceType.Section] = { - elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'destinationText', 'line', 'separator', 'speedLimit'], + elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'destinationText', 'line', 'separator', 'speedLimit', 'sectionMiddle'], active: { routeColor: false // 进路触发颜色 }, @@ -98,6 +98,10 @@ class SkinCode extends defaultStyle { logicalTextColor: '#FFFFFF', // 逻辑区段名称颜色 (未用) invalidColor: '#A25100' // 区段ARB故障颜色 }, + sectionMiddle: { + preResetColor: '#00FFFF', // 区段计轴预复位 + z: 2 + }, speedLimit: { // 限速元素 z: 2, width: 1, // 限速线的宽短 diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index b64ae8c53..f5f4f386b 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -224,7 +224,7 @@ export const menuOperate = { axlePreReset:{ // 计轴预复位 operation: OperationEvent.Switch.axlePreReset.menu.operation, - cmdType: CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET + cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET }, hookLock:{ // 道岔钩锁 diff --git a/src/jmapNew/theme/foshan_01/menus/menuButton.vue b/src/jmapNew/theme/foshan_01/menus/menuButton.vue index 62cc07233..8125c30c0 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuButton.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuButton.vue @@ -144,7 +144,7 @@