Merge branch 'master' of https://prodog.leanwo.com:3000/client-2022/client-trace-v3

src/trace/FinishedProjectTraces.vue

@@ -138,8 +138,8 @@ export default {
     var _self = this;
     this.projectId = _self.$route.params.projectId;
     this.projectName = _self.$route.query.projectName;
-    this.pagination2.current_page = this.$route.query.currentPage;
-    this.pagination2.per_page = this.$route.query.pageSize;
+    this.pagination2.current_page = Number(this.$route.query.currentPage);
+    this.pagination2.per_page = Number(this.$route.query.pageSize);
     this.personNumber();
     this.listFinishedTask();
   },

src/trace/NotFinishedProjectTraces.vue

@@ -196,7 +196,7 @@ export default {
     // 监听路由是否变化
     $route(to, from) {
       if (to.query.currentPage != from.query.currentPage) {
-        this.pagination.current_page = to.query.currentPage;
+        this.pagination.current_page = Number(to.query.currentPage);
         this.listNotFinishedTask();
       }
     },
@@ -205,8 +205,8 @@ export default {
     var _self = this;
     this.projectId = _self.$route.params.projectId;
     this.projectName = _self.$route.query.projectName;
-    this.pagination.current_page = this.$route.query.currentPage;
-    this.pagination.per_page = this.$route.query.pageSize;
+    this.pagination.current_page = Number(this.$route.query.currentPage);
+    this.pagination.per_page = Number(this.$route.query.pageSize);
     this.personNumber();
     this.adminPersonNumber();
     this.listNotFinishedTask();

src/trace/ProjectList.vue

@@ -93,15 +93,6 @@ export default {
         current_page: 1, // required
         last_page: 10, // required
       },
-      pagination2: {
-        total: 0,
-        //per_page: Common.pageSize,    // required
-        per_page: 30, // required
-        current_page: 1, // required
-        last_page: 10, // required
-        from: 1,
-        to: 10, // required
-      },
       traceState: undefined,
       traceStatus: undefined,
       traceUserStatus: undefined,
@@ -112,7 +103,7 @@ export default {
     // 监听路由是否变化
     $route(to, from) {
       if (to.query.currentPage != from.query.currentPage) {
-        this.pagination.current_page = to.query.currentPage;
+        this.pagination.current_page = Number(to.query.currentPage);
         this.getDatas();
       }
     },
@@ -121,8 +112,8 @@ export default {
   mounted: function () {
     const { currentPage, pageSize } = this.$route.query;
     if (currentPage !== undefined && pageSize !== undefined) {
-      this.pagination.current_page = this.$route.query.currentPage;
-      this.pagination.per_page = this.$route.query.pageSize;
+      this.pagination.current_page = Number(this.$route.query.currentPage);
+      this.pagination.per_page = Number(this.$route.query.pageSize);
     }
     this.updateRouter();
 

src/trace/TraceDynamic.vue

@@ -150,8 +150,8 @@ export default {
   },
 
   mounted: function () {
-    this.pagination.current_page = this.$route.query.currentPage;
-    this.pagination.per_page = this.$route.query.pageSize;
+    this.pagination.current_page = Number(this.$route.query.currentPage);
+    this.pagination.per_page = Number(this.$route.query.pageSize);
     this.initUser();
     this.initProject();
     this.getDatas();

src/trace/TraceList.vue

@@ -153,8 +153,8 @@ export default {
     TraceResource.getImg();
     console.log(this.$route);
     this.param.traceUserStatus = this.$route.params.traceState;
-    this.pagination.current_page = this.$route.query.currentPage;
-    this.pagination.per_page = this.$route.query.pageSize;
+    this.pagination.current_page = Number(this.$route.query.currentPage);
+    this.pagination.per_page = Number(this.$route.query.pageSize);
     this.getDatas();
   },
   methods: {