From 1463064bc3f78e0dcc4bd45b1de31d4876c62dbd Mon Sep 17 00:00:00 2001 From: SongZhen <> Date: Sat, 7 Oct 2023 13:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E8=88=B0=E8=89=87orangid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organizational/dangTree/index.vue | 11 +- .../organizational/gridTree/index.vue | 11 +- .../dataBoard/organizational/jwTree/index.vue | 11 +- src/views/dataBoard/overview/index.vue | 221 ++++++------------ 4 files changed, 90 insertions(+), 164 deletions(-) diff --git a/src/views/dataBoard/organizational/dangTree/index.vue b/src/views/dataBoard/organizational/dangTree/index.vue index b6f9400aa..2aa4e6b41 100644 --- a/src/views/dataBoard/organizational/dangTree/index.vue +++ b/src/views/dataBoard/organizational/dangTree/index.vue @@ -42,10 +42,11 @@ export default { }, computed: {}, mounted() { - const orgId = this.$store.state.chooseArea.chooseName.orgId; - if (orgId) { - this.getTreeData(); - } + // const orgId = this.$store.state.chooseArea.chooseName.orgId; + // if (orgId) { + // this.getTreeData(); + // } + this.getTreeData(); }, methods: { getLevelArrNum(myArray) { @@ -76,7 +77,7 @@ export default { //获取树状结构 getTreeData() { this.loading = true; - this.$http.get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => { + this.$http.get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=`).then((res) => { const { data: { code, msg, data }, } = res; diff --git a/src/views/dataBoard/organizational/gridTree/index.vue b/src/views/dataBoard/organizational/gridTree/index.vue index 308f99f5e..e13f766d4 100644 --- a/src/views/dataBoard/organizational/gridTree/index.vue +++ b/src/views/dataBoard/organizational/gridTree/index.vue @@ -41,10 +41,11 @@ export default { }, }, mounted() { - const orgId = this.$store.state.chooseArea.chooseName.orgId; - if (orgId) { - this.getTreeData(); - } + // const orgId = this.$store.state.chooseArea.chooseName.orgId; + // if (orgId) { + // this.getTreeData(); + // } + this.getTreeData(); }, methods: { getLevelArrNum(myArray) { @@ -84,7 +85,7 @@ export default { //获取树状结构 getTreeData() { this.loading = true; - this.$http.get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => { + this.$http.get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=`).then((res) => { const { data: { code, msg, data }, } = res; diff --git a/src/views/dataBoard/organizational/jwTree/index.vue b/src/views/dataBoard/organizational/jwTree/index.vue index a9882e9f5..6cc88bcc0 100644 --- a/src/views/dataBoard/organizational/jwTree/index.vue +++ b/src/views/dataBoard/organizational/jwTree/index.vue @@ -41,10 +41,11 @@ export default { }, }, mounted() { - const orgId = this.$store.state.chooseArea.chooseName.orgId; - if (orgId) { - this.getTreeData(); - } + // const orgId = this.$store.state.chooseArea.chooseName.orgId; + // if (orgId) { + // this.getTreeData(); + // } + this.getTreeData(); }, methods: { getLevelArrNum(myArray) { @@ -86,7 +87,7 @@ export default { //获取树状结构 getTreeData() { this.loading = true; - this.$http.get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => { + this.$http.get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=`).then((res) => { const { data: { code, msg, data }, } = res; diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index a9d721cbc..16fe87fc0 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -8,167 +8,91 @@
- - + +
- - + +
- +
- +
- +
- - + +
- - + +
- + - +
- + - +
-
- - - - +
+ + + +
- + - +
- + - - - + + +
- + - +
- +
@@ -193,8 +117,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", @@ -237,7 +161,7 @@ export default { currentLevelData: { orgId: this.$store.state.chooseArea.chooseName.orgId, orgLevel: this.$store.state.chooseArea.chooseName.level, - meta: {title: "人房总览"}, + meta: { title: "人房总览" }, }, breadList: [ { @@ -245,7 +169,7 @@ export default { orgLevel: "", id: "", level: "", - meta: {title: "人房总览"}, + meta: { title: "人房总览" }, }, ], peopleList: { @@ -310,10 +234,13 @@ export default { }, }, + mounted() { + this.getMapData(); + }, + methods: { changeCustomerName() { - this.customerName = - localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; + this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; }, changeType(e) { this.peopleType = e; @@ -351,12 +278,12 @@ export default { } }, - clickBreadItem({item}) { + clickBreadItem({ item }) { this.toBread(item); }, clickAgencyItem(item) { - this.$refs.map.clearMarkert() + this.$refs.map.clearMarkert(); if (item.id) { this.customerName = item.name || item.meta.title; this.currentLevelData = { @@ -364,8 +291,7 @@ export default { orgLevel: item.level, }; } else { - this.customerName = - localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; + this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; this.currentLevelData = { ...this.$store.state.chooseArea.chooseName, orgLevel: this.$store.state.chooseArea.chooseName.level, @@ -374,7 +300,7 @@ export default { this.toBread({ orgId: item.id, orgLevel: item.level, - meta: {title: item.name}, + meta: { title: item.name }, }); }, goBackMap() { @@ -382,13 +308,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); @@ -402,48 +328,45 @@ export default { this.$refs.map.setDotMarker(item, [parseFloat(item.longitude), parseFloat(item.latitude)]); }, setNum(data) { - console.log(this.orgData,data,'111') + console.log(this.orgData, data, "111"); // data - let params = [] - let org = this.orgData.children - org.forEach(item => { - data.forEach(item2 => { + let params = []; + let org = this.orgData.children; + org.forEach((item) => { + data.forEach((item2) => { if (item2.orgId === item.id && item.coordinates) { params.push({ ...item2, peopleType: this.peopleList[this.peopleType], latitude: item.latitude, - longitude: item.longitude - }) + longitude: item.longitude, + }); } - }) - }) + }); + }); if (params.length) { - this.$refs.map.setNum(params) + this.$refs.map.setNum(params); } }, 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 - ) { + async getMapData(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) + console.log(this.orgId); this.orgLevel = this.orgData.level; this.currentLevel = this.orgData.agencyLevel; this.currentLevelData = { orgId: this.orgId, orgLevel: this.currentLevel, }; - this.peopleType = this.currentLevel === 'grid'?'unit':'staffAgency'; + this.peopleType = this.currentLevel === "grid" ? "unit" : "staffAgency"; }); }, @@ -451,20 +374,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, @@ -475,7 +398,7 @@ export default { coordinates: item.coordinates || "", }; }); - this.orgData = {...orgData}; + this.orgData = { ...orgData }; } else { this.$message.error(msg); } @@ -489,7 +412,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;