gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：关于单位是时间的 暂不处理

Browse Source
This commit is contained in:
zhangyu
2020-09-22 14:18:42 +08:00
parent 0748c799b8
commit 266c57ecc7
2 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
nezha-fronted/src/components/charts/chartDataFormat.js
View File

@@ -638,27 +638,10 @@ export default {
formatDatas:function(value,type,flow='ceil',ascii){ formatDatas:function(value,type,flow='ceil',ascii){
let pow=0; let pow=0;
if(type ==='Time'){ 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 return value
} }
}
if(type==='Data' || type==='DataRate'){ if(type==='Data'){
if(value>1){ if(value>1){
while(value>1000){ while(value>1000){
pow++; pow++;
@@ -679,7 +662,7 @@ export default {
} }
} }
if(type==='Misc'){ if(type==='Misc' || type==='DataRate'){
if(value>1){ if(value>1){
while(value>1000){ while(value>1000){
pow++; pow++;
@@ -718,16 +701,16 @@ export default {
} }
}, },
Interval:function(value,copies,type){ Interval:function(value,copies,type){
// if(type==='Data' || type==='DataRate' || type==='Misc'){ 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; let interVal=value/copies;
interVal = interVal || 1; interVal = interVal || 1;
console.log(interVal); console.log(interVal);
return interVal return interVal
} }
return 1;
// let interVal=value/copies;
// interVal = interVal || 1;
// console.log(interVal);
// return interVal
}
} }

5
nezha-fronted/src/components/charts/line-chart-block.vue
View File

@@ -765,6 +765,11 @@
let chartUnit=chartInfo.unit; let chartUnit=chartInfo.unit;
chartUnit=chartUnit?chartUnit:2; chartUnit=chartUnit?chartUnit:2;
let unit=chartDataFormat.getUnit(chartUnit); 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); return unit.compute(value,index,-1,dot);
}, },
}, },