From 5e35ef7a397becdacd014da58393b67e3432f17d Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 21 May 2021 13:58:31 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-654=20fix:=20overview-asset=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0=E6=8E=A5=E5=8F=A3=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/config/system/notifyMethodTable.vue   |  2 +-
 .../page/dashboard/overview/overview.vue       | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue b/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
index 194d6c2c2..080577681 100644
--- a/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
+++ b/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
@@ -75,7 +75,7 @@
             <button type="button" class="nz-btn nz-btn-size-mini-new nz-btn-style-light-new" @click="cancel(scope.row)" :disabled="prevent_opt.save"><span>{{$t('overall.cancel')}}</span></button>
           </template>
           <template v-else>
-            <button class="table-operation-item" :class="{'table-operation-item-disable':isBuiltIn(scope.row)}" :disabled="isBuiltIn(scope.row)" @click="toEdit(scope.row)"><i class="nz-icon nz-icon-edit"></i></button>
+            <button :class="{'table-operation-item--disable':isBuiltIn(scope.row)}" :disabled="isBuiltIn(scope.row)" class="table-operation-item" @click="toEdit(scope.row)"><i class="nz-icon nz-icon-edit"></i></button>
             <el-dropdown size="medium" trigger="hover" @command="tableOperation">
               <div class="table-operation-item table-operation-item--more">
                 <span>…</span><i class="nz-icon nz-icon-arrow-down"></i>
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview.vue b/nezha-fronted/src/components/page/dashboard/overview/overview.vue
index a73750f59..2179e2cb2 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview.vue
@@ -26,12 +26,12 @@
           <div id="overview-to-asset" v-loading="assetLoading" class="content-col-content clickable" @click="jumpTo('asset')">
             <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-project"></i></div>
             <div class="content-num-box">
-              <el-tooltip :content="`${assetData.length}`" class="item" effect="light" placement="top">
+              <el-tooltip :content="`${assetData}`" class="item" effect="light" placement="top">
                 <div class="content-col-content-num">
-                  <vue-count-up :decimals="assetData.length < 1000 ? 0 : 1" :duration="1" :end-value="assetData.length | numberFormat"
+                  <vue-count-up :decimals="assetData < 1000 ? 0 : 1" :duration="1" :end-value="assetData | numberFormat"
                                :start-value="0"></vue-count-up>
-                  <span class="overview-row-unit">{{assetData.length| unitFormat}}</span>
-                  <span v-if="assetData.length > 1000 " class="over-num">+</span>
+                  <span class="overview-row-unit">{{assetData | unitFormat}}</span>
+                  <span v-if="assetData > 1000 " class="over-num">+</span>
                 </div>
               </el-tooltip>
               <div class="content-col-content-title">{{$t("dashboard.overview.asset.title")}}</div>
@@ -211,6 +211,7 @@ export default {
       // data
       assetLoading: false,
       assetData: [], // asset总数
+      assetAlertData: [],
       assetTypeLoading: false, // 第三行第一个图
       assetTypeData: [],
       assetStateData: [],
@@ -432,12 +433,17 @@ export default {
       return new Promise(resolve => {
         this.assetLoading = true
         this.$refs.assetHexagon.startLoading()
+        this.$get('stat/asset/total').then(response => {
+          if (response.code === 200) {
+            this.assetData = response.data.num
+          }
+        })
         this.$get('stat/alertMessage/topN', { size: 48, dimension: 'asset' }).then(response => {
           this.assetLoading = false
           this.$refs.assetHexagon.endLoading()
           if (response.code === 200) {
-            this.assetData = response.data.list.sort((a, b) => b.alertNum - a.alertNum)
-            const alertTopAssets = this.assetData.slice(0, 48)
+            this.assetAlertData = response.data.list.sort((a, b) => b.alertNum - a.alertNum)
+            const alertTopAssets = this.assetAlertData.slice(0, 48)
             const requests = alertTopAssets.map(a => axios.get(`stat/alertMessage/severity?assetId=${a.id}`))
             const assetStateData = []
             axios.all(requests).then(result => {