From d36d5096e1b102d6cb355ba4727b4935cf38257d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 16 Oct 2020 17:02:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=B2=BE=E5=BA=A6=E7=9A=84Y=E8=BD=B4=E8=A1=A8?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chartDataFormat.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js
index 3592fb71e..c1e41c3f2 100644
--- a/nezha-fronted/src/components/charts/chartDataFormat.js
+++ b/nezha-fronted/src/components/charts/chartDataFormat.js
@@ -372,9 +372,6 @@ function asciiCompute2(num,ascii,units,dot=2,unitIndex=0){
 * unit:设置的单位
 * */
 function timeCompute(value,unit,dot=0){
-  if(Number.isInteger(value)) {
-    dot=0;
-  }
   if(unit == 'year'){
     return `${value.toFixed(dot)} ${unit}`;
   }
@@ -394,10 +391,16 @@ function timeCompute(value,unit,dot=0){
     if(u.unit == unit){ //找到最小单位
       let result = (time,minUnit)=>{
         if(minUnit.unit == 'year'){
+          if(Number.isInteger(time)) {
+            dot=0;
+          }
           return `${time.toFixed(dot)} ${minUnit.unit}`
         }
         let quotient = time / minUnit.ascii;
         if(quotient < 1){
+          if(Number.isInteger(time)) {
+            dot=0;
+          }
           return `${Number(time).toFixed(dot)} ${minUnit.unit}`;
         }else{
           minUnit = units[++i];