style:新增告警静默弹窗 错误时的样式调整 以及补充中英文切换

This commit is contained in:
zhangyu
2021-03-11 14:01:59 +08:00
parent fe6cc12dfb
commit f45b0a32f5
4 changed files with 15 additions and 9 deletions

View File

@@ -395,7 +395,7 @@ const cn = {
}, },
tip: { tip: {
confirmDelete: "确认删除吗?", confirmDelete: "确认删除吗?",
confirmOvertime: "确定要使这个超时?", //Are you sure you want to delete? confirmOvertime: "确定关闭吗?", //Are you sure you want to delete?
killTerm:'确认关闭 terminal 吗?', killTerm:'确认关闭 terminal 吗?',
confirmBatchDelete:'确定删除这{0}条数据吗?', confirmBatchDelete:'确定删除这{0}条数据吗?',
assetConfirmDelete: "关联的Endpoint和告警将会被删除确认删除吗", assetConfirmDelete: "关联的Endpoint和告警将会被删除确认删除吗",
@@ -922,6 +922,8 @@ const cn = {
time:'时间', time:'时间',
matcher:'Matcher', matcher:'Matcher',
reason:'原因', reason:'原因',
selectTime:'请选择时间',
selectMather:'必填项'
}, },
P1Rule:'P1: 万分紧急,可导致业务瘫痪的告警', P1Rule:'P1: 万分紧急,可导致业务瘫痪的告警',
P2Rule:'P2: 急需处理,但不影响业务的告警', P2Rule:'P2: 急需处理,但不影响业务的告警',

View File

@@ -398,7 +398,7 @@ const en = {
}, },
tip: { tip: {
confirmDelete: "Are you sure you want to delete?", //Are you sure you want to delete? confirmDelete: "Are you sure you want to delete?", //Are you sure you want to delete?
confirmOvertime: "Are you sure you want this to time out?", confirmOvertime: "Are you sure it's off?",
killTerm:'Are you sure you want to kill terminal?', killTerm:'Are you sure you want to kill terminal?',
confirmBatchDelete:'Are you sure to delete these {0} pieces of data', confirmBatchDelete:'Are you sure to delete these {0} pieces of data',
assetConfirmDelete: 'Related endpoints and alerts will be removed, are you sure you want to delete this asset?',//Related endpoints and alerts will be removed, are you sure you want to delete this asset? assetConfirmDelete: 'Related endpoints and alerts will be removed, are you sure you want to delete this asset?',//Related endpoints and alerts will be removed, are you sure you want to delete this asset?
@@ -927,6 +927,8 @@ const en = {
time:'Time', time:'Time',
matcher:'Matcher', matcher:'Matcher',
reason:'Reason', reason:'Reason',
selectTime:'Please select time',
selectMather:'Required'
}, },
P1Rule:'P1: Critical, alarm that can cause business paralysis', P1Rule:'P1: Critical, alarm that can cause business paralysis',
P2Rule:'P2: Major, alarm that do not affect the business', P2Rule:'P2: Major, alarm that do not affect the business',

View File

@@ -59,7 +59,7 @@
</div> </div>
<div class="matcher-type"> <div class="matcher-type">
<el-select class="matcher-type-title" v-model="editAlertSilence.type" :popper-append-to-body="false" size="small" @change="typeChange"> <el-select class="matcher-type-title matcher-type-header" v-model="editAlertSilence.type" :popper-append-to-body="false" size="small" @change="typeChange">
<el-option <el-option
v-for="item in typeList" v-for="item in typeList"
:key="item.type" :key="item.type"
@@ -169,10 +169,10 @@
}, },
rules:{ rules:{
time: [ time: [
{ required: true, message: '请选择时间', trigger: 'change' }, { required: true, message: this.$t('alert.silence.selectTime'), trigger: 'change' },
], ],
matcher:[ matcher:[
{ required: true, message: '请选择Mather', trigger: 'change' }, { required: true, message: this.$t('alert.silence.selectMather'), trigger: 'change' },
] ]
}, },
rangeTime:'', rangeTime:'',
@@ -469,11 +469,12 @@
} }
} }
.matcher{ .matcher{
/deep/ .el-input--prefix .el-input__inner{
}
/deep/ .el-input__prefix{ /deep/ .el-input__prefix{
left: 0; left: 0;
}
/deep/ .el-form-item__error{
left: 126px;
padding-top: 10px;
} }
.matcher-type{ .matcher-type{
display: flex; display: flex;
@@ -497,6 +498,7 @@
letter-spacing: 0; letter-spacing: 0;
font-weight: 400; font-weight: 400;
text-align: center; text-align: center;
border: none;
} }
.matcher-type-content{ .matcher-type-content{
flex: 1; flex: 1;

View File

@@ -502,7 +502,7 @@
} }
} }
.nz-silence-tag{ .nz-silence-tag{
min-width: 120px; min-width: 80px;
margin-right: 5px; margin-right: 5px;
border-radius: 4px; border-radius: 4px;
display: inline-flex; display: inline-flex;