diff --git a/src/pages/achievement/teach/index.vue b/src/pages/achievement/teach/index.vue index 468fce6..d819cdc 100644 --- a/src/pages/achievement/teach/index.vue +++ b/src/pages/achievement/teach/index.vue @@ -340,8 +340,9 @@ export default { async getData () { // 考核和练习调不同接口 const res = this.permissions ? - await this.$post(`${this.api.getAssessmentDetail}?pageNum=${this.page}&pageSize=10000&assessmentId=${this.id}&classId=${this.classId}&keyword=${this.keyword}`) : - await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=10000&projectId=${this.id}&keyword=${this.keyword}`) + await this.$post(`${this.api.getAssessmentDetail}?pageNum=${this.page}&pageSize=${this.pageSize}&assessmentId=${this.id}&classId=${this.classId}&keyword=${this.keyword}`) : + await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=${this.pageSize}&projectId=${this.id}&keyword=${this.keyword}`) + this.listData = res.page.records this.listDataAll = res.page.records this.total = res.page.total this.avgScore = (+res.avgScore).toFixed(2) @@ -351,10 +352,14 @@ export default { this.errorAnalysis = res.errorAnalysis this.max = res.highestErrorRate || {} this.min = res.minimumErrorRate || {} - this.handlePage() + // this.handlePage() this.getChart() this.errorChart() }, + handleCurrentChange (val) { + this.page = val + this.getData() + }, // 活跃度 async getActivity () { // 考核和练习调不同接口 @@ -453,17 +458,13 @@ export default { handleSelectionChange (val) { // 多选 this.multipleSelection = val; }, - handleCurrentChange (val) { // 切换分页 - this.page = val; - this.handlePage(); - }, handleSelectionActivationChange (val) { // 多选 this.multipleSelectionActivation = val; }, handleCurrentActivationChange (val) { // 切换分页 this.pageActivation = val; - this.handlePage(); + this.getActivity(); }, // 导出(有勾选:就导勾选中的;没有勾选:就导全部)