diff --git a/nezha-fronted/src/components/common/project/popData/expressionInfo.vue b/nezha-fronted/src/components/common/project/popData/expressionInfo.vue index bf9ac1636..0d0fed15b 100644 --- a/nezha-fronted/src/components/common/project/popData/expressionInfo.vue +++ b/nezha-fronted/src/components/common/project/popData/expressionInfo.vue @@ -5,11 +5,11 @@
{{$t('dashboard.panel.moreTitleOther')}}{{$t('dashboard.panel.showAllOther')}} {{ total}}
-
+
{{item.name}}
-
- {{legendFormat(item.metric,item.legend)}} : +
+ {{legendFormat(item.metric,item.legend,item1.metric)}} : {{ dataFormat(item.unit,item1.value[1])}}
@@ -56,7 +56,6 @@ let index=0; let arr=this.edgesArray.find(item=>item.id===this.lineId).expressions; if(arr.length===0){return}; - console.log(arr); arr.forEach((item,i)=>{ if(index<11){ this.expressionsData.push({...item,value:[]}) @@ -65,19 +64,17 @@ item.value.forEach((item1,j)=>{ index++; if(index<11){ - console.log(); this.expressionsData[i].value.push(item1) } }) }); this.total=index; - console.log(this.expressionsData); }, methods:{ dataFormat(unit,value){ return chartDataFormat.getUnit(unit?unit:2).compute(value) }, - legendFormat:function(legend,expression){ + legendFormat:function(legend,expression,metric){ if(/\{\{.+\}\}/.test(expression)&&expression){ let labelValue=expression.replace(/(\{\{.+?\}\})/g,function(i){ let label=i.substr(i.indexOf('{{')+2,i.indexOf('}}')-i.indexOf('{{')-2); @@ -89,6 +86,9 @@ } return value?value:label; }); + if(Object.keys(metric).length>0){ + labelValue=metric[labelValue] + } return labelValue }else{ return expression?expression:legend;