From 21c3ead6545de5809e676f707440956397c1fa90 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Sun, 23 Oct 2022 10:17:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8A=98=E7=BA=BF?=
 =?UTF-8?q?=E5=9B=BE=E7=99=BE=E5=88=86=E6=AF=94=E6=95=B0=E6=8D=AE=E4=B8=8E?=
 =?UTF-8?q?=E5=9D=90=E6=A0=87=E5=AF=B9=E4=B8=8D=E4=B8=8A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts2/charts/linkMonitor/LinkTrafficLine.vue   |  2 +-
 src/views/charts2/charts/npm/NpmLine.vue             | 10 +++++++++-
 src/views/charts2/charts/npm/NpmTrafficLine.vue      |  9 +++++++++
 src/views/charts2/charts/options/echartOption.js     | 12 ++++++------
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue b/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue
index 099f7a90..533068a5 100644
--- a/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue
+++ b/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue
@@ -291,7 +291,7 @@ export default {
               }
             ])
           },
-          data: t.data.map(v => [Number(v[0]) * 1000, Number(v[1]), 'number']),
+          data: t.data.map(v => [Number(v[0]) * 1000, Number(v[1]), 'number'])
         }
       })
       this.chartOption.tooltip.formatter = (params) => {
diff --git a/src/views/charts2/charts/npm/NpmLine.vue b/src/views/charts2/charts/npm/NpmLine.vue
index 6bfe1106..8b3310c3 100644
--- a/src/views/charts2/charts/npm/NpmLine.vue
+++ b/src/views/charts2/charts/npm/NpmLine.vue
@@ -47,7 +47,7 @@ import { get } from '@/utils/http'
 import { api } from '@/utils/api'
 import ChartNoData from '@/views/charts/charts/ChartNoData'
 import chartMixin from '@/views/charts2/chart-mixin'
-import { chartColor3 } from '@/utils/constants'
+import unitConvert from '@/utils/unit-convert'
 
 export default {
   name: 'NpmLine',
@@ -178,6 +178,14 @@ export default {
             data: t.values.map((v) => [Number(v[0]) * 1000, Number(v[1]), type])
           }
         })
+        this.chartOption.yAxis[0].axisLabel.formatter = (value) => {
+          if (type === 'percent') {
+            console.log(type)
+            return unitConvert(value, type)[0]
+          } else {
+            return unitConvert(value, 'number').join('')
+          }
+        }
         this.chartOption.tooltip.formatter = (params) => {
           params.forEach(t => {
             t.seriesName = this.$t(t.seriesName)
diff --git a/src/views/charts2/charts/npm/NpmTrafficLine.vue b/src/views/charts2/charts/npm/NpmTrafficLine.vue
index 92215357..cb62caf5 100644
--- a/src/views/charts2/charts/npm/NpmTrafficLine.vue
+++ b/src/views/charts2/charts/npm/NpmTrafficLine.vue
@@ -286,6 +286,15 @@ export default {
       this.chartOption = trafficLineChartOption
       const chartOption = this.chartOption.series[0]
       this.chartOption.series = echartsData.map((t, i) => {
+        this.chartOption.yAxis[0].axisLabel.formatter = (value) => {
+          if (t.unitType === 'percent') {
+            return unitConvert(value, t.unitType)[0]
+          } else if (t.unitType === 'time') {
+            return unitConvert(value, 'number').join('')
+          } else {
+            return unitConvert(value, t.unitType).join('')
+          }
+        }
         return {
           ...chartOption,
           name: this.$t(t.name),
diff --git a/src/views/charts2/charts/options/echartOption.js b/src/views/charts2/charts/options/echartOption.js
index 91bb2bd7..0eae09db 100644
--- a/src/views/charts2/charts/options/echartOption.js
+++ b/src/views/charts2/charts/options/echartOption.js
@@ -345,9 +345,9 @@ export const npmLineChartOption = {
         show: false
       },
       axisLabel: {
-        formatter: function (value) {
-          return unitConvert(value, unitTypes.number).join('')
-        }
+        // formatter: function (value) {
+        //   return unitConvert(value, unitTypes.number).join('')
+        // }
       }
     }
   ],
@@ -416,9 +416,9 @@ export const trafficLineChartOption = {
         show: false
       },
       axisLabel: {
-        formatter: function (value) {
-          return unitConvert(value, unitTypes.number).join('')
-        }
+        // formatter: function (value) {
+        //   return unitConvert(value, unitTypes.number).join('')
+        // }
       }
     }
   ],