From bc44c8e3c9d85691ce3fa73ef1300a6fae46e365 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:07:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/bulletinBoard/tasksShow/index.vue | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/views/bulletinBoard/tasksShow/index.vue b/src/views/bulletinBoard/tasksShow/index.vue
index 171122b..82673f9 100644
--- a/src/views/bulletinBoard/tasksShow/index.vue
+++ b/src/views/bulletinBoard/tasksShow/index.vue
@@ -116,7 +116,7 @@
border
:data="tableData"
style="width: 100%"
- :height="tableHeight"
+ :height="tableHeight+''"
:header-cell-style="{ textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
>
@@ -228,7 +228,7 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
- :current-page="page.currentPage"
+ :current-page="page.current"
:page-sizes="[20, 40, 60, 80, 100]"
:page-size="20"
layout="total, sizes, prev, pager, next, jumper"
@@ -257,11 +257,11 @@
intervalId: null,
total: 0,
page: {
- currentPage: 1,
- pageSize: 20,
+ current: 1,
+ size: 20,
},
tableData: [],
- tableHeight: 0,
+ tableHeight: "",
};
},
watch: {
@@ -320,12 +320,7 @@
methods: {
//鍔ㄦ�佽幏鍙栬〃鏍奸珮搴�
handlerResize() {
- let viewHeight = window.innerHeight;
- let titleHeight = 60;
- let headMenuHeight = 90;
- let pageHeight = 42;
- this.tableHeight =
- viewHeight - titleHeight - headMenuHeight - pageHeight - 120;
+ this.tableHeight = window.innerHeight - 50 - 46 - 60 - 80 - 30 - 30 - 32;
},
// 鍏抽棴
close() {
@@ -373,20 +368,20 @@
this.getTableData();
},
handleSizeChange(val) {
- this.page.pageSize = val;
+ this.page.size = val;
this.getTableData();
console.log(`姣忛〉 ${val} 鏉);
},
handleCurrentChange(val) {
- this.page.currentPage = val;
+ this.page.current = val;
this.getTableData();
console.log(`褰撳墠椤�: ${val}`);
},
getTableData() {
this.loading = true;
let data = {
- currentPage: this.page.currentPage,
- pageSize: this.page.pageSize,
+ current: this.page.current,
+ size: this.page.size,
sonLaboratory: this.sonLaboratory,
};
tasksShow(data).then((res) => {
--
Gitblit v1.9.3