diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss b/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss index 9b541e6b1..91f89a797 100644 --- a/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss +++ b/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss @@ -69,6 +69,17 @@ color: $--color-text-primary; letter-spacing: 0; line-height: 23px; + padding-right: 5px; + .nz-icon-guzhangshuju { + color: $--color-primary; + vertical-align: middle; + } + .nz-icon-overview-alert{ + vertical-align: middle; + } + .alert-days-info{ + vertical-align: middle; + } } .danger{ background-color: $--color-danger; diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue index 9742ec499..2a0d7543c 100644 --- a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue +++ b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue @@ -9,22 +9,22 @@ {{alertRuleData && alertRuleData.name ? alertRuleData.name : '--'}} -
-
-
ID
-
{{alertRuleData.id ? alertRuleData.id : '--'}}
+
+
+
ID
+
{{alertRuleData.id ? alertRuleData.id : '--'}}
-
-
{{$t('overall.name')}}
-
{{alertRuleData.name ? alertRuleData.name : '--'}}
+
+
{{$t('overall.name')}}
+
{{alertRuleData.name ? alertRuleData.name : '--'}}
- - - + + + -
-
{{$t('overall.type')}}
-
+
+
{{$t('overall.type')}}
+
{{$t('overall.metric')}} @@ -35,17 +35,17 @@ --
-
-
{{$t('alert.severity')}}
-
{{alertRuleData.severityId ? severityData.find(s => alertRuleData.severityId === s.id).name : '--'}}
+
+
{{$t('alert.severity')}}
+
{{alertRuleData.severityId ? severityData.find(s => alertRuleData.severityId === s.id).name : '--'}}
-
-
{{$t('alert.config.expr')}}
-
{{alertRuleData.expr ? (alertRuleData.expr + alertRuleData.operator + formatThreshold(alertRuleData.threshold,alertRuleData.unit)) : '--'}}
+
+
{{$t('alert.config.expr')}}
+
{{alertRuleData.expr ? (alertRuleData.expr + alertRuleData.operator + formatThreshold(alertRuleData.threshold,alertRuleData.unit)) : '--'}}
-
-
{{$t('alert.alertNum')}}
-
+
+
{{$t('alert.alertNum')}}
+
{{$t('project.topology.alert')}}({{$t('overall.active')}})
@@ -60,13 +60,13 @@ />
-
-
{{$t('alert.config.trbShot')}}
-
+
+
{{$t('alert.config.trbShot')}}
+
-
-
{{$t('overall.state')}}
-
+
+
{{$t('overall.state')}}
+
{{ $t('overall.enabled') }} diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue index 7ff336035..418b99175 100644 --- a/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue +++ b/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue @@ -8,22 +8,22 @@ {{alertRuleData && alertRuleData.name ? alertRuleData.name : '--'}}
-
-
-
ID
-
{{alertRuleData.id ? alertRuleData.id : '--'}}
+
+
+
ID
+
{{alertRuleData.id ? alertRuleData.id : '--'}}
-
-
{{$t('overall.name')}}
-
{{alertRuleData.name ? alertRuleData.name : '--'}}
+
+
{{$t('overall.name')}}
+
{{alertRuleData.name ? alertRuleData.name : '--'}}
- - - + + + -
-
{{$t('overall.type')}}
-
+
+
{{$t('overall.type')}}
+
{{$t('overall.metric')}} @@ -34,17 +34,17 @@ --
-
-
{{$t('alert.severity')}}
-
{{alertRuleData.severityId ? severityData.find(s => alertRuleData.severityId === s.id).name : '--'}}
+
+
{{$t('alert.severity')}}
+
{{alertRuleData.severityId ? severityData.find(s => alertRuleData.severityId === s.id).name : '--'}}
-
-
{{$t('alert.config.expr')}}
-
{{alertRuleData.expr ? (alertRuleData.expr + alertRuleData.operator + formatThreshold(alertRuleData.threshold,alertRuleData.unit)) : '--'}}
+
+
{{$t('alert.config.expr')}}
+
{{alertRuleData.expr ? (alertRuleData.expr + alertRuleData.operator + formatThreshold(alertRuleData.threshold,alertRuleData.unit)) : '--'}}
-
-
{{$t('alert.alertNum')}}
-
+
+
{{$t('alert.alertNum')}}
+
{{$t('project.topology.alert')}}({{$t('overall.active')}})
@@ -59,13 +59,13 @@ />
-
-
{{$t('alert.config.trbShot')}}
-
+
+
{{$t('alert.config.trbShot')}}
+
-
-
{{$t('overall.state')}}
-
+
+
{{$t('overall.state')}}
+
{{ $t('overall.enabled') }}