diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue index e0df9b95d..1c223d971 100644 --- a/nezha-fronted/src/components/common/table/nzDataList.vue +++ b/nezha-fronted/src/components/common/table/nzDataList.vue @@ -25,7 +25,7 @@ -
+
@@ -90,7 +90,8 @@ export default { }, searchMsg: { type: Object - } + }, + tableBoxHeight: {} }, data () { return { diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 5704ba74b..a08b1cbf2 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -7,6 +7,7 @@ :from="fromRoute.asset" :layout="dataListLayout" :search-msg="searchMsg" + :table-box-height="assetTableHeight" @search="search" @getTableData="getTableData" > @@ -53,7 +54,7 @@ v-loading="tools.loading" :api="url" :custom-table-title="tools.customTableTitle" - :height="dataListLayout.indexOf('clickSearch') > -1 ? assetTableHeight : mainTableHeight" + :height="mainTableHeight" :table-data="tableData" @cli="cli" @del="del" @@ -130,7 +131,7 @@ export default { }, silenceBoxShow: false, dataListLayout: ['searchInput', 'elementSet', 'clickSearch', 'pagination'], - assetTableHeight: `calc(100% - ${48 + 201 + 20}px)`, + assetTableHeight: `calc(100% - ${48 + 201 + 40}px)`, blankObject: { id: '', name: '', diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue index c77c151fa..a39c9cda3 100644 --- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue +++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue @@ -7,6 +7,7 @@ :from="fromRoute.endpoint" :layout="dataListLayout" :search-msg="searchMsg" + :table-box-height="endpointTableHeight" @search="search" @getTableData="getTableData" > @@ -55,7 +56,7 @@ v-loading="tools.loading" :api="url" :custom-table-title="tools.customTableTitle" - :height="dataListLayout.indexOf('clickSearch') > -1 ? endpointTableHeight : mainTableHeight" + :height="mainTableHeight" :table-data="tableData" :tableId="tableId" @del="del" @@ -233,7 +234,7 @@ export default { silenceBoxShow: false, tableId: 'endpointTable', queryPermission: 'account_view', - endpointTableHeight: 'calc(100% - 224px)', // 主列表table高度 + endpointTableHeight: 'calc(100% - 244px)', // 主列表table高度 dataListLayout: ['searchInput', 'elementSet', 'clickSearch', 'pagination'], searchMsg: { // 给搜索框子组件传递的信息 zheze_none: true,