From 06abe855495be5d009e54db1d33b68679367a0ba Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 25 Oct 2022 16:24:54 +0800 Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=20liencese=20=20=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=20=20=E9=BB=91=E8=89=B2=E4=B8=BB=E9=A2=98=20?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/config/system/license.scss | 26 +++++++++++++++++-- .../src/components/common/deleteButton.vue | 1 + .../components/page/config/system/license.vue | 20 ++------------ 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/page/config/system/license.scss b/nezha-fronted/src/assets/css/components/page/config/system/license.scss index 91ae0f0b5..b27e74800 100644 --- a/nezha-fronted/src/assets/css/components/page/config/system/license.scss +++ b/nezha-fronted/src/assets/css/components/page/config/system/license.scss @@ -157,11 +157,11 @@ .el-pagination{ font-size: 14px; .btn-prev, .btn-next{ - color: #fff; + color: $--background-color-empty; font-size: 14px; margin: 0 5px; border: none; - background-color: #CBCED1 !important; + background-color: $--background-color-base !important; border-radius: 50%; height: 24px; width: 24px; @@ -180,4 +180,26 @@ .el-carousel__indicators.el-carousel__indicators--horizontal{ display: none; } + .el-dialog__header { + border-bottom: 1px solid $--border-color-light; + height: 32px; + line-height: 32px; + .el-dialog__header-title { + font-weight: 600; + } + .top-tool-btn{ + height: 32px; + width: 36px; + padding: 0; + } + .el-dialog__headerbtn{ + line-height: 32px; + } + } + .el-button{ + //background-color: $--background-color-1 !important; + background: $--background-color-empty; + border: 1px solid $--border-color-light; + border-color: $--border-color-light; + } } diff --git a/nezha-fronted/src/components/common/deleteButton.vue b/nezha-fronted/src/components/common/deleteButton.vue index 30effb9c4..3e666c888 100644 --- a/nezha-fronted/src/components/common/deleteButton.vue +++ b/nezha-fronted/src/components/common/deleteButton.vue @@ -268,6 +268,7 @@ export default { case 'alertrule' : return 'nz-icon monitorColor nz-icon-Alertrule' case 'cabinetTab' : return 'nz-icon monitorColor nz-icon-Cabinet1' case 'roles' : return 'nz-icon monitorColor nz-icon-role1' + case 'role' : return 'nz-icon monitorColor nz-icon-role1' case 'alertSilence' : return 'nz-icon monitorColor nz-icon-a-Silencealert' case 'user' : return 'nz-icon monitorColor nz-icon-user1' case 'cabinet' : return 'nz-icon monitorColor nz-icon-Cabinet1' diff --git a/nezha-fronted/src/components/page/config/system/license.vue b/nezha-fronted/src/components/page/config/system/license.vue index 1c715c182..58bd3d1c9 100644 --- a/nezha-fronted/src/components/page/config/system/license.vue +++ b/nezha-fronted/src/components/page/config/system/license.vue @@ -111,7 +111,7 @@
@@ -142,7 +142,7 @@ width: qrWidth - 32 + 'px', height: qrWidth - 32 + 'px' }" - :text="qrCodeArr[index]" + :text="qrCodeArr[index] || index" :size="2000" :margin="10" /> @@ -431,22 +431,6 @@ export default { }