From 36006b0ec7e60d434bbcaca82207ae1b465185ab Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 7 Dec 2020 16:41:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9overView=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=98=BE=E7=A4=BA=E8=B6=85=E8=BF=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA+=E5=8F=B7=20=E5=90=91=E4=B8=8B=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0=E7=82=B91=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/dashboard/overview/overview2.scss    |  3 ++
 .../page/dashboard/overview/overview2.vue     | 36 +++++++++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
index 6fa129111..ef0e0a70b 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
@@ -595,4 +595,7 @@
     }
   }
 }
+.over-num{
+  margin-left: -11px;
+}
 
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
index c3c1b1583..d1350a677 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
@@ -27,7 +27,9 @@
             <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-project"></i></div>
             <div class="content-num-box">
               <div class="content-col-content-num">
-                <vue-countup :start-value="0" :end-value="(assetData ? assetData.totalStat.total  : '') | numberFormat" :decimals="(assetData ? assetData.totalStat.total  : 0) < 1000 ? 0 : 1"></vue-countup>
+                <vue-countup :duration="1" :start-value="0" :end-value="(assetData ? assetData.totalStat.total  : '') | numberFormat"
+                             :decimals="(assetData ? assetData.totalStat.total  : 0) < 1000 ? 0 : 1"></vue-countup>
+                <span v-if="(assetData ? assetData.totalStat.total  : 0) > 1000 " class="over-num">+</span>
                 <span class="overview-row-unit">{{(assetData ? assetData.totalStat.total  : '') | unitFormat}}</span>
               </div>
               <div class="content-col-content-title">{{$t("dashboard.overview.asset.title")}}</div>
@@ -39,7 +41,8 @@
             <div class="content-col-content-icon"><i class="nz-icon nz-icon-project"></i></div>
             <div class="content-num-box">
               <div class="content-col-content-num">
-                <vue-countup :start-value="0" :end-value="(projectData ? projectData.projectStat.length : '') | numberFormat" :decimals="(projectData ? projectData.projectStat.length : 0) < 1000 ? 0 : 1"></vue-countup>
+                <vue-countup :duration="1" :start-value="0" :end-value="(projectData ? projectData.projectStat.length : '') | numberFormat" :decimals="(projectData ? projectData.projectStat.length : 0) < 1000 ? 0 : 1"></vue-countup>
+                <span v-if="(projectData ? projectData.projectStat.length : 0) > 1000 " class="over-num">+</span>
                 <span class="overview-row-unit">{{(projectData ? projectData.projectStat.length  : '') | unitFormat}}</span>
               </div>
               <div class="content-col-content-title">{{$t("dashboard.overview.project.project")}}</div>
@@ -51,7 +54,8 @@
             <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-module"></i></div>
             <div class="content-num-box">
               <div class="content-col-content-num">
-                <vue-countup :start-value="0" :end-value="(moduleData ? moduleData.moduleStat.length : '') | numberFormat" :decimals="(moduleData ? moduleData.moduleStat.length : 0) < 1000 ? 0 : 1"></vue-countup>
+                <vue-countup :duration="1" :start-value="0" :end-value="(moduleData ? moduleData.moduleStat.length : '') | numberFormat" :decimals="(moduleData ? moduleData.moduleStat.length : 0) < 1000 ? 0 : 1"></vue-countup>
+                <span v-if="(moduleData ? moduleData.moduleStat.length : 0) > 1000 " class="over-num">+</span>
                 <span class="overview-row-unit">{{(moduleData ? moduleData.moduleStat.length  : '') | unitFormat}}</span>
               </div>
               <div class="content-col-content-title">{{$t("dashboard.overview.module.module")}}</div>
@@ -63,7 +67,8 @@
             <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-endpoint"></i></div>
             <div class="content-num-box">
               <div class="content-col-content-num">
-                <vue-countup :start-value="0" :end-value="(endpointData ? endpointData.total : '') | numberFormat" :decimals="(endpointData ? endpointData.total : 0) < 1000 ? 0 : 1"></vue-countup>
+                <vue-countup :duration="1" :start-value="0" :end-value="(endpointData ? endpointData.total : '') | numberFormat" :decimals="(endpointData ? endpointData.total : 0) < 1000 ? 0 : 1"></vue-countup>
+                <span v-if="(endpointData ? endpointData.total : 0) > 1000 " class="over-num">+</span>
                 <span class="overview-row-unit">{{(endpointData ? endpointData.total : '') | unitFormat}}</span>
               </div>
               <div class="content-col-content-title">{{$t("dashboard.overview.endpoint.endpoint")}}</div>
@@ -75,7 +80,8 @@
             <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-alert"></i></div>
             <div class="content-num-box">
               <div class="content-col-content-num">
-                <vue-countup :start-value="0" :end-value="(alertMessageData ? alertMessageData.alertMessageTotal : '') | numberFormat" :decimals="(alertMessageData ? alertMessageData.alertMessageTotal : 0) < 1000 ? 0 : 1"></vue-countup>
+                <vue-countup :duration="1" :start-value="0" :end-value="(alertMessageData ? alertMessageData.alertMessageTotal : '') | numberFormat" :decimals="(alertMessageData ? alertMessageData.alertMessageTotal : 0) < 1000 ? 0 : 1"></vue-countup>
+                <span v-if="(alertMessageData ? alertMessageData.alertMessageTotal : 0) > 1000 " class="over-num">+</span>
                 <span class="overview-row-unit">{{(alertMessageData ? alertMessageData.alertMessageTotal : '') | unitFormat}}</span>
               </div>
               <div class="content-col-content-title">{{$t("overall.alert")}}</div>
@@ -305,9 +311,25 @@
             if (num < 1000) {
               return num;
             } else if (num < 1000000) {
-              return (num/1000).toFixed(fixed);
+              num=num/1000;
+              num = num.toString();
+              let index = num.indexOf('.');
+              if (index !== -1) {
+                num = num.substring(0, fixed + index + 1);
+              } else {
+                num = num.substring(0);
+              }
+              return parseFloat(num).toFixed(fixed)
             } else if (num < 1000000000) {
-              return (num/1000000).toFixed(fixed);
+              num=num/1000000;
+              num = num.toString();
+              let index = num.indexOf('.');
+              if (index !== -1) {
+                num = num.substring(0, fixed + index + 1);
+              } else {
+                num = num.substring(0);
+              }
+              return parseFloat(num).toFixed(fixed)
             }
           } catch (err) {
             return 0;