fix

virgo.wzfrontend/console/src/components/work/common/modelDown.vue

@@ -4,12 +4,17 @@
 			<el-button type="primary" size="medium" @click="insertModel">上传模型</el-button>
 		</div>
 		<div class="hui-flex-box">
-			<div class="list">
+			<div class="hui-no-tips" v-if="list.length == 0">
+				<empty description="暂无模型"></empty>
+			</div>
+			<div class="list" v-else>
 				<div class="model-3d-item" v-for="(item,index) in list" :key="item.id">
-					<div class="model-3d-image">
-						<img :src="item.previewURL" alt="aa.png" />
+					<div class="model-3d-item-box" @click="previewModel(item)">
+						<div class="model-3d-image">
+							<img :src="item.previewURL" alt="aa.png" />
+						</div>
+						<div class="name">{{item.name}} </div>
 					</div>
-					<div class="name">{{item.name}} </div>
 				</div>
 			</div>
 		</div>
@@ -19,11 +24,17 @@
 				:modelLevelId="modelLevelId">
 			</model-form>
 		</el-dialog>
+		<el-dialog :close-on-click-modal="false" title="预览" :visible.sync="modelVisible" width="900px"
+			:append-to-body="true">
+			<three-model ref="threeModel" :url="nowModel.address" :type="nowModel.type">
+			</three-model>
+		</el-dialog>
 	</div>
 </template>
 
 <script>
 	import modelForm from '@/components/work/common/modelForm'
+	import threeModel from '@/components/work/common/threeModel'
 	import {
 		get3DModel
 	} from '@/httpApi/property'
@@ -35,7 +46,9 @@
 				isUpdate: false,
 				visible: false,
 				detailId: '',
-				option: {}
+				option: {},
+				nowModel: {},
+				modelVisible: false
 			}
 		},
 		created() {
@@ -44,7 +57,8 @@
 			this.init();
 		},
 		components: {
-			modelForm
+			modelForm,
+			threeModel
 		},
 		methods: {
 			init() {
@@ -61,6 +75,10 @@
 			callback(type) {
 				if (type === 'init') this.init();
 				this.visible = false;
+			},
+			previewModel(item) {
+				this.nowModel = item;
+				this.modelVisible = true;
 			}
 		}
 	}
@@ -68,20 +86,34 @@
 
 <style lang="scss">
 	.model-3d-list {
-		padding: 20px;
+		padding: 20px 10px;
+
+		.hui-content-insert {
+			padding-left: 10px;
+		}
+
+		.hui-no-tips {
+			width: 100%;
+			height: 100%;
+		}
 
 		.list {
 			display: flex;
 			flex-wrap: wrap;
-			padding: 20px 0;
+			padding: 10px 0;
 		}
 
 		.model-3d-item {
 			width: 25%;
-			border: 1px solid $--color-border;
-			border-radius: 4px;
-			overflow: hidden;
-			cursor: pointer;
+			padding: 10px;
+			box-sizing: border-box;
+
+			.model-3d-item-box {
+				border: 1px solid $--color-border;
+				border-radius: 4px;
+				overflow: hidden;
+				cursor: pointer;
+			}
 
 			.model-3d-image {
 				height: 160px;

virgo.wzfrontend/console/src/components/work/common/modelForm.vue

@@ -64,7 +64,7 @@
 				},
 				loading: false,
 				url: '',
-				accept: '.fbx, .FBX',
+				accept: '.gltf, .GLTF, .glb, .GLB',
 				snapshotUrl: ''
 			}
 		},
@@ -81,7 +81,7 @@
 			changeModel(val) {
 				let arr = this.$field.findTypeNameByList('modelType', String(val));
 				if (arr.length === 0) return;
-				this.accept = arr[0].accept || '.fbx, .FBX';
+				this.accept = arr[0].accept || '.gltf, .GLTF, .glb, .GLB';
 			},
 			uploadModel() {
 				this.$refs.upload.reloadUpload();

virgo.wzfrontend/console/src/components/work/common/threeModel.vue

@@ -25,11 +25,10 @@
 					});
 					// threeObj.setAxisHelper();
 					if (this.type == 1) {
-						this.threeObj.loaderFBX(this.url);
-					} else if (this.type == 2) {
-
-					} else if (this.type == 3 || this.type == 4) {
 						this.threeObj.loaderGLTF(this.url);
+
+					} else if (this.type == 2) {
+						this.threeObj.loaderFBX(this.url);
 					}
 					// threeObj.setState();
 					this.threeObj.OrbitControls();

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

@@ -2,11 +2,32 @@
 	<div class="property-flow-form">
 		<project-item ref="projectItem" :form="propertyForm"></project-item>
 		<el-form :model="propertyForm" label-position="top">
-			<el-form-item label="资产名称">
+			<el-form-item label="资产名称" required>
 				<el-cascader v-model="departId" :options="departList" :props="defaultProps" @change="changePart"
 					placeholder="请选择资产名称">
 				</el-cascader>
 			</el-form-item>
+			<el-form-item label="变更内容" required>
+				<el-select v-model="propertyForm.content" placeholder="请选择变更内容">
+					<el-option label="位置变更" value="位置变更"></el-option>
+					<el-option label="属性变更" value="属性变更"></el-option>
+					<el-option label="业务变更" value="业务变更"></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="变更类型" required>
+				<el-select v-model="propertyForm.type" placeholder="请选择变更类型">
+					<el-option label="资产购买" value="资产购买"></el-option>
+					<el-option label="资产处置" value="资产处置"></el-option>
+					<el-option label="资产重估" value="资产重估"></el-option>
+					<el-option label="资产租赁" value="资产租赁"></el-option>
+					<el-option label="资产改良" value="资产改良"></el-option>
+					<el-option label="资产合并与分割" value="资产合并与分割"></el-option>
+					<el-option label="资产抵押与解抵押" value="资产抵押与解抵押"></el-option>
+					<el-option label="资产减值" value="资产减值"></el-option>
+					<el-option label="资产捐赠" value="资产捐赠"></el-option>
+					<el-option label="资产的法律变更" value="资产的法律变更"></el-option>
+				</el-select>
+			</el-form-item>
 			<el-form-item label="变更描述" class="hui-textarea">
 				<el-input type="textarea" v-model="propertyForm.remark" placeholder="请输入变更描述" resize="none">
 				</el-input>
@@ -28,7 +49,9 @@
 		data() {
 			return {
 				propertyForm: {
-					remark: ''
+					remark: '',
+					content: '',
+					type: ''
 				},
 				departList: [],
 				departId: [],

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

@@ -1,65 +1,123 @@
-<template>
-	<div class="hui-detail-content">
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">流程日期</div>
-			<div class="hui-detail-value">{{formData.date}}</div>
-		</div>
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">项目名称</div>
-			<div class="hui-detail-value">{{formData.projectName}}</div>
-		</div>
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">单位建筑</div>
-			<div class="hui-detail-value">{{formData.projectItemName}}</div>
-		</div>
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">具体位置</div>
-			<div class="hui-detail-value">{{formData.projectItemTargetName}}</div>
-		</div>
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">资产名称</div>
-			<div class="hui-detail-value">{{formData.name}}</div>
-		</div>
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">资产类型</div>
-			<div class="hui-detail-value">{{formData.type === 0?'普通设备':'物联网设备' }}</div>
-		</div>
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">设计编码</div>
-			<div class="hui-detail-value">{{formData.designNumber}}</div>
-		</div>
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">资产编码</div>
-			<div class="hui-detail-value">{{formData.assetNumber}}</div>
-		</div>
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">设备编码</div>
-			<div class="hui-detail-value">{{formData.deviceNumber}}</div>
-		</div>
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">品牌</div>
-			<div class="hui-detail-value">{{formData.deviceBrand}}</div>
-		</div>
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">型号</div>
-			<div class="hui-detail-value">{{formData.deviceModel}}</div>
-		</div>
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">序列号</div>
-			<div class="hui-detail-value">{{formData.deviceSerialNumber}}</div>
-		</div>
-		<div class="hui-detail-item">
-			<div class="hui-detail-label">备注</div>
-			<div class="hui-detail-value">{{formData.remark}}</div>
-		</div>
-	</div>
-</template>
-
-<script>
-	export default {
-		props: ['formData'],
-	}
-</script>
-
-<style>
+<template>
+	<div class="hui-detail-content">
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">流程日期</div>
+			<div class="hui-detail-value">{{formData.date}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">项目名称</div>
+			<div class="hui-detail-value">{{formData.projectName}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">单位建筑</div>
+			<div class="hui-detail-value">{{formData.projectItemName}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">具体位置</div>
+			<div class="hui-detail-value">{{formData.projectItemTargetName}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">资产名称</div>
+			<div class="hui-detail-value">{{formData.name}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">资产类型</div>
+			<div class="hui-detail-value">{{formData.type === 0?'普通设备':'物联网设备' }}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">设计编码</div>
+			<div class="hui-detail-value">{{formData.designNumber}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">资产编码</div>
+			<div class="hui-detail-value">{{formData.assetNumber}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">设备编码</div>
+			<div class="hui-detail-value">{{formData.deviceNumber}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">品牌</div>
+			<div class="hui-detail-value">{{formData.deviceBrand}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">型号</div>
+			<div class="hui-detail-value">{{formData.deviceModel}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">序列号</div>
+			<div class="hui-detail-value">{{formData.deviceSerialNumber}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">库房</div>
+			<div class="hui-detail-value">{{formData.godownName}}</div>
+		</div>
+		<div class="hui-detail-item" v-if="formData.modelBindType === 2 && formData.modelBindContent">
+			<div class="hui-detail-label">3D模型</div>
+			<div class="hui-detail-value">
+				<el-button type="primary" size="mini" @click="lookModel">查看模型</el-button>
+			</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">厂家</div>
+			<div class="hui-detail-value">{{formData.manufacturer}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">联系人</div>
+			<div class="hui-detail-value">{{formData.liaison}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">联系方式</div>
+			<div class="hui-detail-value">{{formData.liaisonPhone}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">进场时间</div>
+			<div class="hui-detail-value">{{formData.entryTime}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">维保记录</div>
+			<div class="hui-detail-value">{{formData.maintenanceRecord}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">备注</div>
+			<div class="hui-detail-value">{{formData.remark}}</div>
+		</div>
+		<el-dialog :close-on-click-modal="false" title="预览" :visible.sync="modelVisible" width="900px"
+			:append-to-body="true">
+			<three-model ref="threeModel" :url="nowModel.address" :type="nowModel.type">
+			</three-model>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import threeModel from '@/components/work/common/threeModel'
+	import {
+		get3DModelDetail
+	} from '@/httpApi/property'
+	export default {
+		props: ['formData'],
+		data() {
+			return {
+				modelVisible: false,
+				nowModel: {}
+			}
+		},
+		methods: {
+			lookModel() {
+				get3DModelDetail(this.formData.modelBindContent).then(res => {
+					if (res.state) {
+						this.nowModel = res.data;
+						this.modelVisible = true;
+					}
+				})
+			}
+		},
+		components: {
+			threeModel
+		}
+	}
+</script>
+
+<style>
 </style>

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

@@ -1,13 +1,13 @@
 <template>
 	<div class="property-flow-form">
 		<project-item ref="projectItem" :form="propertyForm"></project-item>
-		<el-form :model="propertyForm" label-position="top">
+		<el-form ref="propertyForm" :model="propertyForm" label-position="top">
 			<el-form-item label="资产名称">
 				<el-input type="text" v-model="propertyForm.name" placeholder="请输入资产名称"></el-input>
 			</el-form-item>
 			<el-form-item label="资产类别">
-				<el-cascader v-model="departId" :options="departList" :props="defaultProps" @change="changePart"
-					placeholder="请选择资产类别">
+				<el-cascader ref="cascader" v-model="departId" :options="departList" :props="defaultProps"
+					@change="changePart" placeholder="请选择资产类别">
 				</el-cascader>
 			</el-form-item>
 			<el-form-item label="设备类型" required>
@@ -34,6 +34,44 @@
 			<el-form-item label="序列号">
 				<el-input type="text" v-model="propertyForm.deviceSerialNumber" placeholder="请输入序列号"></el-input>
 			</el-form-item>
+			<el-form-item label="库房" required>
+				<el-select v-model="propertyForm.godownId" placeholder="请选择库房" @change="changeGoDown">
+					<el-option :label="item.name" :value="item.id" v-for="(item,index) in goDownData" :key="index">
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="绑定类型">
+				<el-select v-model="propertyForm.modelBindType" placeholder="请选择绑定类型" @change="getModel">
+					<el-option label="构件ID" :value="1"></el-option>
+					<el-option label="模型库" :value="2"></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="构件ID" v-if="propertyForm.modelBindType === 1">
+				<el-input type="text" v-model="propertyForm.modelBindContent" placeholder="请输入构件ID"></el-input>
+			</el-form-item>
+			<el-form-item label="3D模型" v-if="propertyForm.modelBindType === 2">
+				<el-select v-model="propertyForm.modelBindContent" placeholder="请选择3D模型">
+					<el-option :label="item.name" :value="item.id" v-for="(item,index) in modelList" :key="index">
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="厂家">
+				<el-input type="text" v-model="propertyForm.manufacturer" placeholder="请输入厂家"></el-input>
+			</el-form-item>
+			<el-form-item label="联系人">
+				<el-input type="text" v-model="propertyForm.liaison" placeholder="请输入联系人"></el-input>
+			</el-form-item>
+			<el-form-item label="联系方式">
+				<el-input type="text" v-model="propertyForm.liaisonPhone" placeholder="请输入联系方式"></el-input>
+			</el-form-item>
+			<el-form-item label="进场时间" required>
+				<el-date-picker v-model="propertyForm.entryTime" type="date" placeholder="进场时间"
+					value-format="yyyy-MM-dd">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item label="维保记录">
+				<el-input type="text" v-model="propertyForm.maintenanceRecord" placeholder="请输入维保记录"></el-input>
+			</el-form-item>
 			<el-form-item label="资产备注" class="hui-textarea">
 				<el-input type="textarea" v-model="propertyForm.remark" placeholder="请输入资产备注" resize="none">
 				</el-input>
@@ -44,7 +82,9 @@
 
 <script>
 	import {
-		getDevicePartList
+		getDevicePartList,
+		getGoDownList,
+		get3DModel
 	} from '@/httpApi/property'
 	import projectItem from '@/components/common/projectItem'
 	import {
@@ -65,15 +105,27 @@
 					name: '',
 					operateDeviceLevelId: 0,
 					remark: '',
-					type: 0
+					type: 0,
+					godownId: '',
+					godownName: '',
+					modelBindType: '',
+					modelBindContent: '',
+					manufacturer: '',
+					liaison: '',
+					liaisonPhone: '',
+					entryTime: '',
+					maintenanceRecord: ''
 				},
 				departList: [],
 				departId: [],
+				nowDepart: {},
 				defaultProps: {
 					children: 'children',
 					label: 'name',
 					value: 'id'
 				},
+				goDownData: [],
+				modelList: []
 			}
 		},
 		created() {
@@ -89,17 +141,43 @@
 						this.returnChildren(this.departList);
 						if (this.propertyForm.operateDeviceLevelId) this.departId = findParentIds(this.departList,
 							this.propertyForm.operateDeviceLevelId);
+						if (this.nowDepart.id) this.getModel();
+					}
+				})
+				getGoDownList({
+					organizationId: this.$store.getters.organization.id,
+					projectId: this.$store.getters.project.id
+				}).then(res => {
+					if (res.state) {
+						this.goDownData = res.data;
 					}
 				})
 			},
 			returnChildren(data) {
 				data.forEach(item => {
+					if (item.id === this.propertyForm.operateDeviceLevelId) this.nowDepart = item;
 					if (item.children && item.children.length == 0) item.children = null;
 					if (item.children && item.children.length > 0) this.returnChildren(item.children);
 				});
 			},
 			changePart() {
 				this.propertyForm['operateDeviceLevelId'] = this.departId[this.departId.length - 1];
+				this.nowDepart = this.$refs.cascader.getCheckedNodes(true)[0].data;
+			},
+			changeGoDown(val) {
+				this.propertyForm.godownName = this.goDownData.find(node => node.id == val).name;
+			},
+			getModel() {
+				if (this.propertyForm.modelBindType === 2) {
+					get3DModel({
+						modelLevelId: this.nowDepart.modelLevelId,
+						levelId: this.nowDepart.id
+					}).then(res => {
+						if (res.state) {
+							this.modelList = res.data;
+						}
+					})
+				}
 			},
 			returnForm() {
 				let obj = this.$refs.projectItem.returnItem();

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

@@ -12,7 +12,8 @@
 							<span class="table-operation" @click="insertDepartment(scope.row)">
 								添加子资产
 							</span>
-							<span class="table-operation" v-if="scope.row.children.length === 0">
+							<span class="table-operation" v-if="scope.row.children.length === 0"
+								@click="model(scope.row)">
 								3D模型
 							</span>
 							<span class="table-operation" v-if="!scope.row.isp" @click="updateDepartment(scope.row)">
@@ -34,6 +35,10 @@
 			<depart-form v-if="visible" @callback="callback" :isUpdate="isUpdate" :part="part">
 			</depart-form>
 		</el-dialog>
+		<el-dialog :close-on-click-modal="false" title="模型列表" :visible.sync="modelVisible" width="1100px"
+			:append-to-body="true">
+			<model-down v-if="modelVisible" :modelLevelId="nowLevel.modelLevelId" :levelId="nowLevel.id"></model-down>
+		</el-dialog>
 	</div>
 </template>
 
@@ -44,6 +49,7 @@
 		deleteDeviceDepartment
 	} from '@/httpApi/property'
 	import departForm from '@/components/work/property/departForm'
+	import modelDown from '@/components/work/common/modelDown'
 	export default {
 		data() {
 			return {
@@ -51,7 +57,9 @@
 				visible: false,
 				isUpdate: false,
 				part: {},
-				drawer: false
+				drawer: false,
+				modelVisible: false,
+				nowLevel: {}
 			}
 		},
 		created() {
@@ -79,6 +87,10 @@
 					}
 				})
 			},
+			model(item) {
+				this.nowLevel = item;
+				this.modelVisible = true;
+			},
 			currentChange(currPage) {
 				this.currPage = currPage;
 				this.init();
@@ -113,7 +125,8 @@
 			}
 		},
 		components: {
-			departForm
+			departForm,
+			modelDown
 		},
 	}
 </script>

virgo.wzfrontend/console/src/config/field.js

@@ -246,20 +246,12 @@ const supportingFacilities = [{
 }];
 const modelType = [{
 	id: 1,
-	name: 'FBX',
-	accept: '.fbx, .FBX'
+	name: 'GLTF/GLB',
+	accept: '.gltf, .GLTF, .glb, .GLB'
 }, {
 	id: 2,
-	name: 'OBJ',
-	accept: '.obj, .OBJ'
-}, {
-	id: 3,
-	name: 'GLB',
-	accept: '.glb, .GLB'
-}, {
-	id: 4,
-	name: 'GLTF',
-	accept: '.gltf, .GLTF'
+	name: 'FBX',
+	accept: '.fbx, .FBX'
 }]
 
 const findItem = (type, id) => {

virgo.wzfrontend/console/src/views/work/property/change.vue

@@ -47,6 +47,7 @@
 									</template>
 								</el-table-column>
 								<el-table-column label="资产名称" prop="name"></el-table-column>
+								<el-table-column label="变更类型" prop="type"></el-table-column>
 								<el-table-column label="资产编码" prop="assetNumber"></el-table-column>
 								<el-table-column label="单位建筑" prop="projectItemName"></el-table-column>
 								<el-table-column label="具体位置" prop="projectItemTargetName"></el-table-column>
@@ -184,21 +185,21 @@
 						}
 					}
 				})
-			},
-			filterDevice(data) {
-				this.filterOption = {};
-				if (this.nowData.id === data.id) {
-					this.nowData = {};
-				} else {
-					this.nowData = data;
-					if (this.nowData.deviceId) {
-						this.filterOption['deviceId'] = this.nowData.deviceId;
-					} else {
-						this.filterOption['deviceLevelId'] = this.nowData.id;
-					}
-				}
-				this.currPage = 1;
-				this.init();
+			},
+			filterDevice(data) {
+				this.filterOption = {};
+				if (this.nowData.id === data.id) {
+					this.nowData = {};
+				} else {
+					this.nowData = data;
+					if (this.nowData.deviceId) {
+						this.filterOption['deviceId'] = this.nowData.deviceId;
+					} else {
+						this.filterOption['deviceLevelId'] = this.nowData.id;
+					}
+				}
+				this.currPage = 1;
+				this.init();
 			},
 			returnChildren(data) {
 				data.forEach(item => {