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/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/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..acbeb301b 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuButton.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuButton.vue @@ -144,7 +144,7 @@