diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js index ac31b5646..eab4d8bcc 100644 --- a/nezha-fronted/src/components/charts/chartDataFormat.js +++ b/nezha-fronted/src/components/charts/chartDataFormat.js @@ -643,9 +643,9 @@ export default { if(type==='Data'){ if(value>1){ - while(value>1000){ + while(value>1024){ pow++; - value=value/1000 + value=value/1024 } if(flow==='ceil'){ @@ -701,8 +701,39 @@ export default { } }, Interval:function(value,copies,type){ - if(type==='Data' || type==='DataRate' || type==='Misc'){ + console.log(value,'Interval'); + if(value<1024&&type==='Data'){ let interVal=value/copies; + return interVal + } + if(value<1000&&(type==='DataRate' || type==='Misc')){ + let interVal=value/copies; + return interVal + } + if(type==='Data'){ + let interVal=value/copies; + let pow=0; + if(interVal){ + while(interVal>1024){ + pow++; + interVal=interVal/1024; + } + interVal=Math.ceil(interVal)*Math.pow(1024,pow); + } + interVal = interVal || 1; + console.log(interVal); + return interVal + } + if(type==='DataRate' || type==='Misc'){ + let interVal=value/copies; + let pow=0; + if(interVal){ + while(interVal>1000){ + pow++; + interVal=interVal/1000; + } + interVal=Math.ceil(interVal)*Math.pow(1000,pow); + } interVal = interVal || 1; console.log(interVal); return interVal diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 3e2b681ed..7bd1e2cd7 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -511,7 +511,6 @@ maxValue=chartDataFormat.formatDatas(maxValue,unit.type,'ceil',unit.ascii); minValue=chartDataFormat.formatDatas(minValue,unit.type,'floor',unit.ascii); let oldValue=maxValue; - console.log(maxValue,'123123'); let dot=0; if(maxValue==1){ dot++; @@ -528,13 +527,13 @@ maxValue=Math.ceil(oldValue)/Math.pow(10,dot); dot++; } - let copies=chartDataFormat.copies(oldValue); + let copies=chartDataFormat.copies(oldValue,unit.type); console.log(oldValue,copies,maxValue); let oldDot=2; if(maxValue<=1){ oldDot=dot>6?6:dot; } - // console.log(unit.compute(maxValue),unit.compute(minValue)); + console.log(maxValue,copies,'123123'); var option = { title:{ show:false, @@ -754,6 +753,7 @@ show:false }, minInterval: chartDataFormat.Interval(maxValue,copies,unit.type), + maxInterval: chartDataFormat.Interval(maxValue,copies,unit.type), axisTick: { show: false, },