fix

virgo.wzfrontend/console/src/components/common/projectItemTree.vue

@@ -16,7 +16,7 @@
 							<div class="custom-tree-node" slot-scope="{ node, data }">
 								<div class="label">{{node.label}}</div>
 								<div :class="nowData.id === data.id ? 'active':''" @click.stop="targetClick(data)"
-									v-if="isTargeClick ? data.projectItemTargetId && !data.roomId : false">
+									v-if="isTargeClick ? isShowView(data) : false">
 									<i class="el-icon-view" style="margin-right: 9px;"></i>
 								</div>
 								<div :class="nowData.id === data.id ? 'active':''" @click.stop="nodeClick(data)"
@@ -118,6 +118,9 @@
 					}
 				})
 			},
+			isShowView(data) {
+				return data.projectItemTargetId === this.nowData.projectItemTargetId && !data.roomId;
+			},
 			nodeClick(item, type) {
 				if (this.isCancel) {
 					this.nowData = this.nowData.id === item.id ? {} : item;

virgo.wzfrontend/console/src/components/work/space/function/floorPlanSet.vue

@@ -3,7 +3,7 @@
 		<div id="canvas-container">
 			<canvas id="myCanvas"></canvas>
 		</div>
-		<div id="distribution-drap" class="distribution-drap" @mousedown="dragStart" @touchstart="dragStart">
+		<div id="distribution-drap" v-if="isEdit" class="distribution-drap" @mousedown="dragStart" @touchstart="dragStart">
 			<div class="distribution-drap-title">
 				<div id="title" class="distribution-drap-title-content">房间设置</div>
 			</div>
@@ -69,7 +69,8 @@
 				floorPlanSize: {
 					width: '',
 					height: ''
-				}
+				},
+				isEdit:true
 			}
 		},
 		beforeDestroy() {
@@ -96,6 +97,14 @@
 							this.roomData = {};
 							this.form.color = 'rgba(52, 114, 211, 0.6)';
 						}
+						if (this.canvas) {
+							if (this.roomData.position) {
+								this.position = this.roomData.position;
+								this.form.color = this.roomData.roomColor;
+								this.initRenderRoom();
+							}
+							return;
+						}
 						if (this.target.floorPlanSize) {
 							this.floorPlanSize = JSON.parse(this.target.floorPlanSize);
 							this.createCanvas();
@@ -105,6 +114,26 @@
 					}
 				});
 			},
+			update(list,isEdit) {
+				let room = this.canvas.getObjects().filter(node => node.roomId);
+				this.canvas.remove(...room);
+				this.isEdit = isEdit;
+				if (isEdit) this.initRenderRoom();
+				for (let i = 0; i < list.length; i++) {
+					if (list[i].dataValue) {
+						let roomData = JSON.parse(list[i].dataValue);
+						const box = new fabric.Polygon(roomData.position, {
+							fill: roomData.roomColor,
+							stroke: 'rgba(113, 179, 255, 1.0)',
+							strokeWidth: 1,
+							selectable: false,
+							roomId: list[i].roomId
+						});
+						this.canvas.add(box);
+					}
+				}
+				this.canvas.renderAll();
+			},
 			initSize() {
 				let box = document.getElementById('fabricContainer');
 				if (!box) return;
@@ -318,6 +347,8 @@
 				}
 			},
 			initRenderRoom() {
+				let room = this.canvas.getObjects().filter(node => node.roomId);
+				this.canvas.remove(...room)
 				const box = new fabric.Polygon(this.position, {
 					fill: this.form.color,
 					stroke: 'rgba(113, 179, 255, 1.0)',
@@ -376,7 +407,12 @@
 
 				return coordinates;
 			}
-		}
+		},
+		watch: {
+			roomId() {
+				this.init();
+			}
+		},
 	}
 </script>
 

virgo.wzfrontend/console/src/views/work/space/function.vue

@@ -33,8 +33,8 @@
 								<img :src="nullImage" alt="" />
 								<div class="space-null-text">请上传楼层平面图</div>
 							</div>
-							<floor-plan-set :roomId="target.roomId" :target="target.projectItemTarget"
-								:key="target.roomId">
+							<floor-plan-set ref="floorPlanSet" :roomId="target.roomId"
+								:target="target.projectItemTarget">
 							</floor-plan-set>
 						</div>
 					</div>
@@ -78,17 +78,14 @@
 					getIntegrateViewToken(this.projectItem.bimIntegrateId).then(res => {
 						if (res.state) this.viewToken = res.data;
 					});
-				} else if (e.projectItemTarget.floorPlanType === 2) {
-
 				}
 			},
 			targetClick(data, type) {
 				if (data.floorPlanType === 1 || !data.floorPlanType) {
 					if (this.$refs.modelSet) this.$refs.modelSet.previewRoom(data.projectItemTargetRoomList, type);
 				} else if (data.floorPlanType === 2) {
-
+					if (this.$refs.floorPlanSet) this.$refs.floorPlanSet.update(data.projectItemTargetRoomList, type);
 				}
-
 			}
 		},
 	}