whx 6 months ago
parent
commit
c1c2bacf3c

+ 9 - 1
virgo.wzfrontend/console/src/components/common/listFilter.vue

@@ -42,6 +42,13 @@
 			</div>
 		</div>
 		<div class="filter-box" v-if="type === 'contract'">
+			<div class="filter-item">
+				<el-select v-model="contract.type" placeholder="请选择合同类型">
+					<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.contractType"
+						:key="item.id">
+					</el-option>
+				</el-select>
+			</div>
 			<div class="filter-item">
 				<el-input prefix-icon="el-icon-search" v-model="contract.code" placeholder="请输入合同编号"></el-input>
 			</div>
@@ -119,7 +126,8 @@
 				contract: {
 					code: '',
 					startDate: '',
-					endDate: ''
+					endDate: '',
+					type: ''
 				},
 				contractData: {},
 				order: {

+ 1 - 1
virgo.wzfrontend/console/src/components/flow/flowDetail.vue

@@ -82,7 +82,7 @@
 				getFlowById(this.detailId).then(res => {
 					if (res.state) {
 						let flowData = JSON.parse(res.data.flowData);
-						this.detail = Object.assign(flowData, res.data);
+						this.detail = Object.assign(res.data, flowData);
 						let flowUserList = this.detail.flowUserList ? JSON.parse(this.detail.flowUserList) : [];
 						if (this.detail.projectFlowId) {
 							this.initFlow(flowUserList);

+ 13 - 1
virgo.wzfrontend/console/src/components/work/contract/list/edit.vue

@@ -79,6 +79,16 @@
 				<div class="contract-box">
 					<div class="hui-chart-title">基本信息</div>
 					<div class="contract-from">
+						<el-form-item label="合同名称" :rules="[{required: true, message: '请输入合同名称'}]">
+							<el-input v-model="form.name" placeholder="请输入合同名称"></el-input>
+						</el-form-item>
+						<el-form-item label="合同类型" prop="type" :rules="[{required: true, message: '请选择合同类型'}]">
+							<el-select v-model="form.type" placeholder="请选择合同类型">
+								<el-option :label="item.name" :value="item.id"
+									v-for="(item,index) in $field.field.contractType" :key="item.id">
+								</el-option>
+							</el-select>
+						</el-form-item>
 						<el-form-item label="签订日" prop="signingDate" :rules="[{required: true, message: '请选择签订日'}]">
 							<el-date-picker v-model="form.signingDate" value-format="yyyy-MM-dd" type="date"
 								placeholder="请选择签订日">
@@ -241,7 +251,9 @@
 					lateFeesStartingDays: '',
 					lateFeesProportion: '',
 					lateFeesCeiling: '',
-					projectItemTargetRoomIds: ''
+					projectItemTargetRoomIds: '',
+					type: '',
+					name: ''
 				},
 				tagIds: [],
 				clauseList: [{

+ 239 - 232
virgo.wzfrontend/console/src/components/work/order/detail.vue

@@ -1,233 +1,240 @@
-<template>
-	<div class="hui-flex">
-		<div class="hui-flex-box">
-			<div class="hui-detail">
-				<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">{{detail.date}}</div>
-					</div>
-					<div class="hui-detail-item">
-						<div class="hui-detail-label">工单名称</div>
-						<div class="hui-detail-value">{{detail.name}}</div>
-					</div>
-					<div class="hui-detail-item hui-detail-item-top">
-						<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.tenantType === 1 ? detail.merchantName: detail.clientName}}
-						</div>
-					</div>
-					<div class="hui-detail-item">
-						<div class="hui-detail-label">跟进人</div>
-						<div class="hui-detail-value">{{detail.followUpPersonName}}</div>
-					</div>
-					<div class="hui-detail-item">
-						<div class="hui-detail-label">联系方式</div>
-						<div class="hui-detail-value">{{detail.followUpPersonPhone}}</div>
-					</div>
-					<div class="hui-detail-item" v-if="detail.type != 3">
-						<div class="hui-detail-label">服务方式</div>
-						<div class="hui-detail-value">
-							{{detail.type === 1?$field.findTypeName('serviceWorkWay',detail.workWay):$field.findTypeName('clearWorkWay',detail.workWay)}}
-						</div>
-					</div>
-					<div class="hui-detail-item">
-						<div class="hui-detail-label">关联租客</div>
-						<div class="hui-detail-value">{{detail.merchantName || detail.clientName}}</div>
-					</div>
-					<div class="hui-detail-item">
-						<div class="hui-detail-label">摘要</div>
-						<div class="hui-detail-value">{{detail.compendious}}</div>
-					</div>
-				</div>
-				<div class="hui-detail-title">图片</div>
-				<div class="hui-detail-content hui-detail-image">
-					<upload ref="upload" :list="detail.attachment ? JSON.parse(detail.attachment) : []" type="preview">
-					</upload>
-				</div>
-				<div v-if="detail.data && detail.data != '[]'">
-					<div class="hui-detail-title">自定义信息</div>
-					<div class="hui-detail-content">
-						<div class="hui-detail-item" v-for="(item,index) in JSON.parse(detail.data)" :key="index">
-							<div class="hui-detail-label">{{item.keyName}}</div>
-							<div class="hui-detail-value">{{item.value}}</div>
-						</div>
-					</div>
-				</div>
-				<div class="hui-detail-title" v-if="detail.workOrderProcessList.length > 0">工单过程</div>
-				<process :process="detail.workOrderProcessList" v-if="detail.workOrderProcessList.length > 0">
-				</process>
-			</div>
-		</div>
-		<div class="hui-drawer-submit" v-if="actionButton.length > 0">
-			<el-button size="medium" type="primary" v-for="(item,index) in actionButton" :key="index"
-				@click="actionClick(item.type)">
-				{{item.name}}
-			</el-button>
-		</div>
-		<el-dialog :close-on-click-modal="false" :title="type == 1 ? '选择指派人员':'处理工单'" :visible.sync="visible" width="880px" :append-to-body="true">
-			<select-user @callback="callBack" v-if="visible && type == 1" :maxLen="1"></select-user>
-			<action @callback="callBack" v-if="visible && type == 2" :operationId="operation.id"></action>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-	import {
-		getOrderDetailById,
-		updateOrder,
-		insertOrderProcess
-	} from '@/httpApi/order'
-	import upload from '@/components/common/upload'
-	import selectUser from '@/components/common/selectUser'
-	import process from '@/components/work/order/process'
-	import action from '@/components/work/order/action'
-	export default {
-		props: ['detailId'],
-		data() {
-			return {
-				detail: {
-					name: '',
-					projectItemTargetRoomIds: '',
-					tenantType: 1,
-					merchantId: '',
-					clientId: '',
-					followUpPerson: '',
-					followUpPersonPhone: '',
-					workWay: '',
-					workOrderProcessList: []
-				},
-				visible: false,
-				type: 1,
-				operation: {},
-				actionButton: []
-			}
-		},
-		created() {
-			if (this.detailId) this.init();
-		},
-		methods: {
-			init() {
-				getOrderDetailById(this.detailId).then(res => {
-					if (res.state) {
-						this.detail = res.data;
-						this.role();
-					}
-				})
-			},
-			role() {
-				let user = this.$store.getters.user,
-					button = [];
-				if (this.detail.userId === user.userId) { //创建者
-					if (!this.detail.status) button.push({
-						type: 1,
-						name: '提交工单'
-					})
-				}
-				let data = this.detail.workOrderProcessList.filter(node => !node.status);
-				if (data.length > 0) { //未处理工单过程
-					this.operation = data[0];
-					//处理工单人员
-					if (this.operation.operatorId === user.userId) button.push({
-						type: 2,
-						name: '处理工单'
-					})
-				}
-				if (this.detail.followUpPerson === user.userId) { //跟进人
-					if (this.detail.status === 1) button.push({
-						type: 3,
-						name: '开始工单'
-					})
-					if (this.detail.status === 2) button.push({
-						type: 4,
-						name: '指派人员'
-					})
-					if (data.length === 0 && this.detail.status === 2) button.push({
-						type: 5,
-						name: '完成工单'
-					})
-				}
-				this.actionButton = button;
-			},
-			actionClick(type) {
-				switch (type) {
-					case 1:
-						this.submitOrder('是否提交工单,提交后将不能再修改?', 1);
-						break;
-					case 2:
-						this.operationClick(2)
-						break;
-					case 3:
-						this.submitOrder('是否开始工单?', 2);
-						break;
-					case 4:
-						this.operationClick(1)
-						break;
-					case 5:
-						this.submitOrder('是否完成工单?', 3);
-						break;
-					default:
-						break;
-				}
-			},
-			submitOrder(msg, status) {
-				this.$confirm(msg, () => {
-					this.update(status);
-				});
-			},
-			update(status) {
-				updateOrder({
-					id: this.detail.id,
-					status: status
-				}).then(res => {
-					if (res.state) {
-						this.init();
-						this.$message.success('操作成功');
-						this.$emit('callback', 'init')
-					}
-				})
-			},
-			callBack(data) {
-				if (!data) return this.visible = false;
-				if (data == 'init') {
-					this.init();
-					return this.visible = false;
-				}
-				insertOrderProcess({
-					operatorId: data[0].id,
-					workOrderId: this.detailId,
-					status: 0,
-					attachment: '[]'
-				}).then(res => {
-					if (res.state) {
-						this.init();
-						this.visible = false;
-						this.$message.success('操作成功');
-					}
-				})
-			},
-			operationClick(type) {
-				this.type = type;
-				this.visible = true;
-			}
-		},
-		components: {
-			upload,
-			selectUser,
-			process,
-			action
-		},
-	}
-</script>
-<style lang="scss">
-
+<template>
+	<div class="hui-flex">
+		<div class="hui-flex-box">
+			<div class="hui-detail">
+				<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">{{detail.date}}</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">工单名称</div>
+						<div class="hui-detail-value">{{detail.name}}</div>
+					</div>
+					<div class="hui-detail-item hui-detail-item-top">
+						<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.tenantType === 1 ? detail.merchantName: detail.clientName}}
+						</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">跟进人</div>
+						<div class="hui-detail-value">{{detail.followUpPersonName}}</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">联系方式</div>
+						<div class="hui-detail-value">{{detail.followUpPersonPhone}}</div>
+					</div>
+					<div class="hui-detail-item" v-if="detail.type != 3">
+						<div class="hui-detail-label">服务方式</div>
+						<div class="hui-detail-value" v-if="detail.type === 1">
+							{{$field.findTypeName('serviceWorkWay',detail.workWay)}}
+						</div>
+						<div class="hui-detail-value" v-if="detail.type === 2">
+							{{$field.findTypeName('clearWorkWay',detail.workWay)}}
+						</div>
+						<div class="hui-detail-value" v-if="detail.type === 4">
+							{{$field.findTypeName('patrolWorkWay',detail.workWay)}}
+						</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">关联租客</div>
+						<div class="hui-detail-value">{{detail.merchantName || detail.clientName}}</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">摘要</div>
+						<div class="hui-detail-value">{{detail.compendious}}</div>
+					</div>
+				</div>
+				<div class="hui-detail-title">图片</div>
+				<div class="hui-detail-content hui-detail-image">
+					<upload ref="upload" :list="detail.attachment ? JSON.parse(detail.attachment) : []" type="preview">
+					</upload>
+				</div>
+				<div v-if="detail.data && detail.data != '[]'">
+					<div class="hui-detail-title">自定义信息</div>
+					<div class="hui-detail-content">
+						<div class="hui-detail-item" v-for="(item,index) in JSON.parse(detail.data)" :key="index">
+							<div class="hui-detail-label">{{item.keyName}}</div>
+							<div class="hui-detail-value">{{item.value}}</div>
+						</div>
+					</div>
+				</div>
+				<div class="hui-detail-title" v-if="detail.workOrderProcessList.length > 0">工单过程</div>
+				<process :process="detail.workOrderProcessList" v-if="detail.workOrderProcessList.length > 0">
+				</process>
+			</div>
+		</div>
+		<div class="hui-drawer-submit" v-if="actionButton.length > 0">
+			<el-button size="medium" type="primary" v-for="(item,index) in actionButton" :key="index"
+				@click="actionClick(item.type)">
+				{{item.name}}
+			</el-button>
+		</div>
+		<el-dialog :close-on-click-modal="false" :title="type == 1 ? '选择指派人员':'处理工单'" :visible.sync="visible"
+			width="880px" :append-to-body="true">
+			<select-user @callback="callBack" v-if="visible && type == 1" :maxLen="1"></select-user>
+			<action @callback="callBack" v-if="visible && type == 2" :operationId="operation.id"></action>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import {
+		getOrderDetailById,
+		updateOrder,
+		insertOrderProcess
+	} from '@/httpApi/order'
+	import upload from '@/components/common/upload'
+	import selectUser from '@/components/common/selectUser'
+	import process from '@/components/work/order/process'
+	import action from '@/components/work/order/action'
+	export default {
+		props: ['detailId'],
+		data() {
+			return {
+				detail: {
+					name: '',
+					projectItemTargetRoomIds: '',
+					tenantType: 1,
+					merchantId: '',
+					clientId: '',
+					followUpPerson: '',
+					followUpPersonPhone: '',
+					workWay: '',
+					workOrderProcessList: []
+				},
+				visible: false,
+				type: 1,
+				operation: {},
+				actionButton: []
+			}
+		},
+		created() {
+			if (this.detailId) this.init();
+		},
+		methods: {
+			init() {
+				getOrderDetailById(this.detailId).then(res => {
+					if (res.state) {
+						this.detail = res.data;
+						this.role();
+					}
+				})
+			},
+			role() {
+				let user = this.$store.getters.user,
+					button = [];
+				if (this.detail.userId === user.userId) { //创建者
+					if (!this.detail.status) button.push({
+						type: 1,
+						name: '提交工单'
+					})
+				}
+				let data = this.detail.workOrderProcessList.filter(node => !node.status);
+				if (data.length > 0) { //未处理工单过程
+					this.operation = data[0];
+					//处理工单人员
+					if (this.operation.operatorId === user.userId) button.push({
+						type: 2,
+						name: '处理工单'
+					})
+				}
+				if (this.detail.followUpPerson === user.userId) { //跟进人
+					if (this.detail.status === 1) button.push({
+						type: 3,
+						name: '开始工单'
+					})
+					if (this.detail.status === 2) button.push({
+						type: 4,
+						name: '指派人员'
+					})
+					if (data.length === 0 && this.detail.status === 2) button.push({
+						type: 5,
+						name: '完成工单'
+					})
+				}
+				this.actionButton = button;
+			},
+			actionClick(type) {
+				switch (type) {
+					case 1:
+						this.submitOrder('是否提交工单,提交后将不能再修改?', 1);
+						break;
+					case 2:
+						this.operationClick(2)
+						break;
+					case 3:
+						this.submitOrder('是否开始工单?', 2);
+						break;
+					case 4:
+						this.operationClick(1)
+						break;
+					case 5:
+						this.submitOrder('是否完成工单?', 3);
+						break;
+					default:
+						break;
+				}
+			},
+			submitOrder(msg, status) {
+				this.$confirm(msg, () => {
+					this.update(status);
+				});
+			},
+			update(status) {
+				updateOrder({
+					id: this.detail.id,
+					status: status
+				}).then(res => {
+					if (res.state) {
+						this.init();
+						this.$message.success('操作成功');
+						this.$emit('callback', 'init')
+					}
+				})
+			},
+			callBack(data) {
+				if (!data) return this.visible = false;
+				if (data == 'init') {
+					this.init();
+					return this.visible = false;
+				}
+				insertOrderProcess({
+					operatorId: data[0].id,
+					workOrderId: this.detailId,
+					status: 0,
+					attachment: '[]'
+				}).then(res => {
+					if (res.state) {
+						this.init();
+						this.visible = false;
+						this.$message.success('操作成功');
+					}
+				})
+			},
+			operationClick(type) {
+				this.type = type;
+				this.visible = true;
+			}
+		},
+		components: {
+			upload,
+			selectUser,
+			process,
+			action
+		},
+	}
+</script>
+<style lang="scss">
+
 </style>

+ 11 - 0
virgo.wzfrontend/console/src/components/work/property/changeFlowDetail.vue

@@ -20,6 +20,14 @@
 			<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}}</div>
+		</div>
+		<div class="hui-detail-item">
+			<div class="hui-detail-label">变更内容</div>
+			<div class="hui-detail-value">{{formData.content}}</div>
+		</div>
 		<div class="hui-detail-item">
 			<div class="hui-detail-label">变更备注</div>
 			<div class="hui-detail-value">{{formData.remark}}</div>
@@ -30,6 +38,9 @@
 <script>
 	export default {
 		props: ['formData'],
+		created() {
+			console.log(this.formData);
+		}
 	}
 </script>
 

+ 14 - 3
virgo.wzfrontend/console/src/config/field.js

@@ -262,6 +262,7 @@ const supportingFacilities = [{
 	name: '便捷购物',
 	icon: 'huifont-gouwu'
 }];
+
 const modelType = [{
 	id: 1,
 	name: 'GLTF/GLB',
@@ -270,7 +271,8 @@ const modelType = [{
 	id: 2,
 	name: 'FBX',
 	accept: '.fbx, .FBX'
-}]
+}];
+
 const sealType = [{
 	id: 1,
 	name: '公章'
@@ -289,7 +291,15 @@ const sealType = [{
 }, {
 	id: 6,
 	name: '资料章'
-}]
+}];
+
+const contractType = [{
+	id: 1,
+	name: '房租租赁'
+}, {
+	id: 2,
+	name: '设备租赁'
+}];
 
 const findItem = (type, id) => {
 	return eval(type).find(node => node.id == id) || {
@@ -323,7 +333,8 @@ export default {
 		patrolWorkWay,
 		supportingFacilities,
 		modelType,
-		sealType
+		sealType,
+		contractType
 	},
 	findTypeName(type, id) {
 		return findItem(type, id).name;

+ 18 - 7
virgo.wzfrontend/console/src/views/work/business/organization.vue

@@ -3,7 +3,8 @@
 		<div class="hui-content-title">
 			<div class="hui-title-item active">企业客户</div>
 		</div>
-		<div class="hui-flex-box hui-flex hui-table">
+		<div class="hui-flex-box hui-flex hui-table">
+			<list-filter type="organization" @filter="filterInit"></list-filter>
 			<div class="hui-flex-box">
 				<el-table :data="tableData" row-key="id" border height="100%">
 					<el-table-column label="序号" width="50">
@@ -58,7 +59,8 @@
 	import {
 		getOrganizationListByPage
 	} from '@/httpApi/business'
-	import detail from '@/components/work/business/organization/detail'
+	import detail from '@/components/work/business/organization/detail'
+	import listFilter from '@/components/common/listFilter'
 	export default {
 		data() {
 			return {
@@ -69,26 +71,34 @@
 				visible: false,
 				detailId: '',
 				isUpdate: false,
-				drawer: false
+				drawer: false,
+				filterOption: {}
 			}
 		},
 		created() {
 			this.init();
 		},
 		methods: {
-			init() {
-				getOrganizationListByPage({
+			init() {
+				let postData = {
 					currPage: this.currPage,
 					pageSize: this.pageSize,
 					organizationId: this.$store.getters.organization.id,
 					projectId: this.$store.getters.project.id,
 					status: 1
-				}).then(res => {
+				}
+				postData = Object.assign(postData, this.filterOption);
+				getOrganizationListByPage(postData).then(res => {
 					if (res.state) {
 						this.tableData = res.data.dataList;
 						this.totalCount = res.data.totalCount;
 					}
 				})
+			},
+			filterInit(option) {
+				this.filterOption = option;
+				this.currPage = 1;
+				this.init();
 			},
 			currentChange(currPage) {
 				this.currPage = currPage;
@@ -100,7 +110,8 @@
 			}
 		},
 		components: {
-			detail
+			detail,
+			listFilter
 		}
 	}
 </script>

+ 17 - 11
virgo.wzfrontend/console/src/views/work/contract/list.vue

@@ -16,24 +16,30 @@
 								<div style="text-align: center;">{{scope.$index + 1}}</div>
 							</template>
 						</el-table-column>
-						<el-table-column label="合同编号" prop="code"></el-table-column>
-						<el-table-column label="租客" prop="name">
+						<el-table-column label="合同类型" prop="type"  width="110">
 							<template slot-scope="scope">
-								{{scope.row.tenantType === 1 ? scope.row.merchantName: scope.row.clientName}}
+								<span>{{$field.findTypeName('contractType',scope.row.type)}}</span>
 							</template>
+						</el-table-column>
+						<el-table-column label="位置" prop="projectItemTargetRoomIds">
+							<template slot-scope="scope">
+								<div class="hui-ellipsis">
+									<span v-for="(item,index) in scope.row.roomMap">
+										{{item}}、
+									</span>
+								</div>
+							</template>
 						</el-table-column>
-						<el-table-column label="房号" prop="projectItemTargetRoomIds">
+						<el-table-column label="客商" prop="name">
 							<template slot-scope="scope">
-								<div class="hui-ellipsis">
-									<span v-for="(item,index) in scope.row.roomMap">
-										{{item}}、
-									</span>
-								</div>
+								{{scope.row.tenantType === 1 ? scope.row.merchantName: scope.row.clientName}}
 							</template>
 						</el-table-column>
+						<el-table-column label="合同编号" prop="code"></el-table-column>
 						<el-table-column label="开始日" prop="startDate" width="110"></el-table-column>
-						<el-table-column label="结束日" prop="endDate" width="110"></el-table-column>
-						<el-table-column label="运营跟进人" prop="operatorName" width="100"></el-table-column>
+						<el-table-column label="结束日" prop="endDate" width="110"></el-table-column>
+						<el-table-column label="联系人" prop="tenantContactPerson" width="100"></el-table-column>
+						<el-table-column label="跟进人" prop="operatorName" width="100"></el-table-column>
 						<el-table-column label="状态" width="100">
 							<template slot-scope="scope">
 								<div class="hui-table-operation" v-if="!scope.row.status">

+ 7 - 3
virgo.wzfrontend/console/src/views/work/energy/analysis.vue

@@ -507,7 +507,7 @@
 								<i class="iconfont huifont-xiazai1"></i>
 							</div>
 							<div class="function-label">能耗数据表格</div>
-							<div class="hui-tag">下载</div>
+							<div class="hui-tag" @click="downloadFile">下载</div>
 						</div>
 					</div>
 					<div class="analysis-chart">
@@ -575,7 +575,8 @@
 	import floorHvac from '@/components/work/energy/analysis/floorHvac'
 	import {
 		getEnergyAnalysis
-	} from '@/httpApi/test'
+	} from '@/httpApi/test'
+	import config from '@/config'
 	export default {
 		data() {
 			return {
@@ -668,7 +669,10 @@
 				this.init();
 			})
 		},
-		methods: {
+		methods: {
+			downloadFile() {
+				window.location.href = config.baseURL + '/api/test/downloadModel';
+			},
 			init() {
 				getEnergyAnalysis({
 					projectId: this.$store.getters.id

+ 0 - 1
virgo.wzfrontend/console/src/views/work/operation/meeting/organization.vue

@@ -18,7 +18,6 @@
 						<el-table-column label="会议名称" prop="name"></el-table-column>
 						<el-table-column label="会议时间" prop="date"></el-table-column>
 						<el-table-column label="会议类型" prop="typeName"></el-table-column>
-						<el-table-column label="会议时长" prop="duration"></el-table-column>
 						<el-table-column label="发起人" prop="userName"></el-table-column>
 						<el-table-column label="会议地点" prop="placeName"></el-table-column>
 						<el-table-column label="会议纪要" prop="meetingMinutes"></el-table-column>

+ 0 - 1
virgo.wzfrontend/console/src/views/work/operation/meeting/project.vue

@@ -18,7 +18,6 @@
 						<el-table-column label="会议名称" prop="name"></el-table-column>
 						<el-table-column label="会议时间" prop="date"></el-table-column>
 						<el-table-column label="会议类型" prop="typeName"></el-table-column>
-						<el-table-column label="会议时长" prop="duration"></el-table-column>
 						<el-table-column label="发起人" prop="userName"></el-table-column>
 						<el-table-column label="会议地点" prop="placeName"></el-table-column>
 						<el-table-column label="会议纪要" prop="meetingMinutes"></el-table-column>

+ 14 - 5
virgo.wzfrontend/console/src/views/work/property/register.vue

@@ -50,6 +50,11 @@
 									</template>
 								</el-table-column>
 								<el-table-column label="资产名称" prop="name"></el-table-column>
+								<el-table-column label="资产类型">
+									<template slot-scope="scope">
+										<span>{{scope.row.type === 0?'普通设备':'物联网设备'}}</span>
+									</template>
+								</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>
@@ -82,15 +87,19 @@
 								<el-table-column label="操作" width="150">
 									<template slot-scope="scope">
 										<div class="hui-table-operation">
-											<span class="table-operation" v-permission="'/work/property/register/detail'" @click="lookFlow(scope.row)">
+											<span class="table-operation"
+												v-permission="'/work/property/register/detail'"
+												@click="lookFlow(scope.row)">
 												详情
 											</span>
-											<span class="table-operation" v-permission="'/work/property/register/update'" v-if="!scope.row.projectFlowId"
-												@click="updateFlow(scope.row)">
+											<span class="table-operation"
+												v-permission="'/work/property/register/update'"
+												v-if="!scope.row.projectFlowId" @click="updateFlow(scope.row)">
 												编辑
 											</span>
-											<span class="table-operation" v-permission="'/work/property/register/delete'" v-if="!scope.row.projectFlowId"
-												@click="deleteFlow(scope.row)">
+											<span class="table-operation"
+												v-permission="'/work/property/register/delete'"
+												v-if="!scope.row.projectFlowId" @click="deleteFlow(scope.row)">
 												删除
 											</span>
 										</div>