From 4e547e43b6ba22361ed49dcb6409e57247e0109c Mon Sep 17 00:00:00 2001
From: wuyize <wuyize25@163.com>
Date: Thu, 14 Jul 2022 15:14:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=92=E5=BA=8F=E5=90=8E?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E8=A1=A8=E5=A4=B4=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ClosedProject.vue  | 6 ++++++
 src/views/OngoingProject.vue | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/views/ClosedProject.vue b/src/views/ClosedProject.vue
index c6f5370..4922333 100644
--- a/src/views/ClosedProject.vue
+++ b/src/views/ClosedProject.vue
@@ -11,6 +11,7 @@
           ref="tableRef"
           class="projectTable"
           :height="tableHeight"
+          :default-sort="defaultSort"
           @sort-change="onSortChange"
           @row-click="onRowClick"
           :data="tableData">
@@ -72,6 +73,7 @@ const pageSize = ref(10)
 const total = ref(0)
 const sortBy = ref(null)
 const asc = ref(null)
+const defaultSort = ref(null)
 const redirect = () => {
   router.push({path: '/project/closed', query: {currentPage: currentPage.value, pageSize: pageSize.value, sortBy: sortBy.value, asc: asc.value}})
 }
@@ -127,6 +129,10 @@ watch(
         sortBy.value = router.currentRoute.value.query.sortBy
       if (router.currentRoute.value.query.asc)
         asc.value = router.currentRoute.value.query.asc
+      defaultSort.value = {
+        prop: sortBy.value,
+        order: asc.value
+      }
       getClosedProjects()
     },
     // 组件创建完后获取数据，
diff --git a/src/views/OngoingProject.vue b/src/views/OngoingProject.vue
index b90482e..5f142fb 100644
--- a/src/views/OngoingProject.vue
+++ b/src/views/OngoingProject.vue
@@ -12,6 +12,7 @@
       <el-table
           ref="tableRef"
           class="projectTable"
+          :default-sort="defaultSort"
           @row-click="onRowClick"
           @sort-change="onSortChange"
           :height="tableHeight"
@@ -87,6 +88,7 @@ const pageSize = ref(10)
 const total = ref(0)
 const sortBy = ref(null)
 const asc = ref(null)
+const defaultSort = ref(null)
 const redirect = () => {
   router.push({path: '/', query: {currentPage: currentPage.value, pageSize: pageSize.value, sortBy: sortBy.value, asc: asc.value}})
 }
@@ -143,6 +145,10 @@ watch(
         sortBy.value = router.currentRoute.value.query.sortBy
       if (router.currentRoute.value.query.asc)
         asc.value = router.currentRoute.value.query.asc
+      defaultSort.value = {
+        prop: sortBy.value,
+        order: asc.value
+      }
       getProjects()
     },
     // 组件创建完后获取数据，