From a61e853f82a03b048302a1af4bda3d9c8f939f10 Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Thu, 1 Sep 2022 16:30:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E5=BC=80=E5=90=8E=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=B8=8D=E6=B8=B2=E6=9F=93=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/loading.gif | Bin 9937 -> 0 bytes src/views/charts/charts/ChartMap.vue | 15 ++++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 public/images/loading.gif diff --git a/public/images/loading.gif b/public/images/loading.gif deleted file mode 100644 index 748d130062dac130a3dca639d8d31c68d1c96dbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9937 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 V?(+Z$n&tt7zzf{ii(kO${{Vte7)SsB diff --git a/src/views/charts/charts/ChartMap.vue b/src/views/charts/charts/ChartMap.vue index 9eec98df..c081b407 100644 --- a/src/views/charts/charts/ChartMap.vue +++ b/src/views/charts/charts/ChartMap.vue @@ -155,11 +155,12 @@ export default { mixins: [chartMixin], methods: { unitConvert, - initMap (id) { + async initMap (id) { try { // 初始化插件 + const geoData = await getGeoData(storageKey.iso36112WorldLow) const chart = am4Core.create(id, am4Maps.MapChart) - chart.geodata = getGeoData(storageKey.iso36112WorldLow) + chart.geodata = geoData chart.projection = new am4Maps.projections.Miller() this.myChart = shallowRef(chart) // 初始化多边形series(即地图series) @@ -217,7 +218,7 @@ export default { if (countryId) { ev.target.series.chart.zoomToMapObject(ev.target) ev.target.isHover = false - const geoData = getGeoData(countryId) + const geoData = await getGeoData(countryId) if (geoData) { this.countrySeries = shallowRef(this.polygonSeriesFactory()) this.countrySeries.geodata = geoData @@ -234,9 +235,9 @@ export default { polygonSeries.useGeodata = true polygonSeries.exclude = ['AQ'] // 排除南极洲 polygonSeries.tooltip.getFillFromObject = false - polygonSeries.tooltip.background.fill = am4Core.color('#41495D') + polygonSeries.tooltip.background.fill = am4Core.color('#ffffff') polygonSeries.tooltip.background.filters.clear() - polygonSeries.tooltip.background.stroke = '#41495D' + polygonSeries.tooltip.background.stroke = '#C5C5C5' const polygonTemplate = polygonSeries.mapPolygons.template polygonTemplate.tooltipHTML = this.generatePolygonTooltipHTML() polygonTemplate.nonScalingStroke = true @@ -276,9 +277,9 @@ export default { circle.strokeWidth = 1 circle.tooltipHTML = this.generatePolygonTooltipHTML() imageSeries.tooltip.getFillFromObject = false - imageSeries.tooltip.background.fill = am4Core.color('#41495D') + imageSeries.tooltip.background.fill = am4Core.color('#FFFFFF') imageSeries.tooltip.background.filters.clear() - imageSeries.tooltip.background.stroke = '#41495D' + imageSeries.tooltip.background.stroke = '#C5C5C5' imageSeries.heatRules.push({ target: circle,