diff --git a/src/views/farm/area/index.vue b/src/views/farm/area/index.vue
index 4e1aa87..f624e0c 100644
--- a/src/views/farm/area/index.vue
+++ b/src/views/farm/area/index.vue
@@ -34,6 +34,16 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+
+
+
+
+ 未占用
+ 已占用
+
+
+
+
@@ -147,20 +157,19 @@ export default {
if(filterList.length == 0){
//没有上级
this.list.forEach(t => {
- oneList.push({id:one.id, name:one.name, createTime:one.createTime, children:twoList});
+ oneList.push({id:one.id, name:one.name, occupied:one.occupied, createTime:one.createTime, children:twoList});
})
}else{
filterList.forEach((one) => {
let twoList = [];
this.list.forEach((two) => {
if(one.id == two.parentId){
- twoList.push({id:two.id, name:two.name, createTime:two.createTime})
+ twoList.push({id:two.id, name:two.name, occupied:two.occupied, createTime:two.createTime})
}
})
- oneList.push({id:one.id, name:one.name, createTime:one.createTime, children:twoList});
+ oneList.push({id:one.id, name:one.name, occupied:one.occupied, createTime:one.createTime, children:twoList});
})
}
-
this.list = oneList;
this.loading = false;
});