From e3422757a20fe0f2590019117d49c3e7262de4f3 Mon Sep 17 00:00:00 2001
From: chenj <523037378@qq.com>
Date: Thu, 1 Dec 2022 16:56:30 +0800
Subject: [PATCH] =?UTF-8?q?CN-820=20fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E6=8A=A5=E9=94=99=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 | 80 +++++++++++------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/views/charts2/charts/npm/NpmIpMap.vue b/src/views/charts2/charts/npm/NpmIpMap.vue
index 9811554c..a7ccbec3 100644
--- a/src/views/charts2/charts/npm/NpmIpMap.vue
+++ b/src/views/charts2/charts/npm/NpmIpMap.vue
@@ -99,48 +99,48 @@ export default {
         }
         if (params.type === 'serverIp' || params.type === 'clientIp') params.type = 'ip'
         getData(api.npm.overview.map, params).then(res => {
-          const subParams = {
-            ...params,
-            params: res.map(r => `'${r.country}'`).join(',')
-          }
-
           this.showError = false
-
-          // 计算分数
-          const tcpRequest = get(api.npm.overview.mapTcp, subParams)
-          const httpRequest = get(api.npm.overview.mapHttp, subParams)
-          const sslRequest = get(api.npm.overview.mapSsl, subParams)
-          const tcpLostRequest = get(api.npm.overview.mapPacketLoss, subParams)
-          const packetRetransRequest = get(api.npm.overview.mapPacketRetrans, subParams)
-          Promise.all([tcpRequest, httpRequest, sslRequest, tcpLostRequest, packetRetransRequest]).then(res2 => {
-            const keyPre = ['tcp', 'http', 'ssl', 'tcpLost', 'packetRetrans']
-            const mapData = res
-            res2.forEach((r, i) => {
-              if (r.code === 200) {
-                mapData.forEach(t => {
-                  const find = r.data.result.find(d => d.country === t.country)
-                  t[keyPre[i] + 'Score'] = find
-                })
-              } else {
-                this.showError = true
-                this.errorMsg = r.message
-              }
+          if (res && res.length > 0) {
+            const subParams = {
+              ...params,
+              params: res.map(r => `'${r.country}'`).join(',')
+            }
+            // 计算分数
+            const tcpRequest = get(api.npm.overview.mapTcp, subParams)
+            const httpRequest = get(api.npm.overview.mapHttp, subParams)
+            const sslRequest = get(api.npm.overview.mapSsl, subParams)
+            const tcpLostRequest = get(api.npm.overview.mapPacketLoss, subParams)
+            const packetRetransRequest = get(api.npm.overview.mapPacketRetrans, subParams)
+            Promise.all([tcpRequest, httpRequest, sslRequest, tcpLostRequest, packetRetransRequest]).then(res2 => {
+              const keyPre = ['tcp', 'http', 'ssl', 'tcpLost', 'packetRetrans']
+              const mapData = res
+              res2.forEach((r, i) => {
+                if (r.code === 200) {
+                  mapData.forEach(t => {
+                    const find = r.data.result.find(d => d.country === t.country)
+                    t[keyPre[i] + 'Score'] = find
+                  })
+                } else {
+                  this.showError = true
+                  this.errorMsg = r.message
+                }
+              })
+              mapData.forEach(t => {
+                const data = {
+                  establishLatencyMs: t.tcpScore ? t.tcpScore.establishLatencyMs : null,
+                  httpResponseLatency: t.httpScore ? t.httpScore.httpResponseLatency : null,
+                  sslConLatency: t.sslScore ? t.sslScore.sslConLatency : null,
+                  tcpLostlenPercent: t.tcpLostScore ? t.tcpLostScore.tcpLostlenPercent : null,
+                  pktRetransPercent: t.packetRetransScore ? t.packetRetransScore.pktRetransPercent : null
+                }
+                t.score = computeScore(data)
+                if (t.score === '-') {
+                  t.score = ''
+                }
+              })
+              this.loadMarkerData(imageSeries, mapData)
             })
-            mapData.forEach(t => {
-              const data = {
-                establishLatencyMs: t.tcpScore ? t.tcpScore.establishLatencyMs : null,
-                httpResponseLatency: t.httpScore ? t.httpScore.httpResponseLatency : null,
-                sslConLatency: t.sslScore ? t.sslScore.sslConLatency : null,
-                tcpLostlenPercent: t.tcpLostScore ? t.tcpLostScore.tcpLostlenPercent : null,
-                pktRetransPercent: t.packetRetransScore ? t.packetRetransScore.pktRetransPercent : null
-              }
-              t.score = computeScore(data)
-              if (t.score === '-') {
-                t.score = ''
-              }
-            })
-            this.loadMarkerData(imageSeries, mapData)
-          })
+          }
         }).catch(e => {
           this.showError = true
           this.errorMsg = e.message