From a8fb7ae2dbb61a94141ed5e73d3bb2632b7b84df Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期日, 28 九月 2025 15:25:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/system/publicMsg.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/system/publicMsg.vue b/admin/src/views/system/publicMsg.vue
index 136d910..437d61a 100644
--- a/admin/src/views/system/publicMsg.vue
+++ b/admin/src/views/system/publicMsg.vue
@@ -6,7 +6,7 @@
<el-button type="primary" @click="batchStatus(0)" v-permissions="['business:platformjob:update']">鎵归噺鍚敤</el-button>
<el-button @click="batchStatus(1)" v-permissions="['business:platformjob:update']">鎵归噺绂佺敤</el-button>
</div>
- <el-table @selection-change="handleSelectionChange" class="mb20" v-loading="loading" :data="list" stripe>
+ <el-table :height="tableHeightNew" @selection-change="handleSelectionChange" class="mb20" v-loading="loading" :data="list" stripe>
<el-table-column align="center" type="selection" width="55">
</el-table-column>
<el-table-column prop="titile" label="娑堟伅鏍囬" min-width="160" show-overflow-tooltip />
@@ -32,7 +32,9 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
+import BaseComputHeight from '@/components/base/BaseComputHeight'
export default {
+ extends: BaseComputHeight,
components: {
Pagination,
QueryForm,
@@ -141,11 +143,11 @@
clear() {
this.pagination.page = 1
this.filters = {}
- this.getList()
+ this.getList(1)
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
- this.getList()
+ this.getList(1)
}
}
}
@@ -157,4 +159,7 @@
color: #000000;
margin-bottom: 15px;
}
-</style>
\ No newline at end of file
+ ::v-deep .el-table{
+ margin-bottom: 60px;
+ }
+</style>
--
Gitblit v1.9.3