diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss index 3a9b376d2..a6005c041 100644 --- a/src/assets/scss/dataBoard/overview/index.scss +++ b/src/assets/scss/dataBoard/overview/index.scss @@ -47,7 +47,7 @@ } .m-rybox { - width: 884px; + width: 910px; } .m-subbox { @@ -354,6 +354,7 @@ .m-jdwgy { height: auto!important; + width: 100%; padding: 12px 16px; } diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index 75edfcd1f..8b2681dec 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -8,26 +8,86 @@
- +
- +
-
- +
+
- +
- - + +
+
+ + +
+
+
+
@@ -37,57 +97,136 @@
-
+
- + +
-
+
- +
-
+
- - - + + +
- + - +
- + - - - + + +
- + - +
@@ -235,7 +374,8 @@ export default { methods: { changeCustomerName() { - this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; + this.customerName = + localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; }, changeType(e) { this.peopleType = e; @@ -290,7 +430,8 @@ 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, @@ -326,7 +467,10 @@ export default { if (!item.longitude) { return this.$message.error("请先设置坐标"); } - this.$refs.map.setDotMarker(item, [parseFloat(item.longitude), parseFloat(item.latitude)]); + this.$refs.map.setDotMarker(item, [ + parseFloat(item.longitude), + parseFloat(item.latitude), + ]); }, setNum(data) { // data @@ -357,19 +501,25 @@ export default { // } }, //获取地图上显示的组织数据 - 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.orgData = data; - this.orgId = this.orgData.id; - 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.$http + .post(`/gov/org/agency/maporg`, { orgId, level }) + .then(({ data: { data } }) => { + this.orgData = data; + this.orgId = this.orgData.id; + 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"; + }); }, //获取地图上显示的组织数据 @@ -463,7 +613,11 @@ export default { background: #000; } - +