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') }} + + + + +
+