From d52f671261ee0df53a9ec22f97a312196ad0a653 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Mon, 1 Nov 2021 09:39:42 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-1142=20fix:=20=E4=BF=AE=E5=A4=8DAsset?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=85=83=E7=B4=A0=E8=B6=85=E5=87=BA=E8=BE=B9?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/alert/alertLabel.vue | 21 +++++++++---------- .../components/common/alert/alertRuleInfo.vue | 4 ++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue index dfe69a936..55097d571 100644 --- a/nezha-fronted/src/components/common/alert/alertLabel.vue +++ b/nezha-fronted/src/components/common/alert/alertLabel.vue @@ -94,7 +94,7 @@
{{$t('overall.remark')}}
-
{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}
+
{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}
@@ -135,7 +135,7 @@
{{$t('overall.remark')}}
-
{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}
+
{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}
@@ -441,7 +441,7 @@ export default { position: fixed; background-color: white; z-index: 3000; - padding: 10px; + padding: 10px 23px 10px 10px; border-radius: 4px; box-shadow: -1px 1px 9px -1px rgba(205,205,205,0.77); } @@ -503,26 +503,25 @@ export default { /*border-bottom: 1px solid #ebeef5;*/ } .alert-label-title{ - font-family: Roboto-Regular; font-size: 14px; color: #666666; letter-spacing: 0; line-height: 23px; - font-weight: 400; - min-width: 100px; + min-width: 110px; padding: 0 3px 0 13px; - min-width: 100px; } .alert-label-value{ height: 26px; - ont-family: Roboto-Regular; font-size: 14px; color: #333333; letter-spacing: 0; line-height: 23px; - font-weight: 400; - padding: 0 3px 0 13px; - word-break: break-all; + } + .alert-label-remark { + overflow: hidden; + text-overflow:ellipsis; + white-space: nowrap; + max-width: 210px; } .danger{ background-color: #d64f40; diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue index 6769ab585..3ddba11db 100644 --- a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue +++ b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue @@ -161,7 +161,7 @@ export default { position: fixed; background-color: white; z-index: 3000; - padding: 10px; + padding: 10px 23px 10px 10px; border-radius: 4px; box-shadow: -1px 1px 9px -1px rgba(205,205,205,0.77); } @@ -230,7 +230,7 @@ export default { } .alert-rule-title{ text-align: left; - width: 110px; + min-width: 110px; color: #666; padding: 0 3px 0 13px; }