diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 32bd9f6ae..c17c73e04 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -649,14 +649,12 @@ export default {
},
handleSearch () {
- // if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
+ console.log(this.selTreeObj)
this.showRoomTable = true;
this.$nextTick(() => {
this.$refs["ref_buildingTable"].loadTable("search", this.selTreeObj);
});
- // } else {
- // this.$message.warning('请输入查询条件')
- // }
+
},
//重置搜索条件
@@ -700,6 +698,7 @@ export default {
this.treeData = [];
this.treeData.push(data);
// 默认加载第一层
+ debugger
this.autoOpenArr.push(data.id)
if (!isRefresh && data) {
this.selTreeObj = data;
@@ -896,47 +895,6 @@ export default {
//解析树数据
getTreeObj (obj) {
- // 树接口:
- // 组织:组织id、组织名称、type、经度、纬度
- // 小区:小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
- // 楼:楼id、楼名称、type、所属小区id、所属小区名称
- if (obj.level === "building") {
-
- this.selTreeObj = obj;
- //点击楼栋
- // let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid); //所属小区
-
- // let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid); //所属网格
- // let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid); //所属社区
- // obj.agencyId = agencyNode.data.id;
- // obj.agencyName = agencyNode.data.label;
- // obj.gridId = gridNode.data.id;
- // obj.gridName = gridNode.data.label;
- // obj.neighborHoodId = neighborHoodNode.data.id;
- // obj.neighborHoodName = neighborHoodNode.data.label;
- // if (obj.agencyId === this.staffAgencyId) {
- // this.showImportBtn = true;
- // } else {
- // this.showImportBtn = false;
- // }
- } else if (obj.level === "neighborHood") {
- //点击小区
- // let gridNode = this.$refs.ref_tree.getNode(obj.pid);
- // let agencyNode = this.$refs.ref_tree.getNode(obj.agencyId);
- // obj.gridId = gridNode.data.id;
- // obj.gridName = gridNode.data.label;
- // obj.agencyId = agencyNode.data.id;
- // obj.agencyName = agencyNode.data.label;
-
- // if (obj.agencyId === this.staffAgencyId) {
- // this.showImportBtn = true;
- // } else {
- // this.showImportBtn = false;
- // }
- this.selTreeObj = obj;
- } else {
- }
-
if (!obj.latitude) {
obj.latitude = this.centerPoint[0];
}
diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue
index 5f75e590e..ffe6dba2b 100644
--- a/src/views/modules/base/community/communityExportInfo.vue
+++ b/src/views/modules/base/community/communityExportInfo.vue
@@ -1,190 +1,147 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
- 预览
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+ 预览
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 5bc63e89b..7ea93dc05 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -479,7 +479,7 @@ export default {
async loadTable (source, treeObj) {
this.source = source;
this.tableLoading = true;
- console.log(treeObj, 'see');
+ console.log(treeObj, source);
if (source === "tree") {
//来源于tree,查询数据清空
this.sortType = "asc";