From da1879f97702862624106cb9751b284c817cc7c1 Mon Sep 17 00:00:00 2001 From: wyx Date: Sat, 4 Feb 2023 17:11:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=84?= =?UTF-8?q?=E5=8E=BB=E5=AD=A6=E4=B9=A0=E8=AF=B7=E6=B1=82=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=B7=B3=E8=BD=ACurl=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 3 +++ src/views/project/ProjectDetails.vue | 33 +++++++++++++++++++++++++- src/views/roadmap/PathDetails.vue | 35 +++++++++++++++++++++++++++- 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/src/api/api.js b/src/api/api.js index 584b02e..08b33c7 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -75,3 +75,6 @@ export const LINKGETONE = `/link/getOne` // 讨论模块 // -- 根据讨论的Id查询讨论发表的帖子 export const QueryDiscussSubmitDetailByDiscussId = '/discussSubmit/queryDiscussSubmitDetailByDiscussId post' + +// 测评任务去学习 +export const EvaluationToLearn = '/evaluation/evaluationToLearn post' diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 89cb5ae..9be6981 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -281,6 +281,7 @@ import { ROUTER_PROCESS, LINK_DETAILS, STUDY_RECORD, + EvaluationToLearn } from "@/api/api"; import { useRoute, useRouter } from "vue-router"; import store from "@/store"; @@ -414,7 +415,6 @@ function judgeTaskIsEnd(type, endTimes, status) { function toFinish(d, sName, chapterOrStageId) { console.log("dddddd", d, sName, chapterOrStageId); - if(judgeTaskIsEnd(d.type ,data.value.endTime, data.value.status)){ ElMessage.error("当前任务已结束") return @@ -513,6 +513,37 @@ function toFinish(d, sName, chapterOrStageId) { return } } + // 测评模块 请求接口跳转新的页面 - 新增 暂时未调试 目前无测评数据 2023-02-04 + if(d.type == 100) { + // 调用接口 跳转页面 + console.log('我是查询测评跳转链接所传递得参数',{ + "businessType": "project", + "chapterId": chapterOrStageId, + "courseId": d.courseId, + "quizKid": "", + "routerOrProjectId": projectId, + "studentId": data.value.userInfoBo.userId, + "studentName": data.value.userInfoBo.userName + }) + request(EvaluationToLearn, { + "businessType": "project", + "chapterId": chapterOrStageId, + "courseId": d.courseId, + "quizKid": "", + "routerOrProjectId": projectId, + "studentId": data.value.userInfoBo.userId, + "studentName": data.value.userInfoBo.userName + }).then(res=>{ + console.log(res) + if(res.data.code==200){ + // 此处写跳转url + window.open( 'http://ceping.com', '_top') + } + }).catch(err=>{ + console.log(err) + }) + return + } if (!types.value.path[d.type]) { ElMessage.error("暂时未开放"); diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 00b5176..6e7564e 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -277,7 +277,7 @@ import { computed, reactive, ref, watch } from "vue"; import circle from '../../assets/image/pathdetails/circle.png'; import circle2 from '../../assets/image/pathdetails/circle2.png'; import { boeRequest, useRequest, request } from "@/api/request"; -import { ROUTER_PROCESS, LINK_DETAILS, STUDY_RECORD } from "@/api/api"; +import { ROUTER_PROCESS, LINK_DETAILS, STUDY_RECORD, EvaluationToLearn } from "@/api/api"; import { useRoute, useRouter } from "vue-router"; import { ElMessage } from "element-plus"; import store from "@/store"; @@ -486,6 +486,39 @@ function toFinish(d) { return } } + + // 测评模块 请求接口跳转新的页面 - 新增 暂时未调试 目前无测评数据 2023-02-04 + if(d.type == 100) { + // 调用接口 跳转页面 + console.log('我是查询测评跳转链接所传递得参数',{ + "businessType": "project", + "chapterId": chapterOrStageId, + "courseId": d.courseId, + "quizKid": "", + "routerOrProjectId": routerId, + "studentId": userInfo.value.id, + "studentName": userInfo.value.realName + }) + request(EvaluationToLearn, { + "businessType": "project", + "chapterId": chapterOrStageId, + "courseId": d.courseId, + "quizKid": "", + "routerOrProjectId": routerId, + "studentId": userInfo.value.id, + "studentName": userInfo.value.realName + }).then(res=>{ + console.log(res) + if(res.data.code==200){ + // 此处写跳转url + window.open( 'http://ceping.com', '_top') + } + }).catch(err=>{ + console.log(err) + }) + return + } + if (typeof types.value.path[d.type] === "string") { types.value.path[d.type] && types.value.path[d.type].startsWith("http") &&