diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 3fa4da779..4cffdcf91 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -500,7 +500,9 @@ }, formatter:function(params){ //display:inline-block;white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis; - let str = `
`; + let str = `
`; + + //let str = `
`; params.forEach((item, i) => { let tip=legend.find((element)=>{ return element.name == item.seriesName; @@ -509,49 +511,28 @@ let t_date = new Date(item.data[0]); str += [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + " " + [t_date.getHours(), t_date.getMinutes(),t_date.getSeconds()].join(':'); + str +=`
`; } - str +=`
`; let val = parseFloat(Number(item.data[1]).toFixed(2)); if(val===0){ val = Number(item.data[1]); } - /* - let itemNameList = ["instance","module","project","job","dc","asset"]; - let seriesNameTmp = item.seriesName; - itemNameList.forEach((itemName) => { - let insIndex = seriesNameTmp.indexOf(itemName+"="); - if(insIndex>-1){//{dd=""22,instance="aa",job="nn"},如果最后只有{},则去掉{} - let start = seriesNameTmp.substring(0,insIndex); - let endTmp = seriesNameTmp.substring(insIndex+itemName.length+1,seriesNameTmp.length); - let sepInd = endTmp.indexOf(','); - let end = ""; - if(sepInd>-1){ - end = endTmp.substring(sepInd+1,endTmp.length); - }else { - sepInd = endTmp.indexOf('"',1); - end = endTmp.substring(sepInd+1,endTmp.length); - } - seriesNameTmp = start+end; - } - }); - if(seriesNameTmp.indexOf(",}")>-1){ - seriesNameTmp = seriesNameTmp.replace(",}","}"); - } - if(seriesNameTmp.indexOf("{}")>-1){ - seriesNameTmp = seriesNameTmp.replace("{}",""); - } - str +=` `; - str +=seriesNameTmp+":"+val; - */ - str += `
`; + str += `
`; + str += `
${tip?(tip.alias?tip.alias:tip.name):item.seriesName}:
`; + str += `
`; + str += chartDataFormat.getUnit(chartInfo.unit?chartInfo.unit:2).compute(val,null,2); + str += `
`; + str += `
`; + /*str += `
`; str +=`${tip?(tip.alias?tip.alias:tip.name):item.seriesName}: `; - str +=`
`; + str +=`
`;*/ // str +=`
`; - str += `
`; + /*str += `
`; str +=chartDataFormat.getUnit(chartInfo.unit?chartInfo.unit:2).compute(val,null,2); - str +=`
`; + str +=`
`;*/ }); str +=`
`; + console.info(str) return str; // return `
${params[0].seriesName}:${params[0].data[1]}
`; },