diff --git a/nezha-fronted/src/components/common/project/addLine.vue b/nezha-fronted/src/components/common/project/addLine.vue
index 7e663d228..90d223adf 100644
--- a/nezha-fronted/src/components/common/project/addLine.vue
+++ b/nezha-fronted/src/components/common/project/addLine.vue
@@ -64,7 +64,7 @@
-
+
@@ -72,7 +72,7 @@
@@ -369,7 +369,6 @@
/deep/ .el-form-item__label{
font-size: 14px;
color: #666666;
- opacity: 0.6;
}
.arrows /deep/ .el-input.el-input--prefix.el-input--suffix{
border: 1px solid #DCDFE6;
@@ -427,7 +426,6 @@
padding-right: 20px;
text-align: right;
color: #666;
- opacity: 0.6;
font-size: 14px;
letter-spacing: 0;
line-height: 22px;
diff --git a/nezha-fronted/src/components/common/project/addNode.vue b/nezha-fronted/src/components/common/project/addNode.vue
index 823df745b..c5a6b0313 100644
--- a/nezha-fronted/src/components/common/project/addNode.vue
+++ b/nezha-fronted/src/components/common/project/addNode.vue
@@ -63,29 +63,35 @@
{{$t('alert.config.expr')}}
-
+
+
+
+
+
+ {{$t('project.topology.chartName')}}
+
+
+
+
+
+
+
+
-
-
- {{$t('project.topology.chartName')}}
-
-
-
-
-
-
-
-
-
+
{{$t('project.topology.unit')}}
+ :options="unitOptions"
+ :props="{ expandTrigger: 'click',emitPath:false }"
+ :show-all-levels="false"
+ v-model="unit[index-1]"
+ >
-
+
{{$t('dashboard.panel.chartForm.legend')}}
@@ -159,7 +166,7 @@
if( n.expressions){
n.expressions.forEach((item,index)=>{
this.addExpression();
- this.name[index]=item.name;
+ this.form.name[index]=item.name;
this.unit[index]=item.unit;
this.expressions[index]=item.metric;
this.legends[index]=item.legend;
@@ -191,6 +198,7 @@
form:{
moduleId:'',
iconId:'',
+ name:[],
},
selImage:'',
file:'',
@@ -201,7 +209,6 @@
promqlCount:0,
elementIds:[],
legends:[],
- name:[],
unit:[],
imgageLoading:false,
rules:{
@@ -276,12 +283,13 @@
model.expressions=[];
this.promqlKeys.forEach((item,index)=>{
model.expressions.push({
- "name": this.name[index],
+ "name": this.form.name[index],
"unit": this.unit[index],
"metric": this.expressions[index],
"legend": this.legends[index],
})
});
+ console.log(this.form.name,this.unit,model);
this.$emit('addModel',model);
}
});
@@ -293,7 +301,7 @@
addExpression() {
this.expressions.push('');
this.legends.push('');
- this.name.push('');
+ this.form.name.push('');
this.unit.push('');
this.promqlKeys.push(getUUID());
this.elementIds.push("");
@@ -303,7 +311,7 @@
if (this.promqlCount >= 1) {
this.expressions.splice(index, 1);
this.legends.splice(index, 1);
- this.name.splice(index, 1);
+ this.form.name.splice(index, 1);
this.unit.splice(index, 1);
this.promqlKeys.splice(index, 1);
this.elementIds.splice(index, 1);
@@ -377,6 +385,7 @@
/deep/ .avatar-uploader{
display: inline-block;
color: #1989fa;
+ vertical-align: top;
}
/deep/.right-box-form .icon .el-select{
width: 60%;
@@ -411,7 +420,7 @@
.icon /deep/ .el-input.el-input--prefix.el-input--suffix{
border: 1px solid #DCDFE6;
height: 28px;
- width: calc(100% - 30px);
+ width: calc(100% - 10px);
}
.icon /deep/ .el-input__inner{
display: none;
@@ -420,6 +429,25 @@
height: 28px;
line-height: 28px;
}
+ .element-item.expr /deep/ .el-form-item__content{
+ position: relative;
+ margin-left: 0 !important;
+ }
+ .element-item.expr /deep/ .el-form-item__content .el-row{
+ margin-bottom: 0;
+ }
+ .element-item.expr /deep/ .el-form-item__content .el-form-item__error{
+ left: 120px;
+ }
+ .expr-title{
+ width: 120px;
+ padding-right: 20px;
+ text-align: right;
+ color: #666;
+ font-size: 14px;
+ letter-spacing: 0;
+ line-height: 22px;
+ }
/* begin--搜索框*/
.endpoint-asset-search {
display: inline-block;
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index 90b731f36..4390c8dd9 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -251,7 +251,6 @@
padding-right: 20px;
text-align: right;
color: #666;
- opacity: 0.6;
font-size: 14px;
letter-spacing: 0;
line-height: 22px;