From e57e645d24a89adb3391be16f6948b292183fa04 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 11 二月 2025 14:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/components/tidingsTable.vue |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/views/components/tidingsTable.vue b/src/views/components/tidingsTable.vue
index 8009d8e..8c88212 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,7 +24,7 @@
                 color: '#454B5E',
                 fontSize: '12px'
             }"
-            height="280"
+            min-height="280"
             max-height="280"
         >
             <el-table-column
@@ -65,9 +65,8 @@
             >
                 <template #default="scope">
                     <el-button
-                        plain
                         size="small"
-                        type="primary"
+                        type="text"
                         @click="handleDetail(scope.row)"
                     >
                         鏌ョ湅</el-button
@@ -76,13 +75,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"
             :total="total"
             @pagination="getList"
-        />
+          />
+        </div>
+      </div>
     </div>
 </template>
 <script>
@@ -95,7 +100,7 @@
             total: 0,
             queryParams: {
                 pageNum: 1,
-                pageSize: 10
+                pageSize: 4
             },
             tableData: [],
             tabs: [
@@ -107,8 +112,8 @@
             currentTabId: 0,
             //閰嶇疆琛ㄦ牸琛ㄥご鏁版嵁
             currentTableHeaders: [
-                { label: '鎺掑簭', prop: 'index', minWidth: 50, align: 'center', slot: 'sort' },
-                { label: '鍙戝竷鍗曚綅', prop: 'commitDept', minWidth: 150, align: 'left' },
+                { label: '#', prop: 'index', minWidth: 50, align: 'center', slot: 'sort' },
+                { label: '瀹℃壒鐜妭', prop: 'taskDefinitionKey', minWidth: 150, align: 'left' },
                 { label: '鍐呭', prop: 'content', minWidth: 300, align: 'left' },
                 { label: '鏃堕棿', prop: 'createTime', minWidth: 143, align: 'left' }
             ]
@@ -173,12 +178,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 +195,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 +263,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