From 1a093e65942d3500c36ddc2449ab9e244b32afc3 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 9 Dec 2020 17:08:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=A4=E6=8E=A7=E7=9A=AE?= =?UTF-8?q?=E8=82=A4=E6=98=BE=E7=A4=BA=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=8A=98=E8=BF=94=E8=BF=9B=E8=B7=AF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/chengdu_03.js | 20 ++++++++ src/jmapNew/shape/OutFrame/index.js | 2 +- .../shape/StationTurnBack/EFoldbackMode.js | 28 +++++------ src/jmapNew/shape/StationTurnBack/index.js | 50 +++++++++---------- src/scripts/ConstConfig.js | 4 +- .../newMap/jlmapNew/pendant/showMode.vue | 5 +- .../newMapdraft/mapoperate/ControlDraft.vue | 4 +- .../newMap/newMapdraft/mapoperate/station.vue | 11 ++-- 8 files changed, 72 insertions(+), 52 deletions(-) diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index 3604709ca..773aaceab 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -336,6 +336,26 @@ class SkinCode extends defaultStyle { } }; + this[deviceType.StationTurnBack] = { // 站后折返 + displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示） + lamp: { + fill: '#f1f1f1', // 填充色 + radiusR: 7 // 控制灯大小 + }, + text: { + titleTextShow: false, + fontWeight: 580, + fontSize: 10, + distance: 10 + }, + rect: { + fill: 'rgba(0,0,0,0)', + stroke: '#fff', + lineWidth: 0, + padding: 6 + } + }; + this[deviceType.Station] = { // 成都三号线车站元素 车站名称 elemnetType:['stationText'], diff --git a/src/jmapNew/shape/OutFrame/index.js b/src/jmapNew/shape/OutFrame/index.js index 66c86e3cd..23875e2dd 100644 --- a/src/jmapNew/shape/OutFrame/index.js +++ b/src/jmapNew/shape/OutFrame/index.js @@ -53,7 +53,7 @@ export default class OutFrame extends Group { if (showMode == '04') { this.box && this.box.hide(); return; - } + } if (!showConditions || showConditions === '01' || showMode === showConditions) { this.box && this.box.show(); this.setState(this.model); diff --git a/src/jmapNew/shape/StationTurnBack/EFoldbackMode.js b/src/jmapNew/shape/StationTurnBack/EFoldbackMode.js index 417ab14d4..eb52ccb04 100644 --- a/src/jmapNew/shape/StationTurnBack/EFoldbackMode.js +++ b/src/jmapNew/shape/StationTurnBack/EFoldbackMode.js @@ -123,19 +123,19 @@ export default class EFoldbackMode extends Group { }); this.add(this.lateralLineRect); this.add(this.lateralLine); - } + } - highlightType1(color) { - this.lateralLinePriorityRect && this.lateralLinePriorityRect.setStyle('stroke', color); - this.lateralLinePriority1 && this.lateralLinePriority1.setStyle('stroke', color); - this.lateralLinePriority2 && this.lateralLinePriority2.setStyle('stroke', color); - } - highlightType2(color) { - this.linearFoldbackRect && this.linearFoldbackRect.setStyle('stroke', color); - this.linearFoldback && this.linearFoldback.setStyle('stroke', color); - } - highlightType3(color) { - this.lateralLineRect && this.lateralLineRect.setStyle('stroke', color); - this.lateralLine && this.lateralLine.setStyle('stroke', color); - } + highlightType1(color) { + this.lateralLinePriorityRect && this.lateralLinePriorityRect.setStyle('stroke', color); + this.lateralLinePriority1 && this.lateralLinePriority1.setStyle('stroke', color); + this.lateralLinePriority2 && this.lateralLinePriority2.setStyle('stroke', color); + } + highlightType2(color) { + this.linearFoldbackRect && this.linearFoldbackRect.setStyle('stroke', color); + this.linearFoldback && this.linearFoldback.setStyle('stroke', color); + } + highlightType3(color) { + this.lateralLineRect && this.lateralLineRect.setStyle('stroke', color); + this.lateralLine && this.lateralLine.setStyle('stroke', color); + } } diff --git a/src/jmapNew/shape/StationTurnBack/index.js b/src/jmapNew/shape/StationTurnBack/index.js index ab88a8ad8..6e05ec6c9 100644 --- a/src/jmapNew/shape/StationTurnBack/index.js +++ b/src/jmapNew/shape/StationTurnBack/index.js @@ -21,7 +21,7 @@ export default class StationTurnBack extends Group { } create() { const model = this.model; - const style = this.style; + const style = this.style; if (model.show && !style.StationTurnBack.spliceShow) { this.control = new Circle({ @@ -95,9 +95,9 @@ export default class StationTurnBack extends Group { this.add(this.controlRect); this.add(this.text); this.add(this.strategyText); - } - if (style.StationTurnBack.spliceShow) { - this.control = new EFoldbackMode({ + } + if (style.StationTurnBack.spliceShow) { + this.control = new EFoldbackMode({ zlevel: this.zlevel, z: this.z, x: model.position.x, @@ -106,21 +106,21 @@ export default class StationTurnBack extends Group { style: style }); this.add(this.control); - } + } } recover() { const path = window.location.href; if (!path.includes('/map/draw')) { this.strategyText && this.strategyText.hide(); - } - if (this.style.ReturnModeGroup) { - this.control && this.control.highlightType1(this.style.ReturnModeGroup.highlightColor); + } + if (this.style.ReturnModeGroup) { + this.control && this.control.highlightType1(this.style.ReturnModeGroup.highlightColor); - // this.control && this.control.highlightType1(this.style.ReturnModeGroup.strokeColor); - this.control && this.control.highlightType2(this.style.ReturnModeGroup.strokeColor); - this.control && this.control.highlightType3(this.style.ReturnModeGroup.strokeColor); - } + // this.control && this.control.highlightType1(this.style.ReturnModeGroup.strokeColor); + this.control && this.control.highlightType2(this.style.ReturnModeGroup.strokeColor); + this.control && this.control.highlightType3(this.style.ReturnModeGroup.strokeColor); + } } handleStatus(name) { @@ -129,19 +129,19 @@ export default class StationTurnBack extends Group { style: { text: name } - }); - if (this.style.ReturnModeGroup) { - this.control && this.control.highlightType1(this.style.ReturnModeGroup.strokeColor); - this.control && this.control.highlightType2(this.style.ReturnModeGroup.strokeColor); - this.control && this.control.highlightType3(this.style.ReturnModeGroup.strokeColor); - if (name == '优先折返') { - this.control && this.control.highlightType1(this.style.ReturnModeGroup.highlightColor); - } else if (name == '直线折返') { - this.control && this.control.highlightType2(this.style.ReturnModeGroup.highlightColor); - } else if (name == '侧线折返') { - this.control && this.control.highlightType3(this.style.ReturnModeGroup.highlightColor); - } - } + }); + if (this.style.ReturnModeGroup) { + this.control && this.control.highlightType1(this.style.ReturnModeGroup.strokeColor); + this.control && this.control.highlightType2(this.style.ReturnModeGroup.strokeColor); + this.control && this.control.highlightType3(this.style.ReturnModeGroup.strokeColor); + if (name == '优先折返') { + this.control && this.control.highlightType1(this.style.ReturnModeGroup.highlightColor); + } else if (name == '直线折返') { + this.control && this.control.highlightType2(this.style.ReturnModeGroup.highlightColor); + } else if (name == '侧线折返') { + this.control && this.control.highlightType3(this.style.ReturnModeGroup.highlightColor); + } + } } // 设置状态 diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index f4f33e774..d63ce2e41 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -140,8 +140,8 @@ export default { showConditionsList: [ { enlabel:'Local&Center', label: '现地&行调', value: '01'}, - { enlabel:'Local', label: '现地', value: '02' }, - { enlabel:'Center', label: '行调', value: '03'} + { enlabel:'Local', label: '现地', value: '03' }, + { enlabel:'Center', label: '行调', value: '02'} ], QuestionTypeList: [ diff --git a/src/views/newMap/jlmapNew/pendant/showMode.vue b/src/views/newMap/jlmapNew/pendant/showMode.vue index 8249bce35..fe191da8b 100644 --- a/src/views/newMap/jlmapNew/pendant/showMode.vue +++ b/src/views/newMap/jlmapNew/pendant/showMode.vue @@ -26,11 +26,11 @@ export default { return { offsetY: 15, offsetX: 150, - swch: '03', + swch: '02', rightWidth: 0, swchList: [ - { value: '03', name: '现地' }, { value: '02', name: '行调' }, + { value: '03', name: '现地' }, { value: '04', name: '大屏' } ] }; @@ -85,6 +85,7 @@ export default { } }, switchMode(val) { + // 03 现地 02 行调 if (val === '03' && this.localStationShow) { if (this.$route.path.indexOf('mapPreviewNew') !== -1) { this.offsetX = 150 + this.rightWidth; diff --git a/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue b/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue index 7c68e63a1..a52e30c13 100644 --- a/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue +++ b/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue @@ -458,8 +458,8 @@ export default { if (valid) { const data = Object.assign({_type: this.editModel.type}, this.editModel); console.log(data, '====='); - this.$emit('updateMapModel', data); - this.field = ''; + this.$emit('updateMapModel', data); + this.field = ''; } }); }, diff --git a/src/views/newMap/newMapdraft/mapoperate/station.vue b/src/views/newMap/newMapdraft/mapoperate/station.vue index 27b30f1e7..a8a3755d8 100644 --- a/src/views/newMap/newMapdraft/mapoperate/station.vue +++ b/src/views/newMap/newMapdraft/mapoperate/station.vue @@ -198,9 +198,10 @@ export default { { prop: 'controlModePoint', label: this.$t('map.stationControlPosition'), type: 'coordinate', width: '120px', isHidden:!this.editModel.createControlMode, children: [ { prop: 'controlModePoint.x', firstLevel: 'controlModePoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px'}, { prop: 'controlModePoint.y', firstLevel: 'controlModePoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px'} - ] } - // { prop: 'createTurnBack', label: '按图折返:', type: 'checkbox' }, - // { prop: 'turnBackPoint', label: '按图折返坐标:', type: 'coordinate', width: '120px', isHidden: !this.isPointsShow, children: [ + ] }, + { prop: 'createTurnBack', label: '按图折返', type: 'checkbox' } + // { prop: 'createTurnBack', label: '按图折返:', type: 'checkbox' } + // { prop: 'turnBackPoint', label: '按图折返坐标:', type: 'coordinate', width: '120px', isHidden: !this.editModel.createTurnBack, children: [ // { prop: 'turnBackPoint.x', firstLevel: 'turnBackPoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' }, // { prop: 'turnBackPoint.y', firstLevel: 'turnBackPoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' } // ] } @@ -248,9 +249,6 @@ export default { return this.sectionList.filter(elem => { return elem.type === '01' && !elem.switchSection; }); }, - isPointsShow() { - return this.editModel.createTurnBack; - }, isZcCode() { return this.editModel.centralized; }, @@ -284,6 +282,7 @@ export default { this.activeName = 'first'; this.editModel = deepAssign(this.editModel, selected); // 被控制的车站数据 + console.log(selected, selected.createTurnBack); const beCentralizedStation = {}; this.relStationList = JSON.parse(JSON.stringify(this.stationList)); this.stationList.forEach(data=>{