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

feat：修改alert rule的运算符位置

Browse Source
This commit is contained in:
zhangyu
2021-02-23 16:21:49 +08:00
parent fd4b3fc662
commit 1ca22fa6ed
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/assets/stylus/main.scss
View File

@@ -1620,7 +1620,7 @@ li{
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
.config-dropdown { /* 若宽度不合适，自行增加新类覆盖宽度 */ .config-dropdown { /* 若宽度不合适，自行增加新类覆盖宽度 */
width: 490px; width: 75px;
} }
.asset-dropdown { .asset-dropdown {
width: 370px; width: 370px;

26
nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
View File

@@ -30,15 +30,16 @@
id="alert-box-input-promql" id="alert-box-input-promql"
></promql-input> ></promql-input>
</div> </div>
<!--operator--> <!--&lt;!&ndash;operator&ndash;&gt;-->
<el-form-item :label="$t('alert.config.operator')" prop="operator" style="display: inline-block;"> <!--<el-form-item :label="$t('alert.config.operator')" prop="operator" style="display: inline-block;">-->
<el-select popper-class="config-dropdown" v-model="editAlertRule.operator" placeholder="" size="small" id="alert-box-input-operator">
<el-option :id="'operator-'+item.key" v-for="item in operators" :key="item.value" :label="item.label" :value="item.value"></el-option> <!--</el-form-item>-->
</el-select>
</el-form-item>
<!--threshold--> <!--threshold-->
<el-form-item :label="$t('alert.config.threshold')" prop="threshold" style="display: inline-block;"> <el-form-item :label="$t('alert.config.threshold')" prop="threshold" style="display: inline-block;">
<el-input type="text" placeholder="" v-model="editAlertRule.threshold" size="small" id="alert-box-input-threshold"> <el-input type="text" placeholder="" v-model="editAlertRule.threshold" size="small" id="alert-box-input-threshold">
<el-select popper-class="config-dropdown" v-model="editAlertRule.operator" placeholder="" size="small" id="alert-box-input-operator" slot="prepend" class="input-with-select">
<el-option :id="'operator-'+item.key" v-for="item in operators" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-input> </el-input>
</el-form-item> </el-form-item>
<!--unit--> <!--unit-->
@@ -298,6 +299,19 @@
.unit-popper-class{ .unit-popper-class{
z-index: 2052 !important; z-index: 2052 !important;
} }
.input-with-select{
width: 70px !important;
}
.input-with-select #alert-box-input-operator{
padding: 0;
text-align: center;
border-top:1px solid #d0d4dC;
border-bottom:1px solid #d0d4dC;
border-radius: 4px 0 0 4px;
}
.input-with-select #alert-box-input-operator + .el-input__suffix{
display: none;
}
</style> </style>
<style scoped> <style scoped>
.rule-severity-remark{ .rule-severity-remark{