diff --git a/portal-manager-ui/admin/src/views/dataActuary/portrayal/portrayalBase/index.vue b/portal-manager-ui/admin/src/views/dataActuary/portrayal/portrayalBase/index.vue index 0e248c166e1cd8f90175d9abee92a0d8184eb5ea..22f08ae1f00794027c261250f46769c5780a1eed 100644 --- a/portal-manager-ui/admin/src/views/dataActuary/portrayal/portrayalBase/index.vue +++ b/portal-manager-ui/admin/src/views/dataActuary/portrayal/portrayalBase/index.vue @@ -432,7 +432,7 @@ export default { this.twoPieData = { title: "鏈湴浜轰笌澶栧湴浜烘敞鍐屽垎甯�", pieName: "鍒嗗竷璇︽儏", - firstName: "鑻ュ皵鐩栧幙鏈湴浜烘敞鍐屽崰姣�", + firstName: "鏈湴浜烘敞鍐屽崰姣�", firstVal: res.data.bd_lv, firstTotal: 1, secondName: "澶栧湴浜烘敞鍐屽崰姣�", @@ -569,7 +569,7 @@ export default { this.twoPieData2 = { title: "鏈湴浜轰笌澶栧湴浜哄姙浠跺垎甯�", pieName: "鍒嗗竷璇︽儏", - firstName: "鑻ュ皵鐩栧幙鏈湴浜哄姙浠跺崰姣�", + firstName: "鏈湴浜哄姙浠跺崰姣�", firstVal: res.data.bd_lv, firstTotal: 1, secondName: "澶栧湴浜哄姙浠跺崰姣�", diff --git a/portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/crowdPortrait.vue b/portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/crowdPortrait.vue index acfa1f45e107f384a8c95a54eb3db22b8fe850ce..bb7b7f8e63fa9bf4afcaccca85a46d19be4bc90c 100644 --- a/portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/crowdPortrait.vue +++ b/portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/crowdPortrait.vue @@ -73,6 +73,7 @@ </template> <script> +import { mapGetters } from "vuex"; import NianlingBar from "./components/bar.vue"; import XingbiePie from "./components/pie.vue"; import QiandaoPie from "./components/pie2.vue"; @@ -99,6 +100,9 @@ export default { XingbiePie, QiandaoPie, }, + computed: { + ...mapGetters("user", ["siteTreeList"]), + }, mounted() { this.init(china); this.getStatisticArea(); @@ -131,8 +135,10 @@ export default { if (this.chart == null) { this.chart = echarts.init(this.$refs.chart); } + let firstData = this.siteTreeList[0]; + let { latitude, longitude, areaName } = firstData; echarts.registerMap("china", data); - var geoGpsMap = [102.95, 33.57]; + var geoGpsMap = [longitude, latitude]; var geoCoordMap = { 姹熻嫃: [118.8062, 31.9208], 榛戦緳姹�: [127.9688, 45.368], @@ -292,7 +298,7 @@ export default { position: "top", // offset: [5, 0], //鍋忕Щ璁剧疆 color: "#ff0000", - formatter: "鑻ュ皵鐩栧幙", + formatter: areaName, textStyle: { color: "#fff", fontSize: "16px", @@ -312,8 +318,8 @@ export default { }, data: [ { - name: "鑻ュ皵鐩栧幙", - value: [102.95, 33.57], + name: areaName, + value: [longitude, latitude], }, ], },