diff --git a/nezha-fronted/src/components/charts/line-chart-block.scss b/nezha-fronted/src/components/charts/line-chart-block.scss index 734ab71d8..14f6e674c 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.scss +++ b/nezha-fronted/src/components/charts/line-chart-block.scss @@ -26,6 +26,8 @@ font-size:12px; text-align:left; margin:0 auto; + line-height: 18px; + font-family: Roboto,Helvetica Neue,Arial,sans-serif; } .legend-item{ text-overflow:ellipsis; diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 6c17080fe..26955d95d 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -323,7 +323,7 @@ export default { trigger: 'axis', confine:true, formatter:function(params){ - let str = `
`; + let str = `
`; params.forEach((item, i) => { if(i===0){ let t_date = new Date(item.data[0]); @@ -332,8 +332,45 @@ export default { } str +=`
`; let val = parseFloat(Number(item.data[1]).toFixed(2)); - str +=` ${item.seriesName}:`; - str +=val; + if(val===0){ + val = Number(item.data[1]); + } + let itemNameList = ["instance","module","project","job","dc","asset"]; + //let seriesNameTmp = this.filterItem(item.seriesName,itemNameList); + let seriesNameTmp = item.seriesName; + itemNameList.forEach((itemName, i) => { + 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("{}",""); + } + /* + if(chartInfo.elements[serIndex].type==='normal'){ + str +=` `; + str +=seriesNameTmp+":"+val; + }else if(chartInfo.elements[serIndex].type==='expert'){ + str +=`${item.seriesName} `; + str +=val; + } + */ + str +=` `; + str +=seriesNameTmp+":"+val; }); str +=`
`; return str; @@ -473,8 +510,14 @@ export default { return `${parseFloat(mbNum.toFixed(2))}M`; } return `${parseFloat(kbNum.toFixed(2))}K`; + }else { + let rlt = parseFloat(num.toFixed(2)); + if(rlt===0){ + return num; + }else { + return rlt; + } } - return parseFloat(num.toFixed(2)); }, }, //boundaryGap:[0,0.2]