feat: 修改经纬度默认不显示 alertmessage asset支持模糊查询 alertrule 添加说明

This commit is contained in:
zhangyu
2020-11-12 09:54:42 +08:00
parent cab74b307a
commit 0089029a5e
6 changed files with 45 additions and 12 deletions

View File

@@ -813,7 +813,10 @@ const cn = {
alertNumTrend: "告警数量趋势", alertNumTrend: "告警数量趋势",
affectEntity: "影响" affectEntity: "影响"
} }
} },
P1Rule:'P1: 万分紧急,可导致业务瘫痪的告警',
P2Rule:'P2: 急需处理,但不影响业务的告警',
P3Rule:'P3: 需要处理,但不紧急的告警',
}, },
project: { project: {
chart: { chart: {

View File

@@ -819,7 +819,10 @@ const en = {
alertNumTrend: "Alert num trend", alertNumTrend: "Alert num trend",
affectEntity: "Affect entity" affectEntity: "Affect entity"
} }
} },
P1Rule:'P1: Critical, alarm that can cause business paralysis',
P2Rule:'P2: Major, alarm that do not affect the business',
P3Rule:'P3: Minor, alarm that need to deal with, but not urgent',
}, },
project: { project: {
chart: { chart: {

View File

@@ -321,7 +321,7 @@
editLabelsBox: {show: false, top: 0, left: 0, type: 0}, //param编辑弹框 editLabelsBox: {show: false, top: 0, left: 0, type: 0}, //param编辑弹框
moduleParamShow: false, //module默认参数param悬浮窗 moduleParamShow: false, //module默认参数param悬浮窗
assetSearch: {host: '', sn: '', text: '', label: 'IP', dropdownShow: false}, //侧滑框中asset的搜索相关 assetSearch: {host: '', sn: '', text: '', label: 'IP', dropdownShow: false}, //侧滑框中asset的搜索相关
assetPageObj: {pageNo: 1, pageSize: -1}, assetPageObj: {pageNo: 1, pageSize: -1,states:1},
selectedAssets: [], //侧滑框中选中的asset selectedAssets: [], //侧滑框中选中的asset
projectList: [], projectList: [],
moduleList: [], moduleList: [],

View File

@@ -67,6 +67,14 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<div class="rule-severity-remark">
<i class="nz-icon nz-icon-info-normal"></i>
<div>
<p>{{$t('alert.P1Rule')}}</p>
<p>{{$t('alert.P2Rule')}}</p>
<p>{{$t('alert.P3Rule')}}</p>
</div>
</div>
<!--receiver--> <!--receiver-->
<el-form-item :label="$t('config.account.receiver')" prop="receiver"> <el-form-item :label="$t('config.account.receiver')" prop="receiver">
<el-select <el-select
@@ -278,3 +286,22 @@
z-index: 2052 !important; z-index: 2052 !important;
} }
</style> </style>
<style scoped>
.rule-severity-remark{
display: inline-flex;
justify-content: center;
justify-items: center;
align-items: center;
/*width: 376px;*/
padding: 10px 15px;
background: rgba(244,244,255,1);
color: rgba(144,147,158,1);
margin-top: -13px;
margin-bottom: 18px;
margin-left: 190px;
font-size: 14px;
}
.rule-severity-remark .nz-icon-info-normal{
margin-right: 10px;
}
</style>

View File

@@ -677,7 +677,7 @@
} else if (val.type == 'dc') { } else if (val.type == 'dc') {
objectInfo.idcId = val.valnum; objectInfo.idcId = val.valnum;
} else if (val.type == 'asset') { } else if (val.type == 'asset') {
objectInfo.assetId = val.valnum; objectInfo.asset = val.val;
} else if (val.type == 'module') { } else if (val.type == 'module') {
objectInfo.moduleId = val.valnum; objectInfo.moduleId = val.valnum;
} else if (val.type == 'project') { } else if (val.type == 'project') {

View File

@@ -215,14 +215,6 @@
label: this.$t("overall.name"), label: this.$t("overall.name"),
prop: 'name', prop: 'name',
show: true, show: true,
}, {
label: this.$t('config.dc.longitude'),
prop: 'longitude',
show: true
}, {
label: this.$t('config.dc.latitude'),
prop: 'latitude',
show: true
}, { }, {
label: this.$t("asset.location"), label: this.$t("asset.location"),
prop: 'location', prop: 'location',
@@ -243,6 +235,14 @@
label: this.$t('asset.principal'), label: this.$t('asset.principal'),
prop: 'principal', prop: 'principal',
show: true show: true
}, {
label: this.$t('config.dc.longitude'),
prop: 'longitude',
show: false
}, {
label: this.$t('config.dc.latitude'),
prop: 'latitude',
show: false
}, { }, {
label: this.$t('config.dc.state'), label: this.$t('config.dc.state'),
prop: 'state', prop: 'state',