fix

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

@@ -421,12 +421,12 @@
 
 	.el-icon-caret-right::before {
 		content: '\e738';
-	}
-
+	}
+	
 	.el-tree-node__content>.el-tree-node__expand-icon {
-		padding: 16px;
-	}
-
+		padding: 10px;
+	}
+	
 	.tree-node {
 		display: flex;
 		align-items: center;
@@ -1531,6 +1531,7 @@
 	
 	.iconfont{
 		font-size: 19px;
+		margin-right: 5px;
 	}
 	
 	.el-icon-place{
@@ -1541,7 +1542,7 @@
 		color: $--color-common;
 	}
 	
-	.active{
+	&.active{
 		color: $--color-primary;
 	}
 }

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

@@ -0,0 +1,78 @@
+<template>
+	<div class="hui-flex hui-dialog import-form">
+		<div class="hui-flex-box hui-dialog-content">
+			<el-tree ref="tree" :data="treeData" :props="defaultProps" show-checkbox></el-tree>
+		</div>
+		<div class="hui-dialog-submit">
+			<el-button size="medium" @click="$emit('callback')">取 消</el-button>
+			<el-button size="medium" type="primary" @click="submit" :loading="loading">导 出</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		initDevicePartList,
+		getDevicePartList,
+		importProperty
+	} from '@/httpApi/property'
+	import config from '@/config'
+	export default {
+		data() {
+			return {
+				treeData: [],
+				defaultProps: {
+					children: 'children',
+					label: 'name'
+				},
+				loading: false
+			}
+		},
+		mounted() {
+			this.initDeviceList();
+		},
+		methods: {
+			initDeviceList() {
+				getDevicePartList(this.$store.getters.organization.id, this.$store.getters.project.id).then(res => {
+					if (res.state) {
+						if (res.data.length === 0) {
+							initDevicePartList(this.$store.getters.organization.id, this.$store.getters.project.id)
+								.then(res => {
+									if (res.state) this.initDeviceList();
+								})
+						} else {
+							this.treeData = res.data;
+							this.returnChildren(this.treeData);
+						}
+					}
+				})
+			},
+			returnChildren(data) {
+				data.forEach(item => {
+					if (item.children && item.deviceList) {
+						let obj = item.deviceList.map(res => {
+							res['deviceId'] = res.id;
+							res['id'] = -res.id;
+							return res;
+						})
+						item.children = item.children.concat(obj);
+					}
+					if (item.children && item.children.length > 0) this.returnChildren(item.children);
+				});
+			},
+			submit() {
+				let node = this.$refs.tree.getCheckedNodes(true).filter(node => node.deviceId).map(node => node.deviceId);
+				if (node.length === 0) return this.$message.warning('请选择资产');
+				window.location.href = config.baseURL + `api/operateDevice/exportData/0/${node.join(',')}`;
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.import-form {
+		.el-tree .el-tree-node__label {
+			left: 0;
+		}
+	}
+</style>

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

@@ -5,29 +5,14 @@
 			<span class="hui-left-tree-sub">资产列表</span>
 		</div>
 		<div class="hui-left-tree-content">
-			<el-collapse>
-				<el-collapse-item v-for="item in treeData" :key="item.id">
-					<template slot="title">
-						<div :class="nowData.id === item.id ? 'collapse-title active':'collapse-title'"
-							@click.stop="filterDevice(item)">
-							<i class="iconfont huifont-shuzhuangcaidantubiao"></i>
-							<span class="el-collapse-name">{{item.name}}</span>
-						</div>
-					</template>
-					<div>
-						<el-tree :data="item.children" :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="filterDevice(data)">
-									<i
-										:class="'iconfont ' + (data.deviceId ? 'huifont-shebeiguanli' : 'huifont-xiangmuguanli')">
-									</i>
-								</div>
-							</div>
-						</el-tree>
-					</div>
-				</el-collapse-item>
-			</el-collapse>
+			<el-tree :data="treeData" :props="defaultProps">
+				<div :class="nowData.id === data.id ? 'custom-tree-node active':'custom-tree-node'"
+					@click.stop="filterDevice(data)" slot-scope="{ node, data }">
+					<i :class="'iconfont ' + (data.deviceId ? 'huifont-shebeiguanli' : 'huifont-xiangmuguanli')">
+					</i>
+					<div class="label">{{node.label}}</div>
+				</div>
+			</el-tree>
 		</div>
 	</div>
 </template>
@@ -38,6 +23,7 @@
 		getDevicePartList
 	} from '@/httpApi/property'
 	export default {
+		props: ['type'],
 		data() {
 			return {
 				treeData: [],
@@ -62,15 +48,34 @@
 								})
 						} else {
 							this.treeData = res.data;
-							this.returnChildren(this.treeData);
+							this.returnChildren(this.treeData, []);
 						}
 					}
 				})
 			},
-			returnChildren(data) {
-				data.forEach(item => {
-					if (item.children && item.children.length > 0) this.returnChildren(item.children);
-				});
+			returnChildren(data, parentData) {
+				if (this.type === 1) {
+					data.forEach(item => {
+						item['parentData'] = [...parentData, item.name];
+						if (item.children && item.deviceList) {
+							let obj = item.deviceList.map(res => {
+								res['deviceId'] = res.id;
+								res['id'] = -res.id;
+								return res;
+							})
+							item.children = item.children.concat(obj);
+						}
+						if (item.children && item.children.length > 0) this.returnChildren(item.children,
+							[...parentData, item.name]);
+					});
+				} else {
+					data.forEach(item => {
+						item['parentData'] = [...parentData, item.name];
+						if (item.children && item.children.length > 0) this.returnChildren(item.children, [...
+							parentData, item.name
+						]);
+					});
+				}
 			},
 			filterDevice(data) {
 				let option = {};
@@ -84,7 +89,7 @@
 						option['deviceLevelIds'] = this.getStorageIds([data]);
 					}
 				}
-				this.$emit('filterDevice', option);
+				this.$emit('filterDevice', option, data.parentData);
 			},
 			getStorageIds(array) {
 				//获取档案库id

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

@@ -32,6 +32,18 @@ export function getDevicePartListByQuery(data) {
 		method: 'post',
 		data: data
 	})
+}
+/* 
+ * 通过条件获取资产列表
+ * 
+ * 
+ */
+export function importProperty(data) {
+	return request({
+		url: `/api/operateDevice/exportData`,
+		method: 'post',
+		data: data
+	})
 }
 /* 
  * 删除设资产列表

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

@@ -1,7 +1,7 @@
 <template>
 	<div class="hui-flex">
 		<div class="hui-flex-box yui-tree-box">
-			<level-tree @filterDevice="filterDevice"></level-tree>
+			<level-tree @filterDevice="filterDevice" :type="1"></level-tree>
 			<div class="hui-tree-content">
 				<div class="hui-flex hui-content box-background">
 					<div class="hui-content-title">
@@ -10,8 +10,11 @@
 					<div class="hui-flex-box hui-flex hui-table">
 						<div class="hui-content-insert">
 							<el-button type="primary" v-permission="'/work/property/change/add'" size="medium"
-								@click="insert">新增变更</el-button>
-						</div>
+								@click="insert">
+								新增变更
+							</el-button>
+						</div>
+						<div class="part-parent-node" style="margin-bottom: 10px;">资产层级：{{parentData.join('-')}}</div>
 						<div class="hui-flex-box">
 							<el-table :data="tableData" row-key="id" border height="100%">
 								<el-table-column label="序号" width="50">
@@ -114,7 +117,8 @@
 				detailId: '',
 				drawer: false,
 				nowData: {},
-				filterOption: {}
+				filterOption: {},
+				parentData:[]
 			}
 		},
 		mounted() {
@@ -139,8 +143,9 @@
 					}
 				})
 			},
-			filterDevice(data) {
-				this.filterOption = data;
+			filterDevice(option,parentData) {
+				this.parentData = parentData;
+				this.filterOption = option;
 				this.currPage = 1;
 				this.init();
 			},

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

@@ -1,7 +1,7 @@
 <template>
 	<div class="hui-flex">
 		<div class="hui-flex-box yui-tree-box">
-			<level-tree @filterDevice="filterDevice"></level-tree>
+			<level-tree @filterDevice="filterDevice" :type="1"></level-tree>
 			<div class="hui-tree-content">
 				<div class="hui-flex hui-content box-background">
 					<div class="hui-content-title">

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

@@ -1,7 +1,7 @@
 <template>
 	<div class="hui-flex">
 		<div class="hui-flex-box yui-tree-box">
-			<level-tree @filterDevice="filterDevice"></level-tree>
+			<level-tree @filterDevice="filterDevice" :type="1"></level-tree>
 			<div class="hui-tree-content">
 				<div class="hui-flex hui-content box-background">
 					<div class="hui-content-title">

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

@@ -23,6 +23,7 @@
 								导出数据
 							</el-button>
 						</div>
+						<div class="part-parent-node" style="margin-bottom: 10px;">资产层级：{{parentData.join('-')}}</div>
 						<div class="hui-flex-box">
 							<el-table :data="tableData" row-key="id" border height="100%" @sort-change="sortChange">
 								<el-table-column label="序号" width="50">
@@ -31,9 +32,11 @@
 									</template>
 								</el-table-column>
 								<el-table-column label="资产名称" prop="name"></el-table-column>
-								<el-table-column label="设备类型">
+								<el-table-column label="创建日期" sortable>
 									<template slot-scope="scope">
-										<span>{{scope.row.type === 0?'普通设备':'物联网设备'}}</span>
+										<span>
+											{{$dayjs(scope.row.date).format('YYYY-MM-DD')}}
+										</span>
 									</template>
 								</el-table-column>
 								<el-table-column label="资产编码" prop="assetNumber"></el-table-column>
@@ -110,6 +113,10 @@
 		<el-drawer title="流程详情" :visible.sync="drawer" :size="400" :append-to-body="true">
 			<flow-detail v-if="drawer" @callback="callback" :detailId="detailId"></flow-detail>
 		</el-drawer>
+		<el-dialog :close-on-click-modal="false" title="导出数据" :visible.sync="importVisible" width="900px"
+			:append-to-body="true">
+			<import-file v-if="importVisible" @callback="importVisible = false"></import-file>
+		</el-dialog>
 	</div>
 </template>
 
@@ -122,6 +129,7 @@
 	import flowForm from '@/components/flow/flowForm'
 	import flowDetail from '@/components/flow/flowDetail'
 	import levelTree from '@/components/work/property/levelTree'
+	import importFile from '@/components/work/property/importFile'
 	import config from '@/config'
 	export default {
 		data() {
@@ -137,7 +145,9 @@
 				drawer: false,
 				nowData: {},
 				filterOption: {},
-				insertType: 1
+				insertType: 1,
+				parentData: [],
+				importVisible: false
 			}
 		},
 		mounted() {
@@ -162,15 +172,25 @@
 				})
 			},
 			sortChange(data) {
-				console.log(data.order);
+				let sort = data.column.label === '状态' ? 'stateSort' : 'dateSort';
+				let option = {};
+				if (data.order === 'descending') {
+					option[sort] = 0;
+				} else if (data.order === 'ascending') {
+					option[sort] = 1;
+				}
+				this.filterOption = option;
+				this.currPage = 1;
+				this.init();
 			},
-			filterDevice(data) {
-				this.filterOption = data;
+			filterDevice(option, parentData) {
+				this.parentData = parentData;
+				this.filterOption = option;
 				this.currPage = 1;
 				this.init();
 			},
 			outputFile() {
-				window.location.href = `${config.baseURL}/api/operateDevice/export/${this.$store.getters.project.id}/0`;
+				this.importVisible = true;
 			},
 			downloadFile() {
 				window.location.href = config.baseURL + '/api/operateDevice/exportTemplate';
@@ -213,7 +233,8 @@
 			flowForm,
 			flowDetail,
 			batchForm,
-			levelTree
+			levelTree,
+			importFile
 		},
 	}
 </script>