diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index 0cf711c52..bd86aabab 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -926,13 +926,9 @@ export default { host = chartItem.elements[innerPos].expression; } //处理legend别名 - let alias=this.$refs['editChart'+chartItem.id][0].dealLegendAlias(host,chartItem.elements[innerPos].legend); if(!alias || alias===''){ - alias = chartItem.elements[innerPos].expression; - } - if(alias){ - host = alias; + alias = host; } legend.push({name:host+resIndex,alias:alias}); // 图表中每条线的名字,去掉最后的逗号与空格:metric名称, 标签1=a,标签2=c diff --git a/nezha-fronted/src/components/charts/chart-single-stat.vue b/nezha-fronted/src/components/charts/chart-single-stat.vue index 6322c9bea..a134b74ba 100644 --- a/nezha-fronted/src/components/charts/chart-single-stat.vue +++ b/nezha-fronted/src/components/charts/chart-single-stat.vue @@ -393,7 +393,7 @@ export default { this.data = chartItem; this.unit = chartDataFormat.getUnit(this.data.unit); if(Number(seriesItem)){ - let singleStatTmp =Number(seriesItem).toFixed(2); + let singleStatTmp =parseFloat(Number(seriesItem).toFixed(2)); this.serieSingleStat = chartDataFormat.getUnit(chartItem.unit?chartItem.unit:2).compute(singleStatTmp,null,2); }else { this.serieSingleStat =seriesItem; @@ -420,7 +420,7 @@ export default { this.data = chartItem; this.unit = chartDataFormat.getUnit(this.data.unit); if(Number(seriesItem)){ - let singleStatTmp =Number(seriesItem).toFixed(2); + let singleStatTmp =parseFloat(Number(seriesItem).toFixed(2));//parseFloat :如果没有小数点,或者小数点后都是零,parseFloat() 会返回整数。 this.serieSingleStat = chartDataFormat.getUnit(chartItem.unit?chartItem.unit:2).compute(singleStatTmp,null,2); }else { this.serieSingleStat =seriesItem; diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue index 19b7b53f9..cbe95bb0f 100644 --- a/nezha-fronted/src/components/charts/chartPreview.vue +++ b/nezha-fronted/src/components/charts/chartPreview.vue @@ -427,10 +427,7 @@ //处理legend别名 let alias = this.dealLegendAlias(host, chartItem.elements[innerPos].legend); if (!alias || alias === '') { - alias = chartItem.elements[innerPos].expression; - } - if (alias) { - host = alias; + alias = host; } legend.push({name: host + resInnerPos, alias: alias}); // 图表中每条线的名字,去掉最后的逗号与空格:metric名称, 标签1=a,标签2=c @@ -1136,10 +1133,7 @@ } let alias=this.dealLegendAlias(host,this.chart.elements[pos].legend); if(!alias || alias===''){ - alias = this.chart.elements[pos].expression; - } - if(alias){ - host = alias; + alias = host; } legend.push({name:host+innerPos,alias:alias}); // 图表中每条线的名字,去掉最后的逗号与空格:metric名称, 标签1=a,标签2=c diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 5fe095864..aca7c4316 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -1400,10 +1400,7 @@ } let alias=this.dealLegendAlias(host,this.data.elements[pos].legend); if(!alias || alias===''){ - alias = this.data.elements[pos].expression; - } - if(alias){ - host = alias; + alias = host; } legend.push({name:host+innerPos,alias:alias}); // 图表中每条线的名字,去掉最后的逗号与空格:metric名称, 标签1=a,标签2=c