From d3592a95f6571d1640bf6038451db6d2fc1fcee8 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Tue, 15 Feb 2022 09:30:30 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-1534=20fix:=20=E4=BF=AE=E5=A4=8DAsset?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E6=97=B6Number=E4=B8=8EBra?= =?UTF-8?q?nd=20&=20Model=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/css/components/page/config/system.scss | 5 +++-- .../assets/css/components/page/config/system/license.scss | 1 - nezha-fronted/src/components/page/asset/asset.vue | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/page/config/system.scss b/nezha-fronted/src/assets/css/components/page/config/system.scss index 9c1140891..2932db984 100644 --- a/nezha-fronted/src/assets/css/components/page/config/system.scss +++ b/nezha-fronted/src/assets/css/components/page/config/system.scss @@ -1,7 +1,8 @@ .system { - height: 100%; + height: calc(100% - 40px) !important; position: relative; - margin-top: 10px; + overflow: auto; + margin: 10px; .el-tag.el-tag--info { background-color: $--chart-title-hover-background-color; border: 1px solid $--border-color-light; 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 fa16688d9..37725e2c7 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 @@ -15,7 +15,6 @@ .license-left { display: flex; flex-direction: column; - justify-content: flex-start; } .license-left-header,.license-right-header { width: 100%; diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 5094aedae..fefe12b14 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -235,6 +235,7 @@ export default { modelId: '', model: { id: '', name: '' }, type: { name: '', id: '' }, + number: '', brandAndModel: [], typeId: '', snmpCredentialId: '',