Commit 0de58315 authored by kaitly205422@163.com's avatar kaitly205422@163.com

修复fix

parent 28e9ec0d
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
:w="(W / 12) * item.w" :h="item.h * 30" :i="item.i" :key="item.i" :z="item.zIndex" :draggable="item.isDraggable" :w="(W / 12) * item.w" :h="item.h * 30" :i="item.i" :key="item.i" :z="item.zIndex" :draggable="item.isDraggable"
:resizable="item.isResizable" @resizestop="(x, y, w, h) => resizedEvent(item, x, y, w, h)" :resizable="item.isResizable" @resizestop="(x, y, w, h) => resizedEvent(item, x, y, w, h)"
@dragging="(x, y) => onDrag(item, x, y)" @dragstop="(x, y) => { @dragging="(x, y) => onDrag(item, x, y)" @dragstop="(x, y) => {
movedEvent(item, x, y); movedEvent(item, x, y);
} }
" @resizing="(x, y, w, h) => onResize(item, x, y, w, h)" @activated="onActivated(item)" " @resizing="(x, y, w, h) => onResize(item, x, y, w, h)" @activated="onActivated(item)"
@click.native="dbClickEvent($event, item)" :style="{ @click.native="dbClickEvent($event, item)" :style="{
backgroundColor: item.c, backgroundColor: item.c,
border: item.type == 'thorough' ? 'none !important' : '', border: item.type == 'thorough' ? 'none !important' : '',
}"> }">
<!-- <grid-item <!-- <grid-item
v-for="item in layout" v-for="item in layout"
:x="item.x" :x="item.x"
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
}" }"
> --> > -->
<span class="text" :class="item.w > item.h * 5 ? '' : 'rowText'">{{ <span class="text" :class="item.w > item.h * 5 ? '' : 'rowText'">{{
item.name item.name
}}</span> }}</span>
<span class="remove" @click.stop="removeItem(item.i)" v-if="showHeader">x</span> <span class="remove" @click.stop="removeItem(item.i)" v-if="showHeader">x</span>
<!-- <span class="remove" @click="removeItem(item.i)" v-if="item.i && isEdit">x</span> --> <!-- <span class="remove" @click="removeItem(item.i)" v-if="item.i && isEdit">x</span> -->
<!-- </grid-item> --> <!-- </grid-item> -->
...@@ -95,8 +95,8 @@ ...@@ -95,8 +95,8 @@
</van-cell-group> </van-cell-group>
</van-dialog> </van-dialog>
<van-popup v-model="showPicker" round position="bottom"> <van-popup v-model="showPicker" round position="bottom">
<van-picker v-if="!copyRoom.isCopy" show-toolbar :columns="isRoom ? roomArr : baseArr" @cancel="showPicker = false" <van-picker v-if="!copyRoom.isCopy" show-toolbar :columns="isRoom ? roomArr : baseArr"
@confirm="onConfirm" value-key="dictLabel" /> @cancel="showPicker = false" @confirm="onConfirm" value-key="dictLabel" />
<van-picker v-else show-toolbar :columns="copyRoom.copyArr" @cancel="showPicker = false" @confirm="onConfirm" <van-picker v-else show-toolbar :columns="copyRoom.copyArr" @cancel="showPicker = false" @confirm="onConfirm"
:value-key="copyRoom.type != 'type' ? 'name' : 'dictLabel'" /> :value-key="copyRoom.type != 'type' ? 'name' : 'dictLabel'" />
</van-popup> </van-popup>
...@@ -220,6 +220,7 @@ export default { ...@@ -220,6 +220,7 @@ export default {
this.copyRoom.type = "floor"; this.copyRoom.type = "floor";
this.showPicker = true; this.showPicker = true;
this.copyRoom.roomData = []; this.copyRoom.roomData = [];
debugger
if (this.copyRoom.floorData.length) { if (this.copyRoom.floorData.length) {
this.copyRoom.copyArr = this.copyRoom.floorData; this.copyRoom.copyArr = this.copyRoom.floorData;
return; return;
...@@ -465,7 +466,9 @@ export default { ...@@ -465,7 +466,9 @@ export default {
this.isRoom = false; this.isRoom = false;
this.isBase = true; this.isBase = true;
this.show = true; this.show = true;
this.copyRoom.isCopy = false;
}, },
// 更新画布高度 // 更新画布高度
updateLayoutHeight() { updateLayoutHeight() {
const max = Math.max( const max = Math.max(
......
...@@ -1047,6 +1047,7 @@ export default { ...@@ -1047,6 +1047,7 @@ export default {
params: { params: {
floorId: this.form.floorId, floorId: this.form.floorId,
isView: false, isView: false,
buildingId: this.form.buildingIds
}, },
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment