fix

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

@@ -73,7 +73,7 @@
 	} from '@/httpApi/bim'
 	import bimView from '@/uitls/controls'
 	// import bimData from '@/config/demo'//新华医院
-	// import bimData from '@/config/demo2'
+	// import bimData from '@/config/demo2'
 	import bimData from '@/config/demo1'
 	import noticeBoard from '@/components/work/common/noticeBoard'
 	export default {
@@ -522,9 +522,22 @@
 			},
 			setFloor() { //设置房间
 				for (var i = 0; i < bimData.roomList.length; i++) {
+					let boundary = bimData.roomList[i].boundary;
+					let arrX = boundary.map(node => node.x);
+					let arrY = boundary.map(node => node.y);
+					let maxX = Math.max(...arrX);
+					let minX = Math.min(...arrX);
+					let maxY = Math.max(...arrY);
+					let minY = Math.min(...arrY);
+					let x = (maxX - minX) / 2 + minX;
+					let y = (maxY - minY) / 2 + minY;
 					if (bimData.roomList[i].name) {
 						this.bimViewer.addDrawable({
-							position: bimData.roomList[i].position,
+							position: {
+								x: x,
+								y: y,
+								z: boundary[0].z + bimData.roomList[i].height
+							},
 							offsetX: -75,
 							offsetY: -40,
 							html: `	<div class="tips-4">${bimData.roomList[i].name}<i class="iconfont huifont-sanjiaojiantou-xia"></i></div>`,
@@ -535,7 +548,11 @@
 					}
 					if (bimData.roomList[i].floorName) {
 						this.bimViewer.addDrawable({
-							position: bimData.roomList[i].position,
+							position: {
+								x: x,
+								y: y,
+								z: boundary[0].z + bimData.roomList[i].height
+							},
 							offsetX: -30,
 							offsetY: 5,
 							html: `	<div class="floor-name">${bimData.roomList[i].floorName}</div>`,
@@ -753,10 +770,10 @@
 				this.bimViewer.overrideComponentsColorByObjectData([{
 					family: "楼板",
 					levelName: "标高 1"
-				}], "#cecece")
-				this.bimViewer.overrideComponentsColorByObjectData([{
-					family: "基本墙",
-					levelName: "标高 1"
+				}], "#cecece")
+				this.bimViewer.overrideComponentsColorByObjectData([{
+					family: "基本墙",
+					levelName: "标高 1"
 				}], "#afa6ab")
 				this.initFloor();
 				this.setFloor();

virgo.wzfrontend/console/src/components/work/business/organization/detail.vue

@@ -25,38 +25,55 @@
 			<div class="hui-detail-item">
 				<div class="hui-detail-label">注册资本</div>
 				<div class="hui-detail-value">{{detail.registeredCapital}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">企业地址</div>
-				<div class="hui-detail-value">{{detail.address}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">经营范围</div>
-				<div class="hui-detail-value">{{detail.businessScope}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">企业规模</div>
-				<div class="hui-detail-value">{{detail.corporateScale}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">企业理念</div>
-				<div class="hui-detail-value">{{detail.corporatePhilosophy}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">企业文化</div>
-				<div class="hui-detail-value">{{detail.corporateCulture}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">联系方式</div>
-				<div class="hui-detail-value">{{detail.contactInformation}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">传真</div>
-				<div class="hui-detail-value">{{detail.fax}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">电子邮箱</div>
-				<div class="hui-detail-value">{{detail.email}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">企业地址</div>
+				<div class="hui-detail-value">{{detail.address}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">经营范围</div>
+				<div class="hui-detail-value">{{detail.businessScope}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">企业规模</div>
+				<div class="hui-detail-value">{{detail.corporateScale}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">企业理念</div>
+				<div class="hui-detail-value">{{detail.corporatePhilosophy}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">企业文化</div>
+				<div class="hui-detail-value">{{detail.corporateCulture}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">联系方式</div>
+				<div class="hui-detail-value">{{detail.contactInformation}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">传真</div>
+				<div class="hui-detail-value">{{detail.fax}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">电子邮箱</div>
+				<div class="hui-detail-value">{{detail.email}}</div>
+			</div>
+		</div>
+		<div v-if="detail.roomIds">
+			<div class="hui-detail-title">入驻信息</div>
+			<div class="hui-detail-content">
+				<div class="hui-detail-item">
+					<div class="hui-detail-label">入驻房源</div>
+					<div class="hui-detail-value">
+						<div class="hui-ellipsis" v-for="(item,index) in detail.roomMap" :key="index">
+							{{item}}
+						</div>
+					</div>
+				</div>
+				<div class="hui-detail-item">
+					<div class="hui-detail-label">入驻时间</div>
+					<div class="hui-detail-value">{{detail.entryTime}}</div>
+				</div>
 			</div>
 		</div>
 		<div v-if="detail.data && detail.data != '[]'">

virgo.wzfrontend/console/src/components/work/business/organization/edit.vue

@@ -17,7 +17,15 @@
 				</el-form-item>
 				<el-form-item label="成立时间" prop="establishDate" :rules="[{required: true, message: '请选择成立时间'}]">
 					<el-date-picker v-model="organizationForm.establishDate" value-format="yyyy-MM-dd" type="date"
-						placeholder="请选择启用日期">
+						placeholder="请选择成立时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="入驻房源" prop="roomIds">
+					<select-house ref="selectHouse" :ids="organizationForm.roomIds"></select-house>
+				</el-form-item>
+				<el-form-item label="入驻时间" prop="entryTime">
+					<el-date-picker v-model="organizationForm.entryTime" value-format="yyyy-MM-dd" type="date"
+						placeholder="请选择入驻时间">
 					</el-date-picker>
 				</el-form-item>
 				<el-form-item label="营业期限" prop="businessTerm" :rules="[{required: true, message: '请输入营业期限'}]">
@@ -71,6 +79,7 @@
 		getOrganizationDetailById
 	} from '@/httpApi/business'
 	import customData from './customData'
+	import selectHouse from '@/components/common/selectHouse';
 	export default {
 		props: ['isUpdate', 'detailId'],
 		data() {
@@ -79,6 +88,7 @@
 					name: '',
 					legalPerson: '',
 					establishDate: '',
+					entryTime: '',
 					businessTerm: '',
 					organizationId: '',
 					registeredCapital: '',
@@ -116,6 +126,7 @@
 				this.$refs.organizationForm.validate((valid) => {
 					if (valid) {
 						let postData = JSON.parse(JSON.stringify(this.organizationForm));
+						postData['roomIds'] = this.$refs.selectHouse.selectNodeId;
 						postData['data'] = JSON.stringify(this.$refs.customData.listData);
 						if (this.isUpdate) {
 							updateOrganization(postData).then(this.successFunc);
@@ -137,7 +148,8 @@
 			}
 		},
 		components: {
-			customData
+			customData,
+			selectHouse
 		},
 	}
 </script>