diff --git a/src/jmapNew/shape/Section/ELines.js b/src/jmapNew/shape/Section/ELines.js index c72fb9127..cb245dcb7 100644 --- a/src/jmapNew/shape/Section/ELines.js +++ b/src/jmapNew/shape/Section/ELines.js @@ -376,9 +376,14 @@ export default class ELines extends Group { this.crossSection && this.crossSection.setStyle(styles); } - setOrignalCross() { - this.crossSection && this.crossSection.setStyle({lineWidth:0 }); - // fill:this.model.style.Section.cross.crossSection.fillColor + setOrignalCross(isModifyFill = false) { + if (this.crossSection) { + if (isModifyFill) { + this.crossSection.setStyle({lineWidth:0, fill:this.model.style.Section.cross.crossSection.fillColor }); + } else { + this.crossSection.setStyle({lineWidth:0 }); + } + } } setCrossBlock() { diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index 24f9b903a..6229e44eb 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -411,7 +411,7 @@ export default class Section extends Group { this.on('mouseout', () => { // 移出 if (!this.selectedType && !this.selected && this.line ) { this.line.setStyle({ stroke: this.style.Section.line.spareColor, lineWidth: this.style.Section.line.width }); - this.line.setOrignalCross(); + this.line.setOrignalCross(true); } if (this.style.Switch.sectionAction.flag && this.model.relSwitchCode) { const switchModel = Vue.prototype.$jlmap.mapDevice[this.model.relSwitchCode]; @@ -443,7 +443,7 @@ export default class Section extends Group { } else { this.lineBorder && this.lineBorder.setStyle({ lineWidth: 0 }); !this.selectedType && this.setState(this.model); - this.line.setOrignalCross(); + this.line.setOrignalCross(false); } } drawBatchSelected(selected, type) { diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue index 9d399dfbd..b25351b17 100644 --- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue @@ -211,7 +211,8 @@ export default { { prop: 'leftStopPointOffset', label: this.$t('map.leftStopPointOffset'), type: 'number', min: 0, max: this.maxLengthFact, isHidden: !this.isStopPointOffset }, // 左向停车点偏移量 { prop: 'rightStopPointOffset', label: this.$t('map.rightStopPointOffset'), type: 'number', min: 0, max: this.maxLengthFact, isHidden: !this.isStopPointOffset }, // 右向停车点偏移量 { prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList, isHidden: !this.sectionColonShow }, - { prop: 'trainWindowCode', label: '关联车次窗', type: 'input', disabled: true, isHidden: !this.isSwitchSectionShow || !this.isCrossSectionType } + { prop: 'trainWindowCode', label: '关联车次窗', type: 'input', disabled: true, isHidden: !this.isSwitchSectionShow } + // || !this.isCrossSectionType ] } }