From 90cbca0ab8b8435b535364371439c212478f0488 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Wed, 30 Aug 2023 15:27:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlink=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=9B=BE=E5=8D=95=E4=BD=8D=E8=BD=AC=E6=8D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/http.js                              | 16 ++++++++++------
 .../LinkDirectionGrid/PopoverContent.vue       | 18 +++++++++---------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/utils/http.js b/src/utils/http.js
index d132a5f1..ea268148 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -69,12 +69,16 @@ axios.interceptors.response.use(
     return response
   },
   error => {
-    if (licenceErrorCode.indexOf(error.response.data.code) !== -1) {
-      localStorage.removeItem(storageKey.token)
-      window.location.href = '/'
-    } else if (accountErrorCode.indexOf(error.response.data.code) !== -1) {
-      localStorage.removeItem(storageKey.token)
-      window.location.href = '/'
+    try {
+      if (licenceErrorCode.indexOf(error.response.data.code) !== -1) {
+        localStorage.removeItem(storageKey.token)
+        window.location.href = '/'
+      } else if (accountErrorCode.indexOf(error.response.data.code) !== -1) {
+        localStorage.removeItem(storageKey.token)
+        window.location.href = '/'
+      }
+    } catch (e) {
+      console.error(e)
     }
     return Promise.reject(error)
   }
diff --git a/src/views/charts2/charts/linkMonitor/LinkDirectionGrid/PopoverContent.vue b/src/views/charts2/charts/linkMonitor/LinkDirectionGrid/PopoverContent.vue
index a0b634df..dcd44ba2 100644
--- a/src/views/charts2/charts/linkMonitor/LinkDirectionGrid/PopoverContent.vue
+++ b/src/views/charts2/charts/linkMonitor/LinkDirectionGrid/PopoverContent.vue
@@ -74,7 +74,7 @@
                       <div class="block-content-item-name">{{ $t('linkMonitor.linkBlock.total') }}</div>
 
                       <div :test-id="`totalBitsRate${gridData.length}-${index2+1}-${index3+1}`" class="block-content-item-value" :style="{width: item.valueWidth + 'px'}">
-                        {{ unitConvert(item.totalBitsRate, unitTypes.bps).join('') }}
+                        {{ valueToRangeValue(item.totalBitsRate, unitTypes.bps).join('') }}
                       </div>
                     </div>
                   </div>
@@ -99,35 +99,35 @@
                     <div class="block-content-item">
                       <div class="block-content-item-name">{{ $t(npmNetworkName[0].name) }}</div>
                       <div :test-id="`tcp${gridData.length}-${index2+1}-${index3+1}`" class="block-content-item-value" :style="{width: item.valueWidth + 'px'}">
-                        {{ unitConvert(item.establishLatencyMs, unitTypes.time).join('') }}
+                        {{ valueToRangeValue(item.establishLatencyMs, unitTypes.time).join('') }}
                       </div>
                     </div>
 
                     <div class="block-content-item">
                       <div class="block-content-item-name">{{ $t(npmNetworkName[1].name) }}</div>
                       <div :test-id="`http${gridData.length}-${index2+1}-${index3+1}`" class="block-content-item-value" :style="{'width': item.valueWidth + 'px'}">
-                        {{ unitConvert(item.httpResponseLatency, unitTypes.time).join('') }}
+                        {{ valueToRangeValue(item.httpResponseLatency, unitTypes.time).join('') }}
                       </div>
                     </div>
 
                     <div class="block-content-item">
                       <div class="block-content-item-name">{{ $t(npmNetworkName[2].name) }}</div>
                       <div :test-id="`ssl${gridData.length}-${index2+1}-${index3+1}`" class="block-content-item-value" :style="{width: item.valueWidth + 'px'}">
-                        {{ unitConvert(item.sslConLatency, unitTypes.time).join('') }}
+                        {{ valueToRangeValue(item.sslConLatency, unitTypes.time).join('') }}
                       </div>
                     </div>
 
                     <div class="block-content-item">
                       <div class="block-content-item-name">{{ $t(npmNetworkName[3].name) }}</div>
                       <div :test-id="`packetLoss${gridData.length}-${index2+1}-${index3+1}`" class="block-content-item-value" :style="{width: item.valueWidth + 'px'}">
-                        {{ unitConvert(item.tcpLostlenPercent, unitTypes.percent).join('') }}
+                        {{ valueToRangeValue(item.tcpLostlenPercent, unitTypes.percent).join('') }}
                       </div>
                     </div>
 
                     <div class="block-content-item">
                       <div class="block-content-item-name">{{ $t(npmNetworkName[4].name) }}</div>
                       <div :test-id="`packetRetrans${gridData.length}-${index2+1}-${index3+1}`" class="block-content-item-value" :style="{width: item.valueWidth + 'px'}">
-                        {{ unitConvert(item.pktRetransPercent, unitTypes.percent).join('') }}
+                        {{ valueToRangeValue(item.pktRetransPercent, unitTypes.percent).join('') }}
                       </div>
                     </div>
                   </div>
@@ -144,7 +144,7 @@
 </template>
 
 <script>
-import unitConvert from '@/utils/unit-convert'
+import { valueToRangeValue } from '@/utils/unit-convert'
 import { unitTypes } from '@/utils/constants'
 import ChartNoData from '@/views/charts/charts/ChartNoData'
 import ChartError from '@/components/common/Error'
@@ -164,7 +164,7 @@ export default {
   },
   data () {
     return {
-      unitConvert,
+      valueToRangeValue,
       unitTypes,
       npmNetworkName: [
         { name: 'networkAppPerformance.tcpConnectionEstablishLatency' },
@@ -186,7 +186,7 @@ export default {
       if (value < 0.0001 && value !== 0) {
         newValue = '< 0.01%'
       } else {
-        newValue = unitConvert(value, unitTypes.percent).join('')
+        newValue = valueToRangeValue(value, unitTypes.percent).join('')
       }
 
       return newValue