From 2173facb539b22d0241fd838bf9ad4abc2e867a7 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 20 Apr 2023 10:44:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=AE=E4=B8=AA=E8=A1=97=E9=81=93id=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=8F=9C=E5=8D=95=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/community.vue | 167 ++++++++++-------- 1 file changed, 98 insertions(+), 69 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 61bf5ac60..247235596 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -20,7 +20,7 @@ :filter-node-method="filterNode" @node-click="handleNodeClick" lazy - auto-expand-parent + :auto-expand-parent="true" :default-expanded-keys="autoOpenArr" :load="lazyLoadTree" > @@ -43,14 +43,18 @@ {{ data.showNum }} {{ ")" }} --> - {{ data.showName }} + {{ data.showName }}
-
+
@@ -243,7 +247,7 @@ 查询 @@ -254,7 +258,7 @@ >重置 { - this.$refs.ref_buildingTable.loadTable('search',this.selObj) - }) - }, + // this.handleNodeClick(this.selTreeObj) + + this.$nextTick(() => { + this.$refs.ref_buildingTable.loadTable("search", this.selTreeObj); + }); + }, async loadOpenNode() { const url = "/gov/org/building/tree-ids"; @@ -738,10 +742,11 @@ export default { async loadTree(isRefresh) { const url = "/actual/base/communityBuilding/tree/initTree"; const { data, code, msg } = await requestGet(url); - this.handleNodeClick(data); if (code === 0) { this.treeData = []; this.treeData.push(data); + // 默认加载第一层 + this.autoOpenArr.push(data.id) if (!isRefresh && data) { this.selTreeObj = data; if (!this.selTreeObj.latitude) { @@ -810,9 +815,7 @@ export default { this.bDisabled = false; if (obj.level === "building") { //点击楼栋 - setTimeout(() => { this.$refs["ref_buildingTable"].loadTable("tree", this.selTreeObj); - }, 100); this.selAgencyId = ""; this.selGridId = ""; await this.getValiheList(); @@ -858,25 +861,47 @@ export default { //进入下一级 async toNextLevel(row, level) { - console.log(row, "row"); - console.log(level, "level"); + console.log(row); this.autoOpenArr = []; - // console.log(this.$refs.ref_tree); - const { agencyId, gridId, neighborHoodId, propertyId } = row; - let arr = [agencyId, gridId, neighborHoodId, propertyId]; + console.log(this.$refs.ref_tree); + const { + agencyId, + gridId, + neighborHoodId, + gridName, + agencyName, + buildingId, + pid + } = row; + let arr = [agencyId, gridId, neighborHoodId,pid]; + console.log(arr,'展开的数组'); this.autoOpenArr = arr; - console.log(this.autoOpenArr, "默认展开数组"); - // if (level === 'community') { - // setTimeout(()=>{ - // nextTick(1000) - // this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data || {} - // },50) - // this.autoOpenArr.push(this.selTreeObj.id) - // } else { - // this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data - // } - console.log(this.selTreeObj, "123123123"); + // this.$nextTick(()=>{ + // console.log( this.$refs.ref_tree.getNode("d167076e825e75edda6540c5b9717c79")); + // }) + // this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId) || {}; + if (level == "community") { + this.selTreeObj = { + id: neighborHoodId, + level: "neighborHood", + pid: gridId, + agencyId: agencyId, + agencyName: agencyName, + gridName: gridName, + }; + } else if (level == "building") { + // this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data + this.selTreeObj = { + id:buildingId, + neighborHoodId: neighborHoodId, + level: "building", + pid: neighborHoodId, + agencyId: agencyId, + agencyName: agencyName, + gridName: gridName, + }; + } this.handleNodeClick(this.selTreeObj); this.$nextTick(() => { // ref_tree 元素的ref value 绑定的node-key @@ -900,35 +925,39 @@ export default { // 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度 // 楼：楼id、楼名称、type、所属小区id、所属小区名称 if (obj.level === "building") { + console.log(obj); + 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; - } + // 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(gridNode.data.pid); - 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; - } + // 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 { }