`;
+ let str = `
`;
params.forEach((item, i) => {
let tip=temp.legend.find((element)=>{
return element.name == item.seriesName;
@@ -621,13 +610,12 @@
if(val===0){
val = Number(item.data[1]);
}
- str += `
`;
-
- str +=`${temp.hideSameLabels&& tip.alias?tip.alias:tip.name}: `;
- str +=`
`;
- str += `
`;
- str +=val;
- str +=`
`;
+ str += `
`;
+ str += `
${tip?(tip.alias?tip.alias:tip.name):item.seriesName}:
`;
+ str += `
`;
+ str += chartDataFormat.short(val,null,2);
+ str += `
`;
+ str += `
`;
});
str +=`
`;
return str;
@@ -726,29 +714,7 @@
},
axisLabel: {
formatter: function(num,index) {
- if (num >= 1000) {
- const kbNum = num / 1000;
- if (kbNum >= 1000) {
- const mbNum = kbNum / 1000;
- if (mbNum > 1000) {
- const gbNum = mbNum / 1000;
- /*
- if (gbNum > 1000) {
- const tbNum = gbNum / 1000;
- if (tbNum > 1000) {
- const pbNum = tbNum / 1000;
- return `${pbNum.toFixed(2)}PB`;
- }
- return `${tbNum.toFixed(2)}TB`;
- }*/
- return `${parseFloat(gbNum.toFixed(2))}B`;
- }
- return `${parseFloat(mbNum.toFixed(2))}M`;
- }
- return `${parseFloat(kbNum.toFixed(2))}K`;
- }
- // return parseFloat(num.toFixed(2));
- return num;
+ return chartDataFormat.short(num,index)
},
},
},
@@ -1968,7 +1934,7 @@
left: 25px;
}
.control-icon-unchecked{
- color: #e5e5e5;
+ color: #d1d1d1;
}
.control-icon-checked{
color:#666;