diff --git a/src/views/HomeView/history.vue b/src/views/HomeView/history.vue index 70b624b4..8694d017 100644 --- a/src/views/HomeView/history.vue +++ b/src/views/HomeView/history.vue @@ -269,14 +269,14 @@ export default defineComponent({ methods: { setPageSize(rem){ const historyTable = this.$refs.historyTable - const height = historyTable.offsetHeight - 176; - const size = Math.trunc(height / 54); + const height = historyTable.offsetHeight; + const size = Math.trunc((height - 110) / 54); this.pageSize = size if(rem){ this.currentPage = 1 this.getHistoryList() } - console.log("==========",size,rem) + console.log("==========size:"+size+" rem:"+rem+" height:"+height) }, getClass() { let data = { @@ -641,12 +641,15 @@ export default defineComponent({ padding: 3rem 0 0; box-sizing: border-box; flex-direction: column; + display: flex; + flex-direction: column; .history_table_content { - padding-top: 2.6rem; + margin-top: 2.6rem; width: 100%; background: #f5f5f5; - height: calc(100% - 4rem); + flex: 1; + // height: calc(100% - 4rem); // padding-bottom: 3rem; :deep(.ant-table-wrapper) { @@ -655,6 +658,12 @@ export default defineComponent({ &, .ant-spin-container { height: 100%; + .ant-table{ + flex: 1; + .ant-table-container,.ant-table-content,table{ + height: 100%; + } + } } } } @@ -664,7 +673,7 @@ export default defineComponent({ flex-direction: column; .ant-table { background: transparent; - flex: 1; + // flex: 1; } } @@ -678,8 +687,8 @@ export default defineComponent({ } } :deep(.ant-table-content) { - max-height: v-bind(historyTableHeight); - overflow-y: v-bind(scrolled); + // max-height: v-bind(historyTableHeight); + // overflow-y: v-bind(scrolled); } :deep(.ant-table-thead > tr > th) {