From 5f4f8f0e3d62cb1690086cd3ec04d904d6017cac Mon Sep 17 00:00:00 2001 From: likexuan Date: Wed, 20 Apr 2022 17:16:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:alert=20silence=20=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=20alerts=20=E5=88=97?= =?UTF-8?q?=E3=80=81=E5=91=8A=E8=AD=A6=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=20=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/alert/alertMessageInfo.scss | 30 +- .../components/common/alert/alertLabel.vue | 886 ++++++++++++------ .../common/alert/alertMessageInfoTab.vue | 6 +- .../common/alert/alertMessageInfoTimeLine.vue | 2 +- .../components/common/alert/alertRuleInfo.vue | 4 + .../common/table/alert/alertSilenceTable.vue | 4 +- .../common/table/settings/endpointTable.vue | 2 +- 7 files changed, 646 insertions(+), 288 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss index c753c31f6..1db5291c8 100644 --- a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss @@ -285,6 +285,9 @@ .el-dialog__body { .alert-message-info-box { .info-box-right { + #alert .name-labe { + display: none; + } .el-timeline { .el-timeline-item { .el-timeline-item__wrapper { @@ -294,7 +297,7 @@ font-size: 14px; font-weight: 400; padding-left: 5px; - } + } .alert-message-startAt { font-size: 14px; @@ -375,9 +378,22 @@ } .info-box-left { + .alert .name-labe { + display: block; + } + .name-labe{ + display: none; + } .alert-message-info-tab { .el-tabs.el-tabs--card.el-tabs--top { .el-tabs__content { + #pane-alertRule{ + .alert-rule-nfo{ + .alert-rule-box{ + display: flex; + } + } + } #pane-detail { .info-box-header { .info-box-content { @@ -433,6 +449,7 @@ .alert-label-info { .alert-label-box { margin-bottom: 25px; + display: flex; .alert-label-title { margin-right: 30px; @@ -445,7 +462,7 @@ .alert-label-info { .alert-label-box { margin-bottom: 25px; - + display: flex; .alert-label-title { margin-right: 30px; } @@ -457,7 +474,7 @@ .alert-label-info { .alert-label-box { margin-bottom: 25px; - + display: flex; .alert-label-title { margin-right: 30px; } @@ -469,7 +486,7 @@ .alert-label-info { .alert-label-box { margin-bottom: 25px; - + display: flex; .alert-label-title { margin-right: 30px; } @@ -481,7 +498,7 @@ .alert-label-info { .alert-label-box { margin-bottom: 25px; - + display: flex; .alert-label-title { margin-right: 30px; } @@ -502,3 +519,6 @@ } } } + + + diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue index a70a647e0..5e19aea6c 100644 --- a/nezha-fronted/src/components/common/alert/alertLabel.vue +++ b/nezha-fronted/src/components/common/alert/alertLabel.vue @@ -1,62 +1,156 @@ + diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue index ca8094728..3f85f7652 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue @@ -8,12 +8,14 @@
diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue index 1fb84c7d3..93ed04ce1 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue @@ -1,5 +1,5 @@