diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 4c4b2e3d6..0bb9c53d0 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -1664,7 +1664,10 @@ console.log(index,row) }, valueMappingDel(index,row){ - console.log(index,row) + this.selection.pen.data.valueMapping.splice(index,1); + this.selection.pen.data.valueMapping.forEach((item,index)=>{ + item.level=index + }); }, inputFocus(e){ console.log(e.path[2].children[0],e.path[2].children[1]); diff --git a/nezha-fronted/src/components/common/project/L5/topoTooltip.vue b/nezha-fronted/src/components/common/project/L5/topoTooltip.vue index 152c9015a..11e193b28 100644 --- a/nezha-fronted/src/components/common/project/L5/topoTooltip.vue +++ b/nezha-fronted/src/components/common/project/L5/topoTooltip.vue @@ -1,18 +1,21 @@ @@ -31,9 +34,11 @@ import lineChartBlock from '../../../charts/line-chart-block'; import bus from "../../../../libs/bus"; import axios from 'axios'; + import ExpressionInfo from "../popData/expressionInfo"; export default { name:"topoTooltip", components:{ + ExpressionInfo, lineChartBlock, }, props:{ @@ -99,7 +104,6 @@ }; chartData.span=12; this.chartData=chartData; - console.log(chartData); setTimeout(()=>{ this.getChartData(chartData,0); }); @@ -107,7 +111,6 @@ }, // 获取一个图表具体数据,图表信息,图表位置index getChartData(chartInfo, pos, filterType) { - console.log(chartInfo,'chartInfo') const chartItem = chartInfo; const index = pos; // 指标 // 没有数据的设置提示信息暂无数据-针对每一个图 @@ -145,7 +148,6 @@ setTimeout(()=>{ this.$nextTick(() => { let res=chartItem.res; - console.log(res); if (res.length > 0) { let series = []; let singleStatRlt = ''; @@ -174,7 +176,6 @@ } } else { response.data.result.forEach((queryItem, resIndex) => { - console.log(queryItem, resIndex); let seriesItem = { theData: { name: '', @@ -311,7 +312,6 @@ } } }); - console.log(this.$refs['editChart' + chartItem.id],chartItem.id); if (this.$refs['editChart' + chartItem.id]) { let chartData = { chartItem: chartItem, @@ -340,8 +340,6 @@ this.$refs['editChart' + chartItem.id].setData(chartItem, series, this.filter.panelId, this.filter, legend, filterType, errorMsg); } else { - console.log(123123123123123123,chartItem, series, - this.filter.panelId, this.filter, legend, '', errorMsg); this.$refs['editChart' + chartItem.id].setData(chartItem, series, this.filter.panelId, this.filter, legend, '', errorMsg); } diff --git a/nezha-fronted/src/components/common/project/popData/expressionInfo.vue b/nezha-fronted/src/components/common/project/popData/expressionInfo.vue index 424ebda1e..5cad59166 100644 --- a/nezha-fronted/src/components/common/project/popData/expressionInfo.vue +++ b/nezha-fronted/src/components/common/project/popData/expressionInfo.vue @@ -1,31 +1,12 @@ @@ -34,86 +15,33 @@ export default { name:"expressionInfo", props:{ - lineId:{required:true}, - edgesArray:{}, - expressionsInfoPosition:{}, + chartData:{ + + } }, watch:{ - expressionsInfoPosition:{ - deep:true, - immediate: true, - handler(n){ - this.show=false; - this.expressionsInfoPosition=n; - this.$nextTick(()=>{ - this.show=true; - }) - } + chartData(){ + this.expressionInfoData=[]; } }, data(){ return{ - expressionsData:[], - show:true, - total:0, + expressionInfoData:[] } }, mounted(){ - let index=0; - let arr=this.edgesArray.find(item=>item.id===this.lineId).expressions; - if(arr.length===0){return}; - arr.forEach((item,i)=>{ - if(index<11){ - this.expressionsData.push({...item,value:[]}) - } - item.value=item.value || []; - item.value.forEach((item1,j)=>{ - index++; - if(index<11){ - this.expressionsData[i].value.push(item1) + console.log(this.chartData); + if(this.chartData.res.length>0){ + this.chartData.res.forEach((item,index)=>{ + if(item.status==='success'){ + this.expressionInfoData=this.expressionInfoData.concat(item.data.result); } - }) - }); - this.total=index; + }); + console.log(this.expressionInfoData); + } }, methods:{ - dataFormat(unit,value){ - if(value.value){ - value=value.value[1] - }else{ - value=value - } - return chartDataFormat.getUnit(unit?unit:2).compute(value) - }, - 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); - let reg=new RegExp(label+'=".+?"'); - let value=null; - if(reg.test(legend)){ - let find=legend.match(reg)[0]; - value=find.substr(find.indexOf('"')+1,find.lastIndexOf('"')-find.indexOf('"')-1); - } - return value?(' '+value + ' '):(' '+label + ' '); - }); - if(Object.keys(metric).length>0){ - let arr=labelValue.split(' '); - labelValue=''; - arr.forEach((item)=>{ - if(metric[item]){ - labelValue+=metric[item] + ' ' - }else{ - labelValue+=item + ' ' - } - }); - } - return labelValue - }else{ - return expression?expression:legend; - } - }, }, beforeDestroy(){ @@ -122,72 +50,5 @@ diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index f30ce14b2..ec21140cf 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -4,7 +4,7 @@