From 7367a769b1f2f6220b1a665cde72d41e03454b96 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Fri, 25 Mar 2022 10:04:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E7=BD=AE=E5=88=86=E9=A1=B510?= =?UTF-8?q?=E6=9D=A1=E6=AF=8F=E9=A1=B5=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/js/pages/manage/components/ProjectArchived.vue | 2 +- resources/assets/js/pages/manage/components/ProjectLog.vue | 3 ++- .../assets/js/pages/manage/components/ProjectManagement.vue | 2 +- resources/assets/js/pages/manage/components/ReportMy.vue | 4 ++-- resources/assets/js/pages/manage/components/ReportReceive.vue | 4 ++-- resources/assets/js/pages/manage/components/TaskArchived.vue | 2 +- resources/assets/js/pages/manage/components/TaskDeleted.vue | 2 +- .../assets/js/pages/manage/components/TeamManagement.vue | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/resources/assets/js/pages/manage/components/ProjectArchived.vue b/resources/assets/js/pages/manage/components/ProjectArchived.vue index fb3ae6461..6f20550a2 100644 --- a/resources/assets/js/pages/manage/components/ProjectArchived.vue +++ b/resources/assets/js/pages/manage/components/ProjectArchived.vue @@ -212,7 +212,7 @@ export default { keys: this.keys, archived: 'yes', page: Math.max(this.page, 1), - pagesize: Math.max($A.runNum(this.pageSize), 20), + pagesize: Math.max($A.runNum(this.pageSize), 10), }, }).then(({data}) => { this.loadIng--; diff --git a/resources/assets/js/pages/manage/components/ProjectLog.vue b/resources/assets/js/pages/manage/components/ProjectLog.vue index 8189a9f6e..5d573290b 100644 --- a/resources/assets/js/pages/manage/components/ProjectLog.vue +++ b/resources/assets/js/pages/manage/components/ProjectLog.vue @@ -63,6 +63,7 @@ export default { lists: [], listPage: 1, + listPageSize: 20, hasMorePages: false, totalNum: -1, } @@ -107,7 +108,7 @@ export default { project_id: this.projectId, task_id: this.taskId, page: Math.max(this.listPage, 1), - pagesize: this.pagesize, + pagesize: Math.max($A.runNum(this.listPageSize), 10), } }).then(({data}) => { this.loadIng--; diff --git a/resources/assets/js/pages/manage/components/ProjectManagement.vue b/resources/assets/js/pages/manage/components/ProjectManagement.vue index 66a6e3d4f..87d5f7004 100644 --- a/resources/assets/js/pages/manage/components/ProjectManagement.vue +++ b/resources/assets/js/pages/manage/components/ProjectManagement.vue @@ -197,7 +197,7 @@ export default { all: 1, archived, page: Math.max(this.page, 1), - pagesize: Math.max($A.runNum(this.pageSize), 20), + pagesize: Math.max($A.runNum(this.pageSize), 10), }, }).then(({data}) => { this.loadIng--; diff --git a/resources/assets/js/pages/manage/components/ReportMy.vue b/resources/assets/js/pages/manage/components/ReportMy.vue index 97c870a36..12d29380c 100644 --- a/resources/assets/js/pages/manage/components/ReportMy.vue +++ b/resources/assets/js/pages/manage/components/ReportMy.vue @@ -164,8 +164,8 @@ export default { this.$store.dispatch("call", { url: 'report/my', data: { - page: this.listPage, - pagesize: this.listPageSize, + page: Math.max(this.listPage, 1), + pagesize: Math.max($A.runNum(this.listPageSize), 10), created_at: this.createAt, type: this.reportType }, diff --git a/resources/assets/js/pages/manage/components/ReportReceive.vue b/resources/assets/js/pages/manage/components/ReportReceive.vue index 91df0245d..b3c9dbac6 100644 --- a/resources/assets/js/pages/manage/components/ReportReceive.vue +++ b/resources/assets/js/pages/manage/components/ReportReceive.vue @@ -188,8 +188,8 @@ export default { this.$store.dispatch("call", { url: 'report/receive', data: { - page: this.listPage, - pagesize: this.listPageSize, + page: Math.max(this.listPage, 1), + pagesize: Math.max($A.runNum(this.listPageSize), 10), username: this.username, created_at: this.createAt, type: this.reportType diff --git a/resources/assets/js/pages/manage/components/TaskArchived.vue b/resources/assets/js/pages/manage/components/TaskArchived.vue index 589a8c821..e6055ec9f 100644 --- a/resources/assets/js/pages/manage/components/TaskArchived.vue +++ b/resources/assets/js/pages/manage/components/TaskArchived.vue @@ -259,7 +259,7 @@ export default { archived_at: 'desc' }, page: Math.max(this.page, 1), - pagesize: Math.max($A.runNum(this.pageSize), 20), + pagesize: Math.max($A.runNum(this.pageSize), 10), }, }).then(({data}) => { this.loadIng--; diff --git a/resources/assets/js/pages/manage/components/TaskDeleted.vue b/resources/assets/js/pages/manage/components/TaskDeleted.vue index 5c4938da8..c8a95ce20 100644 --- a/resources/assets/js/pages/manage/components/TaskDeleted.vue +++ b/resources/assets/js/pages/manage/components/TaskDeleted.vue @@ -207,7 +207,7 @@ export default { deleted_at: 'desc' }, page: Math.max(this.page, 1), - pagesize: Math.max($A.runNum(this.pageSize), 20), + pagesize: Math.max($A.runNum(this.pageSize), 10), }, }).then(({data}) => { this.loadIng--; diff --git a/resources/assets/js/pages/manage/components/TeamManagement.vue b/resources/assets/js/pages/manage/components/TeamManagement.vue index 013bfbb20..3e5ffe836 100644 --- a/resources/assets/js/pages/manage/components/TeamManagement.vue +++ b/resources/assets/js/pages/manage/components/TeamManagement.vue @@ -297,7 +297,7 @@ export default { data: { keys: this.keys, page: Math.max(this.page, 1), - pagesize: Math.max($A.runNum(this.pageSize), 20), + pagesize: Math.max($A.runNum(this.pageSize), 10), }, }).then(({data}) => { this.loadIng--;