diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 5868219..7dfae09 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -335,7 +335,7 @@
{{item.name}}
- {{tabValue==1?item.pointsCount:item.rateStr}}
+ {{tabValue==1?item?.pointsCount:item?.rateStr}}
@@ -369,10 +369,10 @@
style="width: 28px; height: 28px;border-radius: 28px;"
:src="tableRankData[myIndex-1]?.avatar"
/>
- {{tableRankData[myIndex-1].name}}
+ {{tableRankData[myIndex-1]?.name}}
- {{tabValue==1?tableRankData[myIndex-1].pointsCount:tableRankData[myIndex-1].rateStr}}
+ {{tabValue==1?tableRankData[myIndex-1]?.pointsCount:tableRankData[myIndex-1]?.rateStr}}
@@ -607,9 +607,10 @@ function judgeTaskIsEnd(type, endTimes, status) {
case 1:
status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false;
break;
- case 3:
- status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false;
- break;
+ //案例么有时间限制
+ // case 3:
+ // status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false;
+ // break;
case 5:
status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false;
break;
@@ -623,226 +624,226 @@ function judgeTaskIsEnd(type, endTimes, status) {
return isEnd;
}
-function toFinish(d, sName, chapterOrStageId) {
- console.log("dddddd", d, sName, chapterOrStageId);
- if(judgeTaskIsEnd(d.type ,data.value.endTime, data.value.status)){
- ElMessage.error("当前任务已结束")
- return
- }
- if (d.type == 2) {
- let date1 = new Date(d.endTime).getTime();
- let date2 = new Date().getTime();
- if (date1 < date2) {
- dialogVisibleTip.value = '当前面授课已结束';
- dialogVisible.value = true;
+async function toFinish(d, sName, chapterOrStageId) {
+ console.log("dddddd", d, sName, chapterOrStageId);
+ if (judgeTaskIsEnd(d.type, data.value.endTime, data.value.status)) {
+ ElMessage.error("当前任务已结束")
+ return
+ }
+ if (d.type == 2) {
+ let date1 = new Date(d.endTime).getTime();
+ let date2 = new Date().getTime();
+ if (date1 < date2) {
+ dialogVisibleTip.value = '当前面授课已结束';
+ dialogVisible.value = true;
- //return
- }
- }
- // 作业过期判断
- if (d.type == 4) {
- let date1 = new Date(d.endTime).getTime();
- let date2 = new Date().getTime();
- if (date1 < date2) {
- dialogVisibleTip.value = '当前作业已结束';
- dialogVisible.value = true;
+ //return
+ }
+ }
+ // 作业过期判断
+ if (d.type == 4) {
+ let date1 = new Date(d.endTime).getTime();
+ let date2 = new Date().getTime();
+ if (date1 < date2) {
+ dialogVisibleTip.value = '当前作业已结束';
+ dialogVisible.value = true;
- //return
- }
- }
- // 直播结束时间
- if (d.type == 6) {
- let date1 = new Date(d.endTime).getTime();
- let date2 = new Date().getTime();
- if (date1 < date2) {
- dialogVisibleTip.value = '当前直播已结束';
- dialogVisible.value = true;
- //return
- }
- }
- // 考试 停用
- if (d.type == 5) {
- if (d.taskStatus == 1 || d.taskStatus == 2) {
- // ElMessage.error("该任务无法学习，请联系管理员进行替换。")
- dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
- dialogVisible.value = true;
- return
- }
- // 此处判断外部考试跳转
- if(d.examType==2){
+ //return
+ }
+ }
+ // 直播结束时间
+ if (d.type == 6) {
+ let date1 = new Date(d.endTime).getTime();
+ let date2 = new Date().getTime();
+ if (date1 < date2) {
+ dialogVisibleTip.value = '当前直播已结束';
+ dialogVisible.value = true;
+ //return
+ }
+ }
+ // 考试 停用
+ if (d.type == 5) {
+ if (d.taskStatus == 1 || d.taskStatus == 2) {
+ // ElMessage.error("该任务无法学习，请联系管理员进行替换。")
+ dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
+ dialogVisible.value = true;
+ return
+ }
+ // 此处判断外部考试跳转
+ if (d.examType == 2) {
- // 点击即更新状态 进行中
- request(SubmitExternalExam, {
- "chapterId": chapterOrStageId,
- "externalId": d.courseId,
- "externalName": d.name,
- "targetId": data.value.projectId,
- "studentNo": userInfo.value.userNo
- }).then(res=>{
- console.log(res)
- }).catch(err=>{
- console.log(err)
- })
+ // 点击即更新状态 进行中
+ request(SubmitExternalExam, {
+ "chapterId": chapterOrStageId,
+ "externalId": d.courseId,
+ "externalName": d.name,
+ "targetId": data.value.projectId,
+ "studentNo": userInfo.value.userNo
+ }).then(res => {
+ console.log(res)
+ }).catch(err => {
+ console.log(err)
+ })
- router.push({
- path: '/externalexamination',
- query: {
- id: d.projectTaskId,
- type: PROJECT,
- infoId: data.value.projectId,
- courseId: d.courseId,
- pName: data.value.name,
- sName,
- chapterOrStageId,
- exname: d.name, // 考试名称
- },
- });
- return
- }
- }
- // 评估 停用
- if (d.type == 11) {
- if (d.taskStatus == 1 || d.taskStatus == 2) {
- // ElMessage.error("该任务无法学习，请联系管理员进行替换。")
- dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
- dialogVisible.value = true;
- return
- }
- }
- // 其他活动 结束时间
- if (d.type == 9) {
- let date1 = new Date(d.endTime).getTime();
- let date2 = new Date().getTime();
- if (date1 < date2) {
- dialogVisibleTip.value = '当前活动已结束';
- dialogVisible.value = true;
- //return
- }
- }
- // 在线课 停用 -- 暂时没有在线课停用标记
- if (d.type == 1) {
- if (d.taskStatus == 1 || d.taskStatus == 2) {
- // ElMessage.error("该任务无法学习，请联系管理员进行替换。")
- dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
- dialogVisible.value = true;
- return
- }
- }
- // 面授课 停用
- if (d.type == 2) {
- if (d.taskStatus == 1 || d.taskStatus == 2) {
- // ElMessage.error("该任务无法学习，请联系管理员进行替换。")
- dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
- dialogVisible.value = true;
- return
- }
- }
- // 测评模块 请求接口跳转新的页面 - 新增 暂时未调试 目前无测评数据 2023-02-04
- if(d.type == 10) {
- // 此处判断测评跳转详情界面
- router.push({
- path: '/evaluation',
- query: {
- id: d.projectTaskId,
- type: PROJECT,
- infoId: data.value.projectId,
- courseId: d.courseId,
- pName: data.value.name,
- sName,
- chapterOrStageId,
- exname: d.name, // 测评名称
- btype: 1 // 1项目 2 路径图
- },
- });
- return
+ router.push({
+ path: '/externalexamination',
+ query: {
+ id: d.projectTaskId,
+ type: PROJECT,
+ infoId: data.value.projectId,
+ courseId: d.courseId,
+ pName: data.value.name,
+ sName,
+ chapterOrStageId,
+ exname: d.name, // 考试名称
+ },
+ });
+ return
+ }
+ }
+ // 评估 停用
+ if (d.type == 11) {
+ if (d.taskStatus == 1 || d.taskStatus == 2) {
+ // ElMessage.error("该任务无法学习，请联系管理员进行替换。")
+ dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
+ dialogVisible.value = true;
+ return
+ }
+ }
+ // 其他活动 结束时间
+ if (d.type == 9) {
+ let date1 = new Date(d.endTime).getTime();
+ let date2 = new Date().getTime();
+ if (date1 < date2) {
+ dialogVisibleTip.value = '当前活动已结束';
+ dialogVisible.value = true;
+ //return
+ }
+ }
+ // 在线课 停用 -- 暂时没有在线课停用标记
+ if (d.type == 1) {
+ if (d.taskStatus == 1 || d.taskStatus == 2) {
+ // ElMessage.error("该任务无法学习，请联系管理员进行替换。")
+ dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
+ dialogVisible.value = true;
+ return
+ }
+ }
+ // 面授课 停用
+ if (d.type == 2) {
+ if (d.taskStatus == 1 || d.taskStatus == 2) {
+ // ElMessage.error("该任务无法学习，请联系管理员进行替换。")
+ dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
+ dialogVisible.value = true;
+ return
+ }
+ }
+ // 测评模块 请求接口跳转新的页面 - 新增 暂时未调试 目前无测评数据 2023-02-04
+ if (d.type == 10) {
+ // 此处判断测评跳转详情界面
+ router.push({
+ path: '/evaluation',
+ query: {
+ id: d.projectTaskId,
+ type: PROJECT,
+ infoId: data.value.projectId,
+ courseId: d.courseId,
+ pName: data.value.name,
+ sName,
+ chapterOrStageId,
+ exname: d.name, // 测评名称
+ btype: 1 // 1项目 2 路径图
+ },
+ });
+ return
- // 调用接口 跳转页面
- console.log('我是查询测评跳转链接所传递得参数',{
- "businessType": "project",
- "chapterId": chapterOrStageId,
- "courseId": d.courseId,
- "quizKid": d.targetId,
- "routerOrProjectId": projectId,
- "studentId": userInfo.value.id,
- "studentName": userInfo.value.realName
- })
- request(EvaluationToLearn, {
- "businessType": "project",
- "chapterId": chapterOrStageId,
- "courseId": d.courseId,
- "quizKid": d.targetId,
- "routerOrProjectId": projectId,
- "studentId": userInfo.value.id,
- "studentName": userInfo.value.realName
- }).then(res=>{
- console.log(res)
- if(res.code==200){
- let jumpUrl = res.data.quizUrl
- // 此处写跳转url
- window.open( jumpUrl, '_top')
- }
- }).catch(err=>{
- console.log(err)
- })
- return
- }
+ // 调用接口 跳转页面
+ console.log('我是查询测评跳转链接所传递得参数', {
+ "businessType": "project",
+ "chapterId": chapterOrStageId,
+ "courseId": d.courseId,
+ "quizKid": d.targetId,
+ "routerOrProjectId": projectId,
+ "studentId": userInfo.value.id,
+ "studentName": userInfo.value.realName
+ })
+ request(EvaluationToLearn, {
+ "businessType": "project",
+ "chapterId": chapterOrStageId,
+ "courseId": d.courseId,
+ "quizKid": d.targetId,
+ "routerOrProjectId": projectId,
+ "studentId": userInfo.value.id,
+ "studentName": userInfo.value.realName
+ }).then(res => {
+ console.log(res)
+ if (res.code == 200) {
+ let jumpUrl = res.data.quizUrl
+ // 此处写跳转url
+ window.open(jumpUrl, '_top')
+ }
+ }).catch(err => {
+ console.log(err)
+ })
+ return
+ }
- if (!types.value.path[d.type]) {
- ElMessage.error("暂时未开放");
- return;
- }
+ if (!types.value.path[d.type]) {
+ ElMessage.error("暂时未开放");
+ return;
+ }
//更新学员当前任务
- request(UPDATE_CURRENT_TASK,{id:d.projectTaskId,type:PROJECT,pid:projectId,name:d.name})
- if (d.type == 3 || d.type == 7) {
- d.status!==1 && request(STUDY_RECORD, {
- studentId: userInfo.value.id,
- targetId: data.value.routerId,
- logo: PROJECT,
- stageOrChapterId: chapterOrStageId,
- taskId: d.projectTaskId,
- taskType: d.type,
- });
- // 此处判断外链跳转详情界面
- if(d.type==7){
- router.push({
- path: '/outerchain',
- query: {
- id: d.projectTaskId,
- type: PROJECT,
- infoId: data.value.projectId,
- courseId: d.courseId,
- pName: data.value.name,
- sName,
- chapterOrStageId,
- exname: d.name, // 外链名称
- },
- });
- return
- }
- }
+ await request(UPDATE_CURRENT_TASK, {id: d.projectTaskId, type: PROJECT, pid: projectId, name: d.name})
+ if (d.type == 3 || d.type == 7) {
+ d.status !== 1 && await request(STUDY_RECORD, {
+ studentId: userInfo.value.id,
+ targetId: data.value.routerId,
+ logo: PROJECT,
+ stageOrChapterId: chapterOrStageId,
+ taskId: d.projectTaskId,
+ taskType: d.type,
+ });
+ // 此处判断外链跳转详情界面
+ if (d.type == 7) {
+ router.push({
+ path: '/outerchain',
+ query: {
+ id: d.projectTaskId,
+ type: PROJECT,
+ infoId: data.value.projectId,
+ courseId: d.courseId,
+ pName: data.value.name,
+ sName,
+ chapterOrStageId,
+ exname: d.name, // 外链名称
+ },
+ });
+ return
+ }
+ }
- if (typeof types.value.path[d.type] === "string") {
- types.value.path[d.type] &&
- types.value.path[d.type].startsWith("http") &&
- window.open(types.value.path[d.type] + d.targetId,'_top');
- types.value.path[d.type] &&
- types.value.path[d.type].startsWith("/") &&
- router.push({
- path: types.value.path[d.type],
- query: {
- id: d.projectTaskId,
- type: PROJECT,
- infoId: data.value.projectId,
- courseId: d.courseId,
- pName: data.value.name,
- sName,
- chapterOrStageId,
- btype: 1
- },
- });
- } else if (typeof types.value.path[d.type] === "function") {
- types.value.path[d.type](d);
- }
+ if (typeof types.value.path[d.type] === "string") {
+ types.value.path[d.type] &&
+ types.value.path[d.type].startsWith("http") &&
+ window.open(types.value.path[d.type] + d.targetId, '_top');
+ types.value.path[d.type] &&
+ types.value.path[d.type].startsWith("/") &&
+ router.push({
+ path: types.value.path[d.type],
+ query: {
+ id: d.projectTaskId,
+ type: PROJECT,
+ infoId: data.value.projectId,
+ courseId: d.courseId,
+ pName: data.value.name,
+ sName,
+ chapterOrStageId,
+ btype: 1
+ },
+ });
+ } else if (typeof types.value.path[d.type] === "function") {
+ types.value.path[d.type](d);
+ }
}
function whiteTypes(type) {
return import.meta.env.VITE_TASK_WHITE_TYPE.includes("-" + type + "-");