diff --git a/src/pages/achievement/info/project.vue b/src/pages/achievement/info/project.vue index 7b84bf3..2f4bee7 100644 --- a/src/pages/achievement/info/project.vue +++ b/src/pages/achievement/info/project.vue @@ -271,7 +271,7 @@ export default { // 考核和练习调不同接口 const res = this.permissions ? await this.$post(`${this.api.getAssessmentDetail}?pageNum=${this.page}&pageSize=${this.pageSize}&assessmentId=${this.id}&classId=${this.classId}&keyword=${this.keyword}&mallId=${this.mallId}`) : - await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=${this.pageSize}&projectId=${this.id}&paperId=${this.paperId}&keyWord=${this.keyword}&classId=${this.classId}&mallId=${this.mallId}`) + await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=${this.pageSize}&projectId=${this.id}&cid=${this.cid}&paperId=${this.paperId}&keyWord=${this.keyword}&classId=${this.classId}&mallId=${this.mallId}`) // 返回格式有两种 const isArr = res.page instanceof Array this.list = isArr ? res.page : res.page.records @@ -294,7 +294,7 @@ export default { // 活跃度 async getActivity () { // 考核和练习调不同接口 - const { message } = await this.$post(`${this.api.practiceActivity}?pageNum=${this.pageActivation}&pageSize=${this.pageSizeActivation}&projectId=${this.id}&paperId=${this.paperId}&keyWord=${this.keyword}&classId=${this.classId}&mallId=${this.mallId}`) + const { message } = await this.$post(`${this.api.practiceActivity}?pageNum=${this.pageActivation}&pageSize=${this.pageSizeActivation}&projectId=${this.id}&cid=${this.cid}&paperId=${this.paperId}&keyWord=${this.keyword}&classId=${this.classId}&mallId=${this.mallId}`) this.activations = message.records this.totalActivation = message.total }, @@ -323,7 +323,7 @@ export default { // 考核和练习的接口不一样 let url = this.permissions ? `${this.api.exportAssessmentInfo}?assessmentId=${this.id}&classId=${this.classId}` - : `${this.api.exportPracticeInfo}?projectId=${this.id}&mallId=${this.mallId}&paperId=${this.paperId}` + : `${this.api.exportPracticeInfo}?projectId=${this.id}&cid=${this.cid}&mallId=${this.mallId}&paperId=${this.paperId}` // 有勾选,就带上勾选的id if (this.multipleSelection.length) { const ids = this.multipleSelection.map(e => this.permissions ? e.testStatusId : e.reportId) @@ -377,6 +377,7 @@ export default { // 实训 const data = { mallId: this.mallId, + cid: this.cid, reportIds } data[per ? 'assessmentId' : 'projectId'] = this.id || this.paperId @@ -471,7 +472,7 @@ export default { responseType: 'blob' }) } else { - res = await axios.get(`${this.api.exportAllActivity}?projectId=${this.id}&paperId=${this.paperId}&mallId=${this.mallId}&classId=${this.classId}&keyWord=${this.keyword}`, { + res = await axios.get(`${this.api.exportAllActivity}?projectId=${this.id}&paperId=${this.paperId}&mallId=${this.mallId}&cid=${this.cid}&classId=${this.classId}&keyWord=${this.keyword}`, { headers: { token: this.token }, diff --git a/src/pages/achievement/list/project.vue b/src/pages/achievement/list/project.vue index 9333030..b385872 100644 --- a/src/pages/achievement/list/project.vue +++ b/src/pages/achievement/list/project.vue @@ -244,7 +244,7 @@ export default { entry (row) { const { curriculumId } = this.form const cur = this.curs.find(e => e.cid == curriculumId) || {} - this.$store.commit('achievement/setReferrer', `${this.$route.path}?${qs.stringify(this.form)}&page=${this.page}`) + this.$store.commit('achievement/setReferrer', `${this.$route.path}?${qs.stringify(this.form)}&page=${this.page}&tab=${this.$parent.active}`) this.$router.push(`project?id=${row.assessmentId || row.projectId || ''}&paperId=${row.paperId || ''}&cid=${curriculumId}&projectName=${row.projectName || ''}&permissions=${this.form.permissions}&mallId=${cur.mallId || ''}&classId=${row.classId || ''}`) }, handleDelete (row) { // 删除 diff --git a/src/pages/match/add/set.vue b/src/pages/match/add/set.vue index c075f55..d191141 100644 --- a/src/pages/match/add/set.vue +++ b/src/pages/match/add/set.vue @@ -133,7 +133,7 @@ @@ -296,11 +296,12 @@ export default { try { // 根据系统查询项目 if (this.courseSystem) { - const { data } = await this.$get(this.api.getProjectListOfSystem, { + const { data } = await this.$post(this.api.getProjectListOfSystem, { pageNum: this.page, pageSize: this.pageSize, systemId: this.systemId, - type: this.isTheory ? 3 : 1 + type: this.isTheory ? 3 : 1, + keyword: this.keyword }) if (this.isTheory) { data.records.forEach(e => {