diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index 351b059b4..6d02a9281 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -536,7 +536,6 @@ export default { this.loading = false; // await this.loadOrgData(); await this.getMapData(); - await this.getSubMapData(); this.getResiCategoryData(); this.getPerInfo(); this.getResiCategoryForecastData(); @@ -797,67 +796,19 @@ export default { //获取地图上显示的组织数据 async getMapData() { - const url = "org_map"; - const { data, code, msg } = await requestPostBi( - url, - { - queryParam: { - org_id: this.orgId, - }, - }, - { - // mockId: 60810589, - } - ); - - if (code === 0) { - let info = data[0]; - this.orgData = { - ...info, - id: info.org_id, - name: info.org_name, - latitude: parseFloat(info.latitude), - longitude: parseFloat(info.longitude), - coordinates: info.coordinates || "", - children: [], - }; - this.orgId = this.orgData.org_id; - this.orgLevel = this.orgData.level; - } else { - this.$message.error(msg); - } - }, - - //获取地图上显示的组织数据 - async getSubMapData() { - const url = "sub_org_map"; + const url = "/gov/org/agency/maporg"; + let params = { + orgId: this.orgId, + level: this.orgLevel, + }; - const { data, code, msg } = await requestPostBi( - url, - { - queryParam: { - org_id: this.orgId, - }, - }, - { - // mockId: 61831860, - } - ); + const { data, code, msg } = await requestPost(url, params); if (code === 0) { - const { orgData } = this; - orgData.children = data.map((item) => { - return { - ...item, - id: item.org_id, - name: item.org_name, - latitude: parseFloat(item.latitude), - longitude: parseFloat(item.longitude), - coordinates: item.coordinates || "", - }; - }); - this.orgData = { ...orgData }; + this.orgData = data; + this.orgId = this.orgId; + this.orgLevel = this.orgData.level; } else { this.$message.error(msg); }