From 0cab5d42b14aa6f5f9305d594431ca5e5e19227a Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 4 Aug 2023 17:12:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dnpm=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E4=B8=8B=E9=92=BB=E5=90=8E=E5=88=86=E6=95=B0=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/charts2/charts/npm/NpmIpMap.vue | 2 +-
 src/views/charts2/charts/npm/NpmMap.vue   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/charts2/charts/npm/NpmIpMap.vue b/src/views/charts2/charts/npm/NpmIpMap.vue
index 5c04fdda..09371ff7 100644
--- a/src/views/charts2/charts/npm/NpmIpMap.vue
+++ b/src/views/charts2/charts/npm/NpmIpMap.vue
@@ -118,7 +118,7 @@ export default {
               res2.forEach((r, i) => {
                 if (r.code === 200) {
                   mapData.forEach(t => {
-                    t[keyPre[i] + 'Score'] = r.data.result.find(d => d.country === t.country)
+                    t[keyPre[i] + 'Score'] = r.data.result.find(d => d.country === t.country && d.province === t.province)
                   })
                 } else {
                   this.showError = true
diff --git a/src/views/charts2/charts/npm/NpmMap.vue b/src/views/charts2/charts/npm/NpmMap.vue
index 9fd6c7aa..f474c752 100644
--- a/src/views/charts2/charts/npm/NpmMap.vue
+++ b/src/views/charts2/charts/npm/NpmMap.vue
@@ -50,7 +50,7 @@ import { shallowRef } from 'vue'
 import * as am4Core from '@amcharts/amcharts4/core'
 import * as am4Maps from '@amcharts/amcharts4/maps'
 import { computeScore, getGeoData } from '@/utils/tools'
-import { storageKey, unitTypes, countryNameIdMapping } from '@/utils/constants'
+import { storageKey, unitTypes } from '@/utils/constants'
 import locationOptions from '@/views/charts2/charts/locationOptions'
 import { valueToRangeValue } from '@/utils/unit-convert'
 import { getSecond } from '@/utils/date-util'
@@ -58,7 +58,6 @@ import { api } from '@/utils/api'
 import axios from 'axios'
 import { get } from '@/utils/http'
 import chartMixin from '@/views/charts2/chart-mixin'
-// import { Rectangle3D } from '@amcharts/amcharts4/.internal/core/elements/3d/Rectangle3D'
 import ChartError from '@/components/common/Error'
 export default {
   name: 'NpmMap',
@@ -141,7 +140,7 @@ export default {
                 res2.forEach((r, i) => {
                   if (r.code === 200) {
                     mapData.forEach(t => {
-                      const find = r.data.result.find(d => d.country === t.country)
+                      const find = r.data.result.find(d => d.country === t.country && t.province === d.province)
                       t[keyPre[i] + 'Score'] = find
                     })
                   } else {