fix

virgo.wzfrontend/console/src/assets/scss/index.scss

@@ -1542,9 +1542,11 @@
 		color: $--color-common;
 	}
 	
-	&.active{
+	&.active,
+	.active{
 		color: $--color-primary;
 	}
+	
 }
 .el-notification{
 	background: #3b3f49 !important;

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

@@ -15,6 +15,10 @@
 						<el-tree :data="item.projectItemTargetList" :props="defaultProps">
 							<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">
+									<i class="el-icon-view" style="margin-right: 9px;"></i>
+								</div>
 								<div :class="nowData.id === data.id ? 'active':''" @click.stop="nodeClick(data)"
 									v-if="hasRoom ? data.roomId : true">
 									<i :class="iconfontClass"></i>
@@ -57,6 +61,10 @@
 			isCancel: {
 				type: Boolean,
 				default: true
+			},
+			isTargeClick: {
+				type: Boolean,
+				default: false
 			}
 		},
 		data() {
@@ -66,7 +74,8 @@
 					children: 'children',
 					label: 'name'
 				},
-				nowData: {}
+				nowData: {},
+				oldNowData: {}
 			}
 		},
 		mounted() {
@@ -118,6 +127,19 @@
 					this.nowData = item;
 					this.$emit('treeclick', this.nowData, type);
 				}
+				this.oldNowData = this.nowData;
+			},
+			targetClick(data) {
+				if (this.nowData.id === data.id) {
+					this.$emit('targetClick', {
+						floorPlanType: this.nowData.floorPlanType,
+						projectItemTargetRoomList: []
+					}, true);
+					this.nowData = this.oldNowData;
+				} else {
+					this.nowData = data;
+					this.$emit('targetClick', this.nowData, false);
+				}
 			}
 		}
 	}

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

@@ -1,7 +1,8 @@
 <template>
 	<div class="model-room-set">
 		<div :id="'previewBim'+_uid" class="previewBim"></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>
@@ -71,7 +72,8 @@
 					distance: ''
 				},
 				positionData: [],
-				isSet: false
+				isSet: false,
+				isEdit: true
 			}
 		},
 		beforeDestroy() {
@@ -122,6 +124,27 @@
 					click: this.clickBimViewer
 				})
 			},
+			previewRoom(list, isEdit) {
+				if (!this.renderSuccess) return;
+				this.bimViewer.clearAllRooms();
+				this.bimViewer.exitRoom();
+				this.isEdit = isEdit;
+				if (isEdit) this.initRoomBIM();
+				for (let i = 0; i < list.length; i++) {
+					let item = list[i];
+					if (item.dataValue) {
+						let node = JSON.parse(item.dataValue);
+						this.bimViewer.insertRooms({
+							id: item.roomId,
+							boundary: {
+								"outer": node.boundary
+							},
+							height: node.height,
+							roomColor: this.returnRGBA(node.roomColor)
+						})
+					}
+				}
+			},
 			dragStart(evt) {
 				let oEvent = evt || event; //获取事件对象，这个是兼容写法
 				if (oEvent.target.id !== 'title') return;

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

@@ -1,8 +1,9 @@
 <template>
 	<div class="hui-flex space-function">
 		<div class="hui-flex-box yui-tree-box">
-			<project-item-tree @treeclick="treeclick" :hasRoom="true" type="isInit"
-				:isCancel="false"></project-item-tree>
+			<project-item-tree @treeclick="treeclick" :hasRoom="true" type="isInit" :isCancel="false"
+				:isTargeClick="true" @targetClick="targetClick">
+			</project-item-tree>
 			<div class="hui-tree-content">
 				<div class="hui-flex hui-content box-background">
 					<div class="hui-content-title">
@@ -32,7 +33,9 @@
 								<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>
+							<floor-plan-set :roomId="target.roomId" :target="target.projectItemTarget"
+								:key="target.roomId">
+							</floor-plan-set>
 						</div>
 					</div>
 				</div>
@@ -68,7 +71,6 @@
 				this.target = e;
 				if (e.projectItemTarget.floorPlanType === 1) {
 					if (e.projectItem.bimIntegrateId === this.projectItem.bimIntegrateId) {
-						console.log(this.$refs.modelSet);
 						if (this.$refs.modelSet) this.$refs.modelSet.init('update', e.roomId);
 						return;
 					}
@@ -78,6 +80,13 @@
 					});
 				} 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) {
+
 				}
 
 			}