diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js index d8cbbc443..ac31b5646 100644 --- a/nezha-fronted/src/components/charts/chartDataFormat.js +++ b/nezha-fronted/src/components/charts/chartDataFormat.js @@ -638,27 +638,10 @@ export default { formatDatas:function(value,type,flow='ceil',ascii){ let pow=0; if(type ==='Time'){ - if(value>1 && ascii!==1){ - while(value>ascii){ - pow++; - value=value/ascii - } - - if(flow==='ceil'){ - let length=JSON.stringify(Math.ceil(value)).length; - value=value/Math.pow(10,length-1); - return Math.ceil(value)*Math.pow(ascii,pow)*Math.pow(10,length-1); - }else if(flow==='floor'){ - let length=JSON.stringify(Math.floor(value)).length; - value=value/Math.pow(10,length-1); - return Math.floor(value)*Math.pow(ascii,pow)*Math.pow(10,length-1); - } - }else{ return value - } } - if(type==='Data' || type==='DataRate'){ + if(type==='Data'){ if(value>1){ while(value>1000){ pow++; @@ -679,7 +662,7 @@ export default { } } - if(type==='Misc'){ + if(type==='Misc' || type==='DataRate'){ if(value>1){ while(value>1000){ pow++; @@ -718,16 +701,16 @@ export default { } }, Interval:function(value,copies,type){ - // if(type==='Data' || type==='DataRate' || type==='Misc'){ - // let interVal=value/copies; - // interVal = interVal || 1; - // console.log(interVal); - // return interVal - // } - // return 1; - let interVal=value/copies; - interVal = interVal || 1; - console.log(interVal); - return interVal + if(type==='Data' || type==='DataRate' || type==='Misc'){ + let interVal=value/copies; + interVal = interVal || 1; + console.log(interVal); + return interVal + } + return 1; + // let interVal=value/copies; + // 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 e27c5b3bf..3e2b681ed 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -765,6 +765,11 @@ let chartUnit=chartInfo.unit; chartUnit=chartUnit?chartUnit:2; let unit=chartDataFormat.getUnit(chartUnit); + console.log(unit); + let flag=JSON.stringify(value).length>JSON.stringify(chartDataFormat.Interval(maxValue,copies,unit.type)).length; + if(dot===0&&flag){ + dot=1; + } return unit.compute(value,index,-1,dot); }, },