From a53786fc03eff436cd7165b204f5885adf841e30 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Thu, 10 Feb 2022 09:36:35 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-1553=20fix:=20=E4=BF=AE=E5=A4=8DAlert=20mes?= =?UTF-8?q?sage=E5=85=B3=E9=97=AD=E4=B8=8B=E6=BB=91=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=95=8C=E9=9D=A2=E6=97=A0=E6=B3=95=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/css/components/page/alert/alertMessage.scss | 3 --- nezha-fronted/src/components/page/alert/alertMessage.vue | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/page/alert/alertMessage.scss b/nezha-fronted/src/assets/css/components/page/alert/alertMessage.scss index ec37c3282..9e28a3a4c 100644 --- a/nezha-fronted/src/assets/css/components/page/alert/alertMessage.scss +++ b/nezha-fronted/src/assets/css/components/page/alert/alertMessage.scss @@ -6,9 +6,6 @@ font-weight: bold; } .list-page .main-container{ - .nz-table2{ - height: calc(100% - 242px); - } .is-scrolling-none { height: calc(100% - 43px) !important; } diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index 4000179c0..fb172396f 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -5,6 +5,7 @@ :api="url" :custom-table-title.sync="tools.customTableTitle" :from="fromRoute.alertMessage" + :nz-table-height-offset="alertMessageNzTableHeightOffset" :layout="dataListLayout" :search-msg="searchMsg" @search="search" @@ -176,6 +177,7 @@ export default { return { chartLoading: false, chartInfo: {}, + alertMessageNzTableHeightOffset: 242, stateOptions: alertMessageConstant.states, dataListLayout: localStorage.getItem('dataList-layout' + 'alertMessageTable') ? JSON.parse(localStorage.getItem('dataList-layout' + 'alertMessageTable')) : ['searchInput', 'elementSet', 'clickSearch', 'pagination'], state: '1',