From 7c3530e498f588028b6491b71821958142365f71 Mon Sep 17 00:00:00 2001 From: cgd_mac <349008059@qq.com> Date: Sun, 16 Jan 2022 20:57:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A1=B5=E9=9D=A2=E7=BB=98=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/myexam/exam.js | 27 ++++++++++++ src/views/myexam/index.vue | 74 ++++++++++++++++++++------------ src/views/myexamDetail/index.vue | 12 +++++- src/views/mynotice/index.vue | 15 +++++++ src/views/myreport/index.vue | 26 ++++++++--- 5 files changed, 119 insertions(+), 35 deletions(-) create mode 100644 src/views/mynotice/index.vue diff --git a/src/api/myexam/exam.js b/src/api/myexam/exam.js index 56fca3c..620e605 100644 --- a/src/api/myexam/exam.js +++ b/src/api/myexam/exam.js @@ -2,6 +2,9 @@ import request from '@/utils/request' const examApi = { examList: 'exam/list', // 我的考试-预约考试列表 + attendList: 'exam/attend', // 我的考试-已参加考试 + exam: 'exam/exam', // 我的考试进入考试 + viewReport: 'exam/viewReport' // 查看报告 } export function reqExamList (params) { @@ -11,3 +14,27 @@ export function reqExamList (params) { params: params }) } + +export function reqExamAttendList (params) { + return request({ + url: examApi.attendList, + method: 'get', + params: params + }) +} + +export function reqExamExam (params) { + return request({ + url: examApi.exam, + method: 'get', + params: params + }) +} + +export function reqExamViewReport (params) { + return request({ + url: examApi.viewReport, + method: 'get', + params: params + }) +} diff --git a/src/views/myexam/index.vue b/src/views/myexam/index.vue index ad135b8..a1ff06b 100644 --- a/src/views/myexam/index.vue +++ b/src/views/myexam/index.vue @@ -24,9 +24,20 @@ {{ index + 1 }} - - 进入考试 - 已预约 + + 必修课 + 选修课 + + + {{ record.examTime }}分钟 + + + + 预约考试 + + + 进入考试 + @@ -40,8 +51,15 @@ {{ index + 1 }} - - 查看详情 + + 必修课 + 选修课 + + + {{ record.examTime }}分钟 + + + 查看详情 @@ -51,7 +69,7 @@ + + diff --git a/src/views/myreport/index.vue b/src/views/myreport/index.vue index 3a0356b..941be5e 100644 --- a/src/views/myreport/index.vue +++ b/src/views/myreport/index.vue @@ -4,8 +4,8 @@ - {{viewReport.courseName}} - 交卷时间:{{viewReport.submitTime}}答题用时:{{viewReport.totalScore}} + {{ viewReport.courseName }} + 交卷时间:{{ viewReport.submitTime }}答题用时:{{ viewReport.totalScore }} @@ -13,7 +13,7 @@ - {{viewReport.courseName}} + {{ viewReport.courseName }} 选择题30/30选择题30/30选择题30/30 @@ -32,6 +32,7 @@ import DbQuestionInfoItem from '@/components/DbQuestionInfoItem/index.vue' import DbReport from '@/components/DbReport/index.vue' import { answerViewReport, answerViewResolution } from '@/api/practice/report' +import { reqExamViewReport } from '@/api/myexam/exam.js' export default { components: { DbQuestionInfoItem, DbReport }, @@ -44,11 +45,24 @@ export default { } }, mounted () { - this.query = this.$route.query - this.getAnswerViewReport() - this.getAnswerViewResolution() + const query = this.$route.query + this.query = query + if (query.type === 'practice') { + this.getAnswerViewReport() + this.getAnswerViewResolution() + } + if (query.type === 'exam') { + this.getExamViewReport() + } }, methods: { + // 考试 start + getExamViewReport () { + reqExamViewReport({ projectId: this.query.reportId }).then(res => { + this.viewReport = res.data + }) + }, + // 练习 start getAnswerViewReport () { answerViewReport({ reportId: Number(this.query.reportId) }).then(res => { this.viewReport = res.data