Merge remote-tracking branch 'origin/develop' into develop

src/api/api.js

@@ -78,3 +78,6 @@ export const LINKGETONE = `/link/getOne`
 // 讨论模块
 // -- 根据讨论的Id查询讨论发表的帖子
 export const QueryDiscussSubmitDetailByDiscussId = '/discussSubmit/queryDiscussSubmitDetailByDiscussId post'
+
+// 测评任务去学习
+export const EvaluationToLearn = '/evaluation/evaluationToLearn post'

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";
@@ -415,7 +416,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
@@ -514,6 +514,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("暂时未开放");

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";
@@ -489,6 +489,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") &&