fix

virgo.wzfrontend/console/src/components/work/bim/operationPlan.vue

@@ -46,6 +46,9 @@
 	import organization from '@/components/work/bim/modelDetail/organization'
 	import house from '@/components/work/bim/modelDetail/house'
 	import device from '@/components/work/bim/modelDetail/device'
+	import {
+		getDevicePartListByQuery
+	} from '@/httpApi/property'
 	export default {
 		props: ['target'],
 		data() {
@@ -282,9 +285,6 @@
 					this.canvas.add(box);
 				}
 				this.canvas.renderAll();
-			},
-			initRenderRoom(position, color, ) {
-
 			},
 			setFloor() { //设置房间
 				for (var i = 0; i < this.roomList.length; i++) {
@@ -305,11 +305,81 @@
 					if (this.organizationObj[this.roomList[i].id]) {
 						let organization = this.organizationObj[this.roomList[i].id];
 						organization['title'] = this.roomList[i].name;
-
 						this.addOrganizatedName(organization.name, y, x, 'organizationDetail', organization);
 					}
 				}
 			},
+			clearAll() {
+				if (!this.canvas) return;
+				let clearIconList = this.canvas.getObjects().filter(node => node.canvasType === 'clearIcon');
+				this.canvas.remove(...clearIconList)
+			},
+			selectItem(item) {
+				if (this.pathNode.id === item.id) return;
+				this.pathNode = item;
+				this.drapShow = false;
+				this.clearAll();
+				if (item.id === 1) this.setFloor();
+				if (item.id === 2) this.getDeviceList('monitor');
+				if (item.id === 3) this.getDeviceList('lighting');
+				if (item.id === 4) this.getDeviceList('airConditioning');
+			},
+			getDeviceList(type) { //获取设备列表
+				this.deviceList = [];
+				let postData = {
+					projectId: this.$store.getters.project.id,
+					sign: type
+				}
+				getDevicePartListByQuery(postData).then(res => {
+					if (res.state) {
+						this.sortDeviceList(res.data);
+						this.operationDevice();
+					}
+				})
+			},
+			sortDeviceList(data) {
+				for (var i = 0; i < data.length; i++) {
+					this.deviceList = this.deviceList.concat(data[i].deviceList);
+					if (data[i].children && data[i].children.length > 0) this.sortDeviceList(data[i].children);
+				}
+			},
+			operationDevice() {
+
+				let list = this.deviceList.filter(node => node.projectItemTargetId === this.target.id &&
+					node.type === 1);
+				for (let i = 0; i < list.length; i++) {
+					if (list[i].modelBindType) {
+						if ((list[i].modelBindType === 2 || list[i].modelBindType === 3) && list[i].modelBindContent &&
+							list[i].modelBindPosition) {
+							let item = list[i].modelBindType === 3 ? this.signList.find(node => node.id == list[i]
+								.modelBindContent) : {
+								id: 5,
+								name: '空调',
+								iconPath: './assets/kongtiao.png'
+							};
+							let position = JSON.parse(list[i].modelBindPosition);
+							fabric.Image.fromURL(item.iconPath).then(img => {
+								let data = list[i];
+								data['title'] = item.name;
+								let scale = 40 / img.width;
+								img.scale(scale);
+								img.set({
+									top: (parseInt(position.y) - (img.height * scale)),
+									left: (parseInt(position.x) - (img.width * scale * 0.5)),
+									detailType: this.pathNode.type,
+									detailData: data,
+									selectable: false,
+									canvasType: 'clearIcon'
+								})
+								// 将文字添加到画布
+								this.canvas.add(img);
+								this.canvas.renderAll();
+							});
+
+						}
+					}
+				}
+			},
 			addText(name, top, left, detailType, detailData) {
 				// 创建文字对象
 				const text = new fabric.Text(name, {
@@ -351,7 +421,8 @@
 					const group = new fabric.Group([rect, text, img], {
 						detailType: detailType,
 						detailData: detailData,
-						selectable: false
+						selectable: false,
+						canvasType: 'clearIcon'
 					});
 					group.set({
 						top: (top - group.height),

virgo.wzfrontend/console/src/components/work/bim/operationRoom.vue

@@ -8,7 +8,7 @@
 				<div class="operation-room-box">
 					<div class="operation-room-title">
 						<i class="iconfont huifont-shouye"></i>
-						<span class="label">{{item.name}}</span>
+						<span class="label">{{item.roomNumber}}</span>
 						<div>
 							<div v-if="item.state == 1" class="hui-state">
 								<span class="hui-state-bage hui-state-primary"></span>
@@ -22,6 +22,10 @@
 								<span class="hui-state-bage hui-state-success"></span>
 								<span class="hui-state-label">租赁中</span>
 							</div>
+							<div v-if="item.state == 4" class="hui-state">
+								<span class="hui-state-bage hui-state-error"></span>
+								<span class="hui-state-label">已逾期</span>
+							</div>
 						</div>
 					</div>
 					<div class="operation-room-content">
@@ -38,28 +42,30 @@
 							</div>
 							<span class="label">入驻公司</span>
 						</div>
-						<div class="room-content">{{item.organizationName}}</div>
+						<div class="room-content">{{item.merchantName||item.clientName||'-'}}</div>
 						<div class="room-title">
 							<div class="iconfont-box">
 								<i class="iconfont huifont-shijian" style="font-size: 13px;"></i>
 							</div>
 							<span class="label">入驻时间</span>
 						</div>
-						<div class="room-content">{{item.time}}</div>
+						<div class="room-content">{{item.startDate || '-'}}</div>
 						<div class="room-title">
 							<div class="iconfont-box">
 								<i class="iconfont huifont-shebeiguanli"></i>
 							</div>
 							<span class="label">合同日期</span>
 						</div>
-						<div class="room-content" style="font-size: 13px;">{{item.contractTime}}</div>
+						<div class="room-content" style="font-size: 13px;">
+							{{item.startDate ? (item.startDate+'至'+item.endDate) :'-'}}
+						</div>
 						<div class="room-title">
 							<div class="iconfont-box">
 								<i class="iconfont huifont-guanlipingtai"></i>
 							</div>
 							<span class="label">负责人</span>
 						</div>
-						<div class="room-content">{{item.person}}</div>
+						<div class="room-content">{{item.chargePersonName}}</div>
 					</div>
 				</div>
 			</div>
@@ -68,60 +74,50 @@
 </template>
 
 <script>
+	import {
+		getHouseListByLevel
+	} from '@/httpApi/space'
 	export default {
+		props: ['target'],
 		data() {
 			return {
-				list: [{
-					name: '101',
-					area: '120平方米',
-					organizationName: '公司名称',
-					time: '2025-01-01',
-					contractTime: '2025-01-01至2026-01-01',
-					person: '负责人',
-					state: 1
-				}, {
-					name: '102',
-					area: '120平方米',
-					organizationName: '公司名称',
-					time: '2025-01-01',
-					contractTime: '2025-01-01至2026-01-01',
-					person: '负责人',
-					state: 2
-				}, {
-					name: '103',
-					area: '120平方米',
-					organizationName: '公司名称',
-					time: '2025-01-01',
-					contractTime: '2025-01-01至2026-01-01',
-					person: '负责人',
-					state: 3
-				}, {
-					name: '104',
-					area: '120平方米',
-					organizationName: '公司名称',
-					time: '2025-01-01',
-					contractTime: '2025-01-01至2026-01-01',
-					person: '负责人',
-					state: 1
-				}, {
-					name: '105',
-					area: '120平方米',
-					organizationName: '公司名称',
-					time: '2025-01-01',
-					contractTime: '2025-01-01至2026-01-01',
-					person: '负责人',
-					state: 2
-				}, {
-					name: '106',
-					area: '120平方米',
-					organizationName: '公司名称',
-					time: '2025-01-01',
-					contractTime: '2025-01-01至2026-01-01',
-					person: '负责人',
-					state: 3
-				}]
+				list: []
 			}
-		}
+		},
+		mounted() {
+			this.init()
+		},
+		methods: {
+			init() {
+				getHouseListByLevel(this.target.id).then(res => {
+					if (res.state) {
+						this.list = res.data.map(node => {
+							if (node.contractList.length === 0) {
+								node['state'] = 1;
+								return node
+							};
+							let contract = node.contractList(node.contractList.length - 1);
+							let state = 3;
+							let nowDate = this.dayjs(),
+								endDate = this.$dayjs(contract.endDate);
+							if (nowDate.isBefore(endDate)) {
+								state = 4;
+							} else {
+								if (endDate.diff(nowDate, 'day') <= 7) state = 2;
+							}
+							let obj = {
+								merchantName: contract.merchantName,
+								clientName: contract.clientName,
+								startDate: contract.startDate,
+								endDate: contract.endDate,
+								state: state
+							}
+							return Object.assign(node, obj);
+						});
+					}
+				})
+			}
+		},
 	}
 </script>
 

virgo.wzfrontend/console/src/components/work/property/propertyFlowForm.vue

@@ -60,7 +60,7 @@
 			</el-form-item>
 			<el-form-item label="3D标签" v-if="propertyForm.modelBindType === 3">
 				<el-select v-model="propertyForm.modelBindContent" placeholder="请选择3D标签">
-					<el-option :value="item.id" v-for="(item,index) in signList" :key="index">
+					<el-option :value="item.id" v-for="(item,index) in signList" :label="item.name" :key="index">
 						<div class="option-item">
 							<img :src="item.iconPath" :alt="item.iconPath" />
 							<span>{{item.name}}</span>

virgo.wzfrontend/console/src/httpApi/space.js

@@ -398,6 +398,17 @@ export function getOpenHouseListByPage(data) {
 		data: data
 	})
 }
+/* 
+ * 获取公海
+ * 
+ * 
+ */
+export function getHouseListByLevel(targetId) {
+	return request({
+		url: `/api/projectItemTargetRoom/projectItemTarget/${targetId}`,
+		method: 'get'
+	})
+}
 /* 
  * 搜索房源
  * 

virgo.wzfrontend/console/src/views/work/bim/distribution.vue

@@ -10,7 +10,7 @@
 		</div>
 		<div class="hui-tree-content" v-else-if="target.id">
 			<operation-plan v-if="target.floorPlanType === 2" :target="target"></operation-plan>
-			<operation-room v-else></operation-room>
+			<operation-room v-else :target="target"></operation-room>
 		</div>
 	</div>
 </template>