From b2a154a3a45ad7544449d8aef5091b26e2f66e03 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Fri, 6 Mar 2020 12:04:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E7=AB=99=20?= =?UTF-8?q?=E7=AB=99=E5=8F=B0=20=E5=B1=8F=E8=94=BD=E9=97=A8=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Psd/index.js | 2 +- .../newMapdraft/mapoperate/psdDraft.vue | 34 +++++++++++++++++ .../newMap/newMapdraft/mapoperate/station.vue | 38 ++++++++++++++++++- .../newMapdraft/mapoperate/stationstand.vue | 36 ++++++++++++++++++ 4 files changed, 108 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/shape/Psd/index.js b/src/jmapNew/shape/Psd/index.js index 310f9a0b8..e479a92b5 100644 --- a/src/jmapNew/shape/Psd/index.js +++ b/src/jmapNew/shape/Psd/index.js @@ -22,7 +22,7 @@ export default class Line2 extends Group { const style = this.style; this.safeDoor = new ESafeDoor({ zlevel: this.zlevel, - z: this.z, + z: this.z + 1, style: style, x: model.position.x, y: model.position.y - (model.height / 2), diff --git a/src/views/newMap/newMapdraft/mapoperate/psdDraft.vue b/src/views/newMap/newMapdraft/mapoperate/psdDraft.vue index 9c6dcab01..deb243708 100644 --- a/src/views/newMap/newMapdraft/mapoperate/psdDraft.vue +++ b/src/views/newMap/newMapdraft/mapoperate/psdDraft.vue @@ -52,6 +52,25 @@ + +
+ + + + + + + + + + + {{ $t('global.set') }} + + + + +
+
@@ -92,6 +111,10 @@ export default { width: 60, height: 3, doorLocationType: '01' // 显示方向朝上或朝下 + }, + allModel: { + width: '', + height: '', } }; }, @@ -260,6 +283,17 @@ export default { _that.$message.info(this.$t('tip.cancelledDelete')); }); } + }, + // 批量设置 + batchSettings() { + let models = []; + this.psdList.forEach(psd => { + const model = deepAssign({}, psd); + model.width = this.allModel.width; + model.height = this.allModel.height; + models.push(model); + }) + this.$emit('updateMapModel', models); } } }; diff --git a/src/views/newMap/newMapdraft/mapoperate/station.vue b/src/views/newMap/newMapdraft/mapoperate/station.vue index 323065578..a09619fc0 100644 --- a/src/views/newMap/newMapdraft/mapoperate/station.vue +++ b/src/views/newMap/newMapdraft/mapoperate/station.vue @@ -66,10 +66,30 @@ + +
+ + + + + + + + + + + {{ $t('global.set') }} + + + + +
+