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

feat：保持project页面的 echart和panel一样

Browse Source
This commit is contained in:
zhangyu
2020-09-23 10:19:55 +08:00
parent 194a594254
commit a33e6d9ab7
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
nezha-fronted/src/components/common/project/popData/lineChart.vue
View File

@@ -445,13 +445,13 @@
let stackIconChooseBorderColor = (chartInfo.type==='stackArea'?'#7e7e7e':'#53a3cb'); let stackIconChooseBorderColor = (chartInfo.type==='stackArea'?'#7e7e7e':'#53a3cb');
let maxValue=0; let maxValue=0;
let minValue=0; let minValue=0;
if(chartInfo.type==='line' && chartInfo.unit &&dataArg.length>0){ if(chartInfo.unit &&dataArg.length>0){
maxValue=dataArg[0].data[0][1]; maxValue=dataArg[0].data[0][1];
minValue=dataArg[0].data[0][1]; minValue=dataArg[0].data[0][1];
for(let j = 0; j < dataArg.length ; j++){ for(let j = 0; j < dataArg.length ; j++){
for (let i = 0; i < dataArg[j].data.length - 1; i++) { for (let i = 0; i < dataArg[j].data.length - 1; i++) {
maxValue = (maxValue < dataArg[j].data[i+1][1] ? dataArg[j].data[i+1][1] : maxValue); maxValue = (maxValue < Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : maxValue);
minValue = (minValue > dataArg[j].data[i+1][1] ? dataArg[j].data[i+1][1] : minValue); minValue = (minValue > Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : minValue);
} }
} }
} }
@@ -460,7 +460,6 @@
maxValue=chartDataFormat.formatDatas(maxValue,unit.type,'ceil',unit.ascii); maxValue=chartDataFormat.formatDatas(maxValue,unit.type,'ceil',unit.ascii);
minValue=chartDataFormat.formatDatas(minValue,unit.type,'floor',unit.ascii); minValue=chartDataFormat.formatDatas(minValue,unit.type,'floor',unit.ascii);
let oldValue=maxValue; let oldValue=maxValue;
console.log(maxValue,'123123');
let dot=0; let dot=0;
if(maxValue==1){ if(maxValue==1){
dot++; dot++;
@@ -477,8 +476,7 @@
maxValue=Math.ceil(oldValue)/Math.pow(10,dot); maxValue=Math.ceil(oldValue)/Math.pow(10,dot);
dot++; dot++;
} }
let copies=chartDataFormat.copies(oldValue); let copies=chartDataFormat.copies(oldValue,unit.type);
console.log(oldValue,copies,maxValue);
let oldDot=2; let oldDot=2;
if(maxValue<=1){ if(maxValue<=1){
oldDot=dot>6?6:dot; oldDot=dot>6?6:dot;
@@ -559,8 +557,16 @@
} }
return [x,y]; return [x,y];
}else {//preview page }else {//preview page
x = pointX - boxWidth; if(pointX<(viewWidth/2)){//说明鼠标在左边放不下提示框
y = pointY+10; x=pointX+10;
}else{
x = pointX - boxWidth;
}
if(pointY<(viewHeight/2)){//说明鼠标上面放不下提示框
y = pointY+10;
}else {
y = pointY-boxHeight;
}
return [x,y]; return [x,y];
} }
}else { }else {
@@ -745,7 +751,8 @@
axisLine:{ axisLine:{
show:false show:false
}, },
minInterval: chartDataFormat.Interval(maxValue,copies,unit.type), minInterval: chartDataFormat.Interval(maxValue,copies,unit.type,'min'),
maxInterval: chartDataFormat.Interval(maxValue,copies,unit.type,'max'),
axisTick: { axisTick: {
show: false, show: false,
}, },