diff --git a/src/views/dataBoard/overview/components/jdwgy.vue b/src/views/dataBoard/overview/components/jdwgy.vue index f5946eb4b..403758083 100644 --- a/src/views/dataBoard/overview/components/jdwgy.vue +++ b/src/views/dataBoard/overview/components/jdwgy.vue @@ -84,9 +84,9 @@ export default { } }, methods: { - getData(level = "", orgId = "") { + getData() { this.loading = true; - if (level == "grid") { + if (this.currentLevelData.orgLevel == "grid") { this.$http.get("/actual/base/streetOverview/queryPersonnelGridGroup?personnelType=" + this.peopleType + "&level=" + this.currentLevelData.orgLevel + diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index 7380a7e12..fbcb336e5 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -8,91 +8,100 @@
- - + +
- - + +
- +
- +
- +
- - + +
- - + +
- + - +
- + - +
- - - - + + + +
- + - +
- + - - - + + +
- + - +
- + @@ -117,8 +126,8 @@ import RankingGridData from "@/views/dataBoard/overview/components/RankingGridDa import FollowUp from "@/views/dataBoard/overview/components/FollowUp.vue"; import Tabs from "@/views/dataBoard/satisfactionEval/components/Tabs/index.vue"; -import { requestPostBi } from "@/js/dai/request-bipass"; -import { requestPost } from "@/js/dai/request"; +import {requestPostBi} from "@/js/dai/request-bipass"; +import {requestPost} from "@/js/dai/request"; export default { name: "renfang", @@ -161,7 +170,7 @@ export default { currentLevelData: { orgId: this.$store.state.chooseArea.chooseName.orgId, orgLevel: this.$store.state.chooseArea.chooseName.level, - meta: { title: "人房总览" }, + meta: {title: "人房总览"}, }, breadList: [ { @@ -169,7 +178,7 @@ export default { orgLevel: "", id: "", level: "", - meta: { title: "人房总览" }, + meta: {title: "人房总览"}, }, ], peopleList: { @@ -217,9 +226,7 @@ export default { // const queryOrgLevel = getQueryPara("orgLevel"); // this.init(queryOrgId, queryOrgLevel); this.changeCustomerName(); - if (this.$store.state.chooseArea.chooseName.orgId) { - this.getMapData(); - } + this.getMapData(); }, watch: { @@ -235,9 +242,6 @@ export default { }, }, - mounted() { - this.getMapData(); - }, methods: { changeCustomerName() { @@ -279,7 +283,7 @@ export default { } }, - clickBreadItem({ item }) { + clickBreadItem({item}) { this.toBread(item); }, @@ -301,7 +305,7 @@ export default { this.toBread({ orgId: item.id, orgLevel: item.level, - meta: { title: item.name }, + meta: {title: item.name}, }); }, goBackMap() { @@ -309,13 +313,13 @@ export default { this.clickAgencyItem(item); }, toBread(item) { - const { orgId } = item; - const { breadList } = this; + const {orgId} = item; + const {breadList} = this; let index = breadList.findIndex((val) => val.orgId === orgId); if (index >= 0) { this.breadList = breadList.slice(0, index + 1); } else { - breadList.push({ ...item, id: item.orgId, level: item.orgLevel }); + breadList.push({...item, id: item.orgId, level: item.orgLevel}); this.breadList = breadList; } this.getMapData(item.orgId, item.orgLevel); @@ -349,7 +353,7 @@ export default { }) }) // if (params.length) { - this.$refs.map.setNum(params) + this.$refs.map.setNum(params) // } }, @@ -358,16 +362,16 @@ export default { }, setPoint(data) { // if (data) { - this.$refs.map.setPoint(data) + this.$refs.map.setPoint(data) // } }, //获取地图上显示的组织数据 async getMapData( - orgId = this.$store.state.chooseArea.chooseName.orgId, - level = this.$store.state.chooseArea.chooseName.level + orgId = this.$store.state.chooseArea.chooseName.orgId, + level = this.$store.state.chooseArea.chooseName.level ) { const url = "org_map"; - this.$http.post(`/gov/org/agency/maporg`, { orgId, level }).then(({ data: { data } }) => { + this.$http.post(`/gov/org/agency/maporg`, {orgId, level}).then(({data: {data}}) => { this.orgData = data; this.orgId = this.orgData.id; console.log(this.orgId); @@ -385,20 +389,20 @@ export default { async getSubMapData() { const url = "sub_org_map"; - const { data, code, msg } = await requestPostBi( - url, - { - queryParam: { - org_id: this.orgId, + const {data, code, msg} = await requestPostBi( + url, + { + queryParam: { + org_id: this.orgId, + }, }, - }, - { - // mockId: 61831860, - } + { + // mockId: 61831860, + } ); if (code === 0) { - const { orgData } = this; + const {orgData} = this; orgData.children = data.map((item) => { return { ...item, @@ -409,7 +413,7 @@ export default { coordinates: item.coordinates || "", }; }); - this.orgData = { ...orgData }; + this.orgData = {...orgData}; } else { this.$message.error(msg); } @@ -423,7 +427,7 @@ export default { level: this.orgLevel, }; - const { data, code, msg } = await requestPost(url, params); + const {data, code, msg} = await requestPost(url, params); if (code === 0) { this.orgData = data; this.orgId = this.orgId; @@ -441,14 +445,17 @@ export default {