From 571acd97285e4ee10421709b8b6d7c9bb3a2d21e Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Thu, 30 May 2019 12:21:01 +0800 Subject: [PATCH] fixed issue https://github.com/tikazyq/crawlab/issues/45 --- .../components/TableView/GeneralTableView.vue | 16 ++++++++-------- frontend/src/store/modules/task.js | 2 +- frontend/src/views/task/TaskDetail.vue | 10 +++++++++- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/TableView/GeneralTableView.vue b/frontend/src/components/TableView/GeneralTableView.vue index 97bd3b38..25cd1923 100644 --- a/frontend/src/components/TableView/GeneralTableView.vue +++ b/frontend/src/components/TableView/GeneralTableView.vue @@ -58,18 +58,18 @@ export default { computed: { filteredData () { return this.data - .map(d => d) - .filter((d, index) => { - // pagination - const pageNum = this.pageNum - const pageSize = this.pageSize - return (pageSize * (pageNum - 1) <= index) && (index < pageSize * pageNum) - }) + // .map(d => d) + // .filter((d, index) => { + // // pagination + // const pageNum = this.pageNum + // const pageSize = this.pageSize + // return (pageSize * (pageNum - 1) <= index) && (index < pageSize * pageNum) + // }) } }, methods: { onPageChange () { - this.$emit('page-change') + this.$emit('page-change', { pageNum: this.pageNum, pageSize: this.pageSize }) } } } diff --git a/frontend/src/store/modules/task.js b/frontend/src/store/modules/task.js index 02a23841..906f9f69 100644 --- a/frontend/src/store/modules/task.js +++ b/frontend/src/store/modules/task.js @@ -18,7 +18,7 @@ const state = { pageNum: 0, pageSize: 10, // results - resultsPageNum: 0, + resultsPageNum: 1, resultsPageSize: 10 } diff --git a/frontend/src/views/task/TaskDetail.vue b/frontend/src/views/task/TaskDetail.vue index 601ba500..7a44d2b6 100644 --- a/frontend/src/views/task/TaskDetail.vue +++ b/frontend/src/views/task/TaskDetail.vue @@ -15,11 +15,13 @@ + {{ {resultsPageNum, resultsPageSize} }} + :total="taskResultsTotalCount" + @page-change="onResultsPageChange"/> @@ -78,6 +80,12 @@ export default { }, onSpiderChange (id) { this.$router.push(`/spiders/${id}`) + }, + onResultsPageChange (payload) { + const { pageNum, pageSize } = payload + this.resultsPageNum = pageNum + this.resultsPageSize = pageSize + this.$store.dispatch('task/getTaskResults', this.$route.params.id) } }, created () {