|
@@ -105,6 +105,7 @@
|
|
|
:accordion="true"
|
|
|
:selectAll="true"
|
|
|
@selectData="selectDataHouseTree"
|
|
|
+ :houseData="houseData"
|
|
|
ref="selectTreeHouse"
|
|
|
></tree-house>
|
|
|
</div>
|
|
@@ -836,20 +837,16 @@ export default {
|
|
|
dimension(arr) {
|
|
|
console.log('dimensiondimensiondimensiondimension', arr);
|
|
|
arr.map((item, index) => {
|
|
|
- if (item.children) {
|
|
|
- this.dimension(item.children);
|
|
|
- } else if (item.type == 'room' && item.value == 9733) {
|
|
|
- // && !this.rowDetail.treeData.includes(Number(item.value))
|
|
|
- console.log('roomroomroomroom', arr);
|
|
|
- arr = arr.splice(index, 1);
|
|
|
- // arr = arr.filter((item) => {
|
|
|
- // return this.rowDetail.treeData.includes(Number(item.value));
|
|
|
- // });
|
|
|
- }
|
|
|
+ // if (item.children) {
|
|
|
+ // this.dimension(item.children);
|
|
|
+ // } else if (item.type == 'room' && !this.CheckChinese(item.value)) {
|
|
|
+ // arr.splice(index, 1);
|
|
|
+ // }
|
|
|
});
|
|
|
},
|
|
|
CheckChinese(val) {
|
|
|
- return this.rowDetail.treeData.includes(val);
|
|
|
+ // return this.rowDetail.treeData.find((task) => task.includes(val));
|
|
|
+ // return this.rowDetail.treeData.includes(val);
|
|
|
},
|
|
|
// 获取房间
|
|
|
getOrgTreeList() {
|
|
@@ -858,10 +855,11 @@ export default {
|
|
|
.get('/sc-community/assets/tree/community/find', { buildingType: this.buildingType })
|
|
|
.then(({ status, data, msg }) => {
|
|
|
if (status === 0 && data) {
|
|
|
- let da = this.dimension(data);
|
|
|
+ console.log('houseData=1', this.houseData);
|
|
|
this.houseData = data;
|
|
|
+ this.dimension(this.houseData);
|
|
|
console.log('====================================');
|
|
|
- console.log('da=', da);
|
|
|
+ console.log('houseData=2', this.houseData);
|
|
|
console.log('====================================');
|
|
|
}
|
|
|
console.log('获取房间', this.rowDetail.treeData);
|