From 04bc60df2bca5deffc847795ed9a0cb8ccd91eb7 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 20 May 2021 17:21:38 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-645=20feat:=20overview=E5=8F=B3=E4=B8=8B?=
 =?UTF-8?q?=E5=9B=BE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/en.js |  1 +
 .../components/page/dashboard/overview/chart.vue   |  2 +-
 .../page/dashboard/overview/overview.vue           | 14 +++++++-------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 31286586a..7aaa32002 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -433,6 +433,7 @@ const en = {
       asset: {
         title: 'Asset',
         assetType: 'Asset type',
+        assetState: 'Asset state',
         modelStat: 'Model',
         dcStat: 'Data center',
         num: 'Num',
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
index a5538c7b7..efaabe119 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
@@ -111,7 +111,7 @@ export default {
           const type = legendData.find(item => {
             return item[0] == name
           })
-          return type ? `${name} (${type[1]}%)` : null
+          return type ? `${name} (${type[1]})` : null
         }
         this.$set(this.option, 'legend', legend)
       }
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview.vue b/nezha-fronted/src/components/page/dashboard/overview/overview.vue
index 2275226f7..a73750f59 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview.vue
@@ -137,10 +137,10 @@
         <!--第一个图-->
         <div class="content-col-box">
           <div class="content-col-title">
-            <span>{{$t("dashboard.overview.asset.assetType")}}</span>
+            <span>{{$t("dashboard.overview.asset.assetState")}}</span>
           </div>
           <div class="content-col-content">
-            <chart-box ref="assetTypePie" :show-toolbox="false" :tooltip-formatter="assetTypeFormatter" chart-type="pie" name="assetTypePie" @is-loading="(isLoading)=>{this.assetTypeLoading = isLoading}"></chart-box>
+            <chart-box ref="assetTypePie" :show-toolbox="false" :tooltip-formatter="assetStateFormatter" chart-type="pie" name="assetTypePie" @is-loading="(isLoading)=>{this.assetTypeLoading = isLoading}"></chart-box>
             <div v-if="!assetTypeLoading && (!assetTypeData || assetTypeData.length === 0)" class="chart-no-data">No Data</div>
           </div>
         </div>
@@ -461,7 +461,7 @@ export default {
     queryAssetTypeData () {
       return new Promise(resolve => {
         this.assetTypeLoading = true
-        this.$get('stat/asset/type').then(response => {
+        this.$get('stat/asset/state').then(response => {
           this.assetTypeLoading = false
           if (response.code === 200) {
             this.assetTypeData = response.data.list
@@ -470,15 +470,15 @@ export default {
             const typeSeriesData = []
 
             const vm = this
-            const assetTotalCount = (function () {
+            /* const assetTotalCount = (function () {
               let count = 0
               vm.assetTypeData.forEach(item => {
                 count += item.num
               })
               return count
-            }())
+            }()) */
             this.assetTypeData.forEach(item => {
-              legendData.push([item.name, (item.num * 100 / assetTotalCount).toFixed(2)])
+              legendData.push([item.name, item.num])
               typeSeriesData.push({ name: item.name, value: item.num })
             })
             const series = [{
@@ -1045,7 +1045,7 @@ export default {
     simpleFormatter (params) {
       return `<div class="tooltip" style="min-width: unset;">${params.value}</div>`
     },
-    assetTypeFormatter (params) {
+    assetStateFormatter (params) {
       return `<div class="tooltip" style="min-width: unset;">${params.name}:&nbsp;${params.value}</div>`
     },
     switchFullScreen () {