gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改 保存时 expressionsValue不保存 以及添加连线的判断条件

Browse Source
This commit is contained in:
zhangyu
2020-09-15 18:29:45 +08:00
parent 8668f12c5e
commit b50de59ce7
4 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nezha-fronted/src/components/common/project/addLine.vue
View File

@@ -361,7 +361,8 @@
// model.label=this.form.lineName; // model.label=this.form.lineName;
model.name=this.form.lineName; model.name=this.form.lineName;
model.width = parseInt(model.width) || 4; model.width = parseInt(model.width) || 4;
if(this.form.type==='dynamic'){ console.log(this.form.type);
if(!this.form.type){
model.smooth={ model.smooth={
enabled:false, enabled:false,
}; };

33
nezha-fronted/src/components/common/project/popData/expressionInfo.vue
View File

@@ -1,15 +1,14 @@
<template> <template>
<div class="expressionInfo" :style="{top:expressionsInfoPosition.y+'px',left:expressionsInfoPosition.x+'px'}" v-if="expressionsData.length"> <div class="expressionInfo" :style="{top:expressionsInfoPosition.y+'px',left:expressionsInfoPosition.x+'px'}" v-if="expressionsData.length">
<el-tooltip v-model="show" class="item" effect="light" content="Right Bottom 提示文字" placement="right-start" > <el-tooltip v-model="show" class="item" effect="light" content="Right Bottom 提示文字" placement="right-start" >
<div slot="content"> <div slot="content" style="padding: 5px;min-width: 150px;max-width: 260px">
<div v-if="total>10"> <div v-if="total>10" class="more-title-other">
{{$t('dashboard.panel.moreTitleOther')}}{{$t('dashboard.panel.showAllOther')}}{{total}} {{$t('dashboard.panel.moreTitleOther')}}{{$t('dashboard.panel.showAllOther')}} {{ total}}
</div> </div>
<div v-for="(item,index) in expressionsData" class="expressions-box"> <div v-for="(item,index) in expressionsData" class="expressions-box">
<span>{{item.name}}</span> <span class="expressions-box-title">{{item.name}}</span>
<div v-for="item1 in item.value" class="expressions-metric"> <div v-for="item1 in item.value" class="expressions-metric">
{{item.legend?item.legend:item.metric}}: {{item.legend?item.legend:item.metric }} : {{ dataFormat(item.unit,item1.value[1])}}
{{dataFormat(item.unit,item1.value[0])}}
</div> </div>
<div v-if="item.value.length===0"> <div v-if="item.value.length===0">
NoData NoData
@@ -79,15 +78,21 @@
</script> </script>
<style scoped> <style scoped>
.expressionInfo{ .expressionInfo{
position: absolute; position: absolute;
transform: translateX(20px); transform: translateX(20px);
min-height: 20px; min-height: 20px;
max-height: 200px; max-height: 200px;
overflow: hidden; overflow: hidden;
padding: 10px; }
} .more-title-other{
margin-bottom: 5px;
}
.expressions-box{ .expressions-box{
min-width: 100px; min-width: 100px;
} }
.expressions-box-title{
margin-bottom: 5px;
display: inline-block;
}
</style> </style>

5
nezha-fronted/src/components/common/project/topology.vue
View File

@@ -340,7 +340,10 @@
"source": item.from, "source": item.from,
"target": item.to, "target": item.to,
"smooth": item.smooth, "smooth": item.smooth,
"expressions": item.expressions, "expressions": item.expressions.map((item)=>{
delete item.value;
return item
}),
"dashes":item.dashes, "dashes":item.dashes,
}; };
arr1.push(obj) arr1.push(obj)

6
nezha-fronted/src/components/common/project/visNetwork.vue
View File

@@ -285,10 +285,10 @@
item.to=item.target; item.to=item.target;
item.label=''; item.label='';
item.title='title'; item.title='title';
item.expressions.forEach((item,index)=>{ item.expressions.forEach((item1,index)=>{
this.$get('/prom/api/v1/query?query=' + item.metric).then(res=>{ this.$get('/prom/api/v1/query?query=' + item1.metric).then(res=>{
// item.value=res.data.result[0].value;i // item.value=res.data.result[0].value;i
item.value=res.data.result; item1.value=res.data.result;
console.log(res); console.log(res);
}); });
}) })