diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 204d6c2..b106f1a 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -507,6 +507,8 @@ async function toFinish(d, sName, chapterOrStageId) { // 点击即更新状态 进行中 request(SubmitExternalExam, { + "type": 1, + "taskId": d.id, "chapterId": chapterOrStageId, "externalId": d.courseId, "externalName": d.name, @@ -665,9 +667,10 @@ async function toFinish(d, sName, chapterOrStageId) { //更新学员当前任务 await request(UPDATE_CURRENT_TASK, { id: d.id, type: PROJECT, pid: projectId, name: d.name }) if (d.type == 3 || d.type == 7 || (d.type === 5 && d.examType === 2)) { + console.log(d, data.value) d.status !== 1 && await request(STUDY_RECORD, { studentId: userInfo.value.id, - targetId: data.value.routerId, + targetId: data.value.projectId, logo: PROJECT, type: PROJECT, stageOrChapterId: chapterOrStageId, diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 7ba89b0..300d9f4 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -278,7 +278,7 @@ import { computed, onMounted, ref } from "vue"; import circle from '@/assets/image/pathdetails/circle.png'; import circle2 from '@/assets/image/pathdetails/circle2.png'; import { request } from "@/api/request"; -import { STUDY_RECORD, UPDATE_CURRENT_TASK, QueryEvaluationTaskStatusOne, EvaluationToLearn } from "@/api/api"; +import { STUDY_RECORD, UPDATE_CURRENT_TASK, QueryEvaluationTaskStatusOne, EvaluationToLearn, SubmitExternalExam } from "@/api/api"; import { useRoute, useRouter } from "vue-router"; import { ElMessage } from "element-plus"; import { ROUTER, TASK_TYPES } from "@/api/CONST"; @@ -390,6 +390,39 @@ async function toFinish(d) { dialogVisible.value = true; return } + + // 此处判断外部考试跳转 + if (d.examType == 2) { + // 点击即更新状态 进行中 + request(SubmitExternalExam, { + "type": 2, + "taskId": d.id, + "chapterId": data.value.currentStageId, + "externalId": d.courseId, + "externalName": d.name, + "targetId": routerId, + "studentNo": userInfo.value.userNo + }).then(res => { + console.log(res) + }).catch(err => { + console.log(err) + }) + + router.push({ + path: '/externalexamination', + query: { + id: d.id, + type: ROUTER, + infoId: routerId, + courseId: d.courseId, + pName: data.value.name, + sName: data.value.currentStageName, + chapterOrStageId: data.value.currentStageId, + exname: d.name, // 考试名称 + }, + }); + return + } } // 评估 停用 if (d.type == 11) { @@ -431,6 +464,7 @@ async function toFinish(d) { //更新学员当前任务 await request(UPDATE_CURRENT_TASK, { id: d.id, type: ROUTER, pid: routerId, name: d.name }) if (d.type === 3 || d.type === 7 || (d.type === 5 && d.examType === 2)) { + console.log(d, data.value) d.status !== 1 && await request(STUDY_RECORD, { studentId: userInfo.value.id, targetId: data.value.id,