From c644e022fb9942771cf1bc758f9d7258d4a9cbfa Mon Sep 17 00:00:00 2001
From: wuyize <wuyize25@163.com>
Date: Fri, 1 Jul 2022 14:24:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=8D=A2=E9=A1=B5=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=94=B9=E5=8F=98=E9=A1=B5=E9=9D=A2url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ClosedProject.vue  | 31 +++++++++++++++++++++++++-----
 src/views/OngoingProject.vue | 37 +++++++++++++++++++++++++++---------
 2 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/src/views/ClosedProject.vue b/src/views/ClosedProject.vue
index 0c138e0..d1c988d 100644
--- a/src/views/ClosedProject.vue
+++ b/src/views/ClosedProject.vue
@@ -60,6 +60,7 @@ onMounted(() => {
 <script>
 import request from "../utils/request";
 import moment from "moment";
+import router from "../router";
 
 export default {
   name: "ClosedProject",
@@ -73,17 +74,35 @@ export default {
       tableData: []
     }
   },
-  mounted() {
-    this.getClosedProjects();
+  created() {
+    // watch 路由的参数，以便再次获取数据
+    this.$watch(
+        () => this.$route.query,
+        () => {
+          if(this.$route.query.currentPage)
+            this.currentPage = parseInt(this.$route.query.currentPage)
+          if(this.$route.query.pageSize)
+            this.pageSize = parseInt(this.$route.query.pageSize)
+
+          this.getClosedProjects()
+        },
+        // 组件创建完后获取数据，
+        // 此时 data 已经被 observed 了
+        { immediate: true }
+    )
   },
+
   methods: {
     // 选择一页显示多少条数据
     handleSizeChange(val) {
-      this.getClosedProjects()
+      this.redirect()
     },
     // 选择当前的是第几页
     handleCurrentChange(val) {
-      this.getClosedProjects()
+      this.redirect()
+    },
+    redirect() {
+      router.push({path: '/ClosedProject', query: { currentPage: this.currentPage, pageSize: this.pageSize }})
     },
     getClosedProjects() {
       const that = this;
@@ -93,7 +112,9 @@ export default {
         params: {
           pageCurrent: this.currentPage,
           pageSize: this.pageSize,
-          completed: true
+          paramMap: {
+            completed: true
+          }
         }
       }).then(response => {
         if(response.data.code===200) {
diff --git a/src/views/OngoingProject.vue b/src/views/OngoingProject.vue
index fb3bf28..b47d8e3 100644
--- a/src/views/OngoingProject.vue
+++ b/src/views/OngoingProject.vue
@@ -27,7 +27,7 @@
         </el-table-column>
         <el-table-column min-width="10%" align="right">
           <template #default="scope">
-            <el-button :v-show="staffId===scope.row.projectCreator" type="primary" plain @click="onCloseProject(scope.row)">结项</el-button>
+            <el-button :v-show=" this.$store.state.staff.staffId===scope.row.projectCreator" type="primary" plain @click="onCloseProject(scope.row)">结项</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -71,6 +71,7 @@ export default {
   name: "OngoingProject",
   data() {
     return {
+
       total: 0,
       currentPage: 1,
       pageSize: 10,
@@ -81,22 +82,34 @@ export default {
       staffId: Number
     }
   },
+  created() {
+    // watch 路由的参数，以便再次获取数据
+    this.$watch(
+        () => this.$route.query,
+        () => {
+          if(this.$route.query.currentPage)
+            this.currentPage = parseInt(this.$route.query.currentPage)
+          if(this.$route.query.pageSize)
+            this.pageSize = parseInt(this.$route.query.pageSize)
+
+          this.getProjects()
+        },
+        // 组件创建完后获取数据，
+        // 此时 data 已经被 observed 了
+        { immediate: true }
+    )
+  },
   mounted() {
-    this.staffId = localStorage.getItem('staffId');
-    this.getProjects();
-
-
   },
   methods: {
 
     // 选择一页显示多少条数据
     handleSizeChange(val) {
-      console.log('handleSizeChange:'+val)
-      this.getProjects();
+      this.redirect()
     },
     // 选择当前的是第几页
     handleCurrentChange(val) {
-      this.getProjects();
+      this.redirect()
     },
     onCloseProject(row) {
       request({
@@ -118,6 +131,9 @@ export default {
         console.log(error)
       })
     },
+    redirect() {
+      router.push({path: '/', query: { currentPage: this.currentPage, pageSize: this.pageSize }})
+    },
     getProjects() {
       const that = this;
       request({
@@ -125,7 +141,10 @@ export default {
         method: 'get',
         params: {
           pageCurrent: this.currentPage,
-          pageSize: this.pageSize
+          pageSize: this.pageSize,
+          paramMap: {
+            completed: false
+          }
         }
       }).then(response => {
         if(response.data.code===200) {