diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 69f25add1..c1d97c780 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -813,7 +813,10 @@ const cn = { alertNumTrend: "告警数量趋势", affectEntity: "影响" } - } + }, + P1Rule:'P1: 万分紧急,可导致业务瘫痪的告警', + P2Rule:'P2: 急需处理,但不影响业务的告警', + P3Rule:'P3: 需要处理,但不紧急的告警', }, project: { chart: { diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 9375dcde0..d30155736 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -819,7 +819,10 @@ const en = { alertNumTrend: "Alert num trend", 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: { chart: { diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue index ce4a2fafa..a68afa79f 100644 --- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue @@ -321,7 +321,7 @@ editLabelsBox: {show: false, top: 0, left: 0, type: 0}, //param编辑弹框 moduleParamShow: false, //module默认参数param悬浮窗 assetSearch: {host: '', sn: '', text: '', label: 'IP', dropdownShow: false}, //侧滑框中asset的搜索相关 - assetPageObj: {pageNo: 1, pageSize: -1}, + assetPageObj: {pageNo: 1, pageSize: -1,states:1}, selectedAssets: [], //侧滑框中选中的asset projectList: [], moduleList: [], diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue index 25612539a..cf1992e6c 100644 --- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue @@ -67,6 +67,14 @@ +
+ +
+

{{$t('alert.P1Rule')}}

+

{{$t('alert.P2Rule')}}

+

{{$t('alert.P3Rule')}}

+
+
+ diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue index ecc99d3b4..0d6e0d95a 100644 --- a/nezha-fronted/src/components/common/searchInput.vue +++ b/nezha-fronted/src/components/common/searchInput.vue @@ -677,7 +677,7 @@ } else if (val.type == 'dc') { objectInfo.idcId = val.valnum; } else if (val.type == 'asset') { - objectInfo.assetId = val.valnum; + objectInfo.asset = val.val; } else if (val.type == 'module') { objectInfo.moduleId = val.valnum; } else if (val.type == 'project') { diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index d538207dc..d73dc2314 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -215,14 +215,6 @@ label: this.$t("overall.name"), prop: 'name', 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"), prop: 'location', @@ -243,6 +235,14 @@ label: this.$t('asset.principal'), prop: 'principal', 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'), prop: 'state',