From 03da55120737ac2a491355e2f1564f79a348450b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 29 Sep 2020 15:48:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=BD=93?=
 =?UTF-8?q?=E5=88=BB=E5=BA=A6=E4=B8=BA=E7=99=BE=E5=88=86=E6=AF=94=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=20=E5=B0=8F=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/charts/chartDataFormat.js   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js
index be303573d..be1863a20 100644
--- a/nezha-fronted/src/components/charts/chartDataFormat.js
+++ b/nezha-fronted/src/components/charts/chartDataFormat.js
@@ -326,16 +326,18 @@ function asciiCompute(num,ascii,units,dot=2){
   if(!num && num!==0 && num!=='0'){
     return ''
   }
-  num=Number(num)
+  num=Number(num);
   let carry=0;
   if(num > 1){
-    let log=Math.log(num)/Math.log(ascii)
+    let log=Math.log(num)/Math.log(ascii);
     carry = parseInt(log)
     num = num / Math.pow(ascii,carry)
   }
   if(Number.isInteger(num)){
+    console.log(num +' '+units[carry],dot);
     return num +' '+units[carry];
   }else{
+    console.log(num.toFixed(dot) +' '+units[carry],dot);
     return num.toFixed(dot) +' '+units[carry];
   }
 }
@@ -655,7 +657,7 @@ export default {
         //console.log(value);
       }
       //console.log( Math.floor(value+1)/Math.pow(10,pow));
-      return Math.floor(value+1)/Math.pow(10,pow);
+      return Math.ceil(value+1)/Math.pow(10,pow);
     }
     if(type ==='Time'){
         return value
@@ -721,6 +723,13 @@ export default {
     }
   },
   Interval:function(value,copies,type,interValType){
+    if(interValType==='max'&&value<1){
+      if(value<1){
+        value=1;
+      }
+      return value?value:1;
+    }
+    
     if(value<1024&&type==='Data'){
       let interVal=value/copies;
       return interVal
@@ -755,9 +764,6 @@ export default {
       interVal = interVal || 1;
       return interVal
     }
-    if(interValType==='max'){
-      return value?value:1;
-    }
     return 1;
     // let interVal=value/copies;
     // interVal = interVal || 1;