From 258796555e6b6ed54e6b185578250346037fa759 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 21 Jan 2021 19:11:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=98=9F=E8=BF=9B=E8=B7=AF=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/shape/Signal/index.js | 8 ++--- .../newMapdraft/mapoperate/section/index.vue | 33 ++----------------- 2 files changed, 7 insertions(+), 34 deletions(-) diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js index c8546adde..e7d7c1ba6 100644 --- a/src/jmapNew/shape/Signal/index.js +++ b/src/jmapNew/shape/Signal/index.js @@ -625,7 +625,7 @@ class Signal extends Group { if (this.style.Signal.post.autoRouteColor) { this.sigPost.setColor(this.style.Signal.post.autoRouteColor); } else if (this.style.Signal.post.autoRouteVerColor) { - this.sigPost.setVerColor(this.style.Signal.post.setVerColor); + this.sigPost.setVerColor(this.style.Signal.post.autoRouteVerColor); } } @@ -801,11 +801,11 @@ class Signal extends Group { }); } } - if ( model.level === 3) { + if ( model.level === 3 && !model.fleetMode) { this.sigPost.setVerColor(this.style.Signal.post.mainSignalVerColor); - } else if (model.level === 1 && this.style.Signal.post.closeSignalVerColor) { + } else if (model.level === 1 && this.style.Signal.post.closeSignalVerColor && !model.fleetMode) { this.sigPost.setVerColor(this.style.Signal.post.closeSignalVerColor); - } else if (model.level === 2 && this.style.Signal.post.guideSignalVerColor) { + } else if (model.level === 2 && this.style.Signal.post.guideSignalVerColor && !model.fleetMode) { this.sigPost.setVerColor(this.style.Signal.post.guideSignalVerColor); } // 信号机故障 diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue index 73250087f..ffaac67b7 100644 --- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue @@ -206,7 +206,7 @@ export default { item: [ { prop: 'stationCode', label: this.$t('map.equipmentStation') + ':', type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: this.isStationCodeDisabled, options: this.centralizedStationList, isHidden: this.isStationCodeDisabled }, { prop: 'belongStation', label: '所属车站:', type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', options: this.stationList, isHidden: !this.editModel.standTrack && !this.editModel.reentryTrack && !this.editModel.transferTrack }, - { prop: 'lengthFact', label: this.$t('map.actualLength') + ':', type: 'number', min: 0, placeholder: this.$t('map.meter'), isHidden: !this.isSwitchSectionType || !this.isCrossSectionType }, + { prop: 'lengthFact', label: this.$t('map.actualLength') + ':', type: 'number', min: 0, placeholder: this.$t('map.meter'), disabled: this.isStationCodeDisabled, isHidden: !this.isSwitchSectionType || !this.isCrossSectionType }, { 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 }, @@ -560,38 +560,11 @@ export default { const pointModel = []; const slope1 = (this.oldPoint[this.oldPoint.length - 1].y - this.oldPoint[0].y) / (this.oldPoint[this.oldPoint.length - 1].x - this.oldPoint[0].x); this.sectionList.forEach(section => { - if (section.type == '02') { - // section.parentCode - // const sectionModel = this.$store.getters['map/getDeviceByCode'](section.parentCode); - // const copySection = deepAssign({}, sectionModel); - // // if (section.leftSectionCode) { - // // console.log(section.leftSectionCode, '111111'); - // // } - // if (section.rightSectionCode) { - // const sectionModel1 = this.$store.getters['map/getDeviceByCode'](section.rightSectionCode); - // if (sectionModel1.type == '02') { - // copySection.rightSectionCode = sectionModel1.parentCode; - // } else { - // copySection.rightSectionCode = section.rightSectionCode; - // } - // console.log(section.rightSectionCode, '22222'); - // } - // models.push(copySection); - // console.log(section.rightSectionCode, section.leftSectionCode); - // const copySection = deepAssign({}, section); - // if (section.rightSectionCode) { - // delete copySection.rightSectionCode; - // } - // if (section.leftSectionCode) { - // delete copySection.leftSectionCode; - // } - // models.push(copySection); - } if (section.parentCode == model.code && section.type == '02') { // 逻辑区段 const copySection = deepAssign({}, section); copySection.stationCode = model.stationCode; // 给元素 子逻辑区段设置 设备集中站 - const length = model.lengthFact / model.logicSectionCodeList.length; - copySection.lengthFact = length.toFixed(3); + // const length = model.lengthFact / model.logicSectionCodeList.length; + // copySection.lengthFact = length.toFixed(3); if (this.checkPointsCoincide(this.oldPoint[0], copySection.points[0])) { copySection.points[0] = model.points[0]; }