From 6ae0fcef149ddbe614746023a58a3885b3ac4bde Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 25 三月 2025 11:31:04 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/views/components/tidingsTable.vue | 89 +++++++++++++++++++++-----------------------
1 files changed, 43 insertions(+), 46 deletions(-)
diff --git a/src/views/components/tidingsTable.vue b/src/views/components/tidingsTable.vue
index 8d2d659..067a28b 100644
--- a/src/views/components/tidingsTable.vue
+++ b/src/views/components/tidingsTable.vue
@@ -1,6 +1,6 @@
<template>
- <div>
- <div class="flex justify-between mb-[15px]">
+ <div style="position: relative">
+ <div class="flex justify-between mb-[15px]" style="align-items: center;margin-bottom: 5px">
<div class="block mb-3 font-semibold fonts">娑堟伅涓績</div>
<div class="flex text-[12px]">
<div
@@ -24,8 +24,9 @@
color: '#454B5E',
fontSize: '12px'
}"
- height="280"
+ min-height="280"
max-height="280"
+ v-loading="tableLoading"
>
<el-table-column
v-for="column in currentTableHeaders"
@@ -34,12 +35,13 @@
:label="column.label"
:min-width="column.minWidth"
:prop="column.prop"
+ :show-overflow-tooltip="column.showOverflowTooltip"
>
<template v-if="column.slot === 'sort'" #default="scope">
<div
:class="
getSortClass(
- (queryParams.pageNum - 1) *
+ (queryParams.currentPage - 1) *
queryParams.pageSize +
scope.$index +
1
@@ -48,7 +50,7 @@
class="sort"
>
<span>{{
- (queryParams.pageNum - 1) * queryParams.pageSize +
+ (queryParams.currentPage - 1) * queryParams.pageSize +
scope.$index +
1
}}</span>
@@ -65,9 +67,8 @@
>
<template #default="scope">
<el-button
- plain
size="small"
- type="primary"
+ type="text"
@click="handleDetail(scope.row)"
>
鏌ョ湅</el-button
@@ -76,13 +77,19 @@
</template>
</el-table-column>
</el-table>
- <pagination
+ <div style="position: absolute; bottom: 0px;width: 100%;">
+ <div style="width: 100%;display: flex;flex-direction: row-reverse;align-items: center">
+ <pagination
+ style="width: 100%"
v-show="total >= 0"
+ :page-sizes="[4]"
:limit="queryParams.pageSize"
- :page="queryParams.pageNum"
+ :page="queryParams.currentPage"
:total="total"
- @pagination="getList"
- />
+ @pagination="getMessageCountFun"
+ />
+ </div>
+ </div>
</div>
</template>
<script>
@@ -92,25 +99,25 @@
name: "Index",
data() {
return {
+ tableLoading: false,
total: 0,
queryParams: {
- pageNum: 1,
- pageSize: 10
+ currentPage: 1,
+ pageSize: 4
},
tableData: [],
tabs: [
// { id: 'process', label: '閫氱煡鍏憡', num: '2' },
- { id: 'review', label: '瀹℃牳娑堟伅', num: '6' }
+ { id: 'review', label: '瀹℃牳娑堟伅', num: '' }
// { id: 'supervision', label: '鐫ｅ姙娑堟伅', num: '9' },
// { id: 'progress', label: '杩涘害娑堟伅', num: '7' }
],
currentTabId: 0,
//閰嶇疆琛ㄦ牸琛ㄥご鏁版嵁
currentTableHeaders: [
- { label: '鎺掑簭', prop: 'index', minWidth: 50, align: 'center', slot: 'sort' },
- { label: '鍙戝竷鍗曚綅', prop: 'commitDept', minWidth: 150, align: 'left' },
- { label: '鍐呭', prop: 'content', minWidth: 300, align: 'left' },
- { label: '鏃堕棿', prop: 'createTime', minWidth: 143, align: 'left' }
+ { label: '#', prop: 'index', minWidth: 50, align: 'center', slot: 'sort' },
+ { label: '娑堟伅鍐呭', prop: 'content', minWidth: 300, align: 'left', showOverflowTooltip: true },
+ { label: '鏃堕棿', prop: 'gmtCreate', minWidth: 143, align: 'left' }
]
}
},
@@ -120,35 +127,22 @@
},
created() {
this.currentTabId = this.tabs[0].id; // 榛樿閫変腑鐨則ab鐨刬d
- this.getList();
- this.getMessageCountFun();
+
+ this.getMessageCountFun({page: 1});
},
methods: {
-
- async getList() {
- const resp = await getMessage(this.queryParams);
- if (resp.code === 200) {
- this.total = resp.total;
- this.tableData = resp.rows;
- }
+ async getMessageCountFun(data) {
+ this.queryParams.currentPage = data.page
+ this.tableLoading = true
+ await getMessageCount(this.queryParams).then(res => {
+ this.tableData = res.data
+ this.total = res.total
+ this.tableLoading = false
+ });
},
-
- async getMessageCountFun() {
- const resp = await getMessageCount();
- if (resp.code === 200) {
- this.tabs = tabs.map((tab) => {
- if (tab.label === '瀹℃牳娑堟伅') {
- tab.num = resp.data.auditCount;
- }
- return tab;
- });
- }
- },
-
-
switchTab(tabId) {
- currentTabId = tabId;
+ this.currentTabId = tabId;
},
getSortClass(index) {
@@ -173,12 +167,12 @@
this.getReadFun(row.id);
if (row.auditType === '2') {
this.$router.push({
- path: '/projectManage/nodeDetails',
+ path: '/process',
query: { taskId: row.taskId, id: row.businessKey, auditType: row.auditType, disabled: 'true' }
});
} else {
this.$router.push({
- path: '/projectManage/nodeDetails',
+ path: '/process',
query: { taskId: row.taskId, id: row.businessKey, disabled: 'true' }
});
}
@@ -190,10 +184,13 @@
<style lang="scss" scoped>
.tab {
- padding: 8px;
+ padding: 6px;
border: 1px solid #dbdeea;
cursor: pointer;
width: 72px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
.active {
@@ -255,7 +252,7 @@
text-align: end;
}
::v-deep .el-pagination .btn-prev .el-icon,
- ::v-deep .el-pagination .btn-next .el-icon
+ ::v-deep .el-pagination .btn-next .el-icon
{
display: inline;
}
--
Gitblit v1.8.0