-- fix bug

This commit is contained in:
yuping
2023-02-18 01:40:57 +08:00
parent a27d7e0238
commit 5dc9c0ef0d

View File

@@ -335,7 +335,7 @@
{{item.name}} {{item.name}}
</div> </div>
<div style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;"> <div style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;">
{{tabValue==1?item.pointsCount:item.rateStr}} {{tabValue==1?item?.pointsCount:item?.rateStr}}
</div> </div>
</div> </div>
@@ -369,10 +369,10 @@
style="width: 28px; height: 28px;border-radius: 28px;" style="width: 28px; height: 28px;border-radius: 28px;"
:src="tableRankData[myIndex-1]?.avatar" :src="tableRankData[myIndex-1]?.avatar"
/> />
{{tableRankData[myIndex-1].name}} {{tableRankData[myIndex-1]?.name}}
</div> </div>
<div style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;"> <div style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;">
{{tabValue==1?tableRankData[myIndex-1].pointsCount:tableRankData[myIndex-1].rateStr}} {{tabValue==1?tableRankData[myIndex-1]?.pointsCount:tableRankData[myIndex-1]?.rateStr}}
</div> </div>
</div> </div>
@@ -607,9 +607,10 @@ function judgeTaskIsEnd(type, endTimes, status) {
case 1: case 1:
status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false;
break; break;
case 3: //案例么有时间限制
status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; // case 3:
break; // status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false;
// break;
case 5: case 5:
status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false;
break; break;
@@ -623,9 +624,9 @@ function judgeTaskIsEnd(type, endTimes, status) {
return isEnd; return isEnd;
} }
function toFinish(d, sName, chapterOrStageId) { async function toFinish(d, sName, chapterOrStageId) {
console.log("dddddd", d, sName, chapterOrStageId); console.log("dddddd", d, sName, chapterOrStageId);
if(judgeTaskIsEnd(d.type ,data.value.endTime, data.value.status)){ if (judgeTaskIsEnd(d.type, data.value.endTime, data.value.status)) {
ElMessage.error("当前任务已结束") ElMessage.error("当前任务已结束")
return return
} }
@@ -669,7 +670,7 @@ function toFinish(d, sName, chapterOrStageId) {
return return
} }
// 此处判断外部考试跳转 // 此处判断外部考试跳转
if(d.examType==2){ if (d.examType == 2) {
// 点击即更新状态 进行中 // 点击即更新状态 进行中
request(SubmitExternalExam, { request(SubmitExternalExam, {
@@ -678,9 +679,9 @@ function toFinish(d, sName, chapterOrStageId) {
"externalName": d.name, "externalName": d.name,
"targetId": data.value.projectId, "targetId": data.value.projectId,
"studentNo": userInfo.value.userNo "studentNo": userInfo.value.userNo
}).then(res=>{ }).then(res => {
console.log(res) console.log(res)
}).catch(err=>{ }).catch(err => {
console.log(err) console.log(err)
}) })
@@ -738,7 +739,7 @@ function toFinish(d, sName, chapterOrStageId) {
} }
} }
// 测评模块 请求接口跳转新的页面 - 新增 暂时未调试 目前无测评数据 2023-02-04 // 测评模块 请求接口跳转新的页面 - 新增 暂时未调试 目前无测评数据 2023-02-04
if(d.type == 10) { if (d.type == 10) {
// 此处判断测评跳转详情界面 // 此处判断测评跳转详情界面
router.push({ router.push({
path: '/evaluation', path: '/evaluation',
@@ -757,7 +758,7 @@ function toFinish(d, sName, chapterOrStageId) {
return return
// 调用接口 跳转页面 // 调用接口 跳转页面
console.log('我是查询测评跳转链接所传递得参数',{ console.log('我是查询测评跳转链接所传递得参数', {
"businessType": "project", "businessType": "project",
"chapterId": chapterOrStageId, "chapterId": chapterOrStageId,
"courseId": d.courseId, "courseId": d.courseId,
@@ -774,14 +775,14 @@ function toFinish(d, sName, chapterOrStageId) {
"routerOrProjectId": projectId, "routerOrProjectId": projectId,
"studentId": userInfo.value.id, "studentId": userInfo.value.id,
"studentName": userInfo.value.realName "studentName": userInfo.value.realName
}).then(res=>{ }).then(res => {
console.log(res) console.log(res)
if(res.code==200){ if (res.code == 200) {
let jumpUrl = res.data.quizUrl let jumpUrl = res.data.quizUrl
// 此处写跳转url // 此处写跳转url
window.open( jumpUrl, '_top') window.open(jumpUrl, '_top')
} }
}).catch(err=>{ }).catch(err => {
console.log(err) console.log(err)
}) })
return return
@@ -792,9 +793,9 @@ function toFinish(d, sName, chapterOrStageId) {
return; return;
} }
//更新学员当前任务 //更新学员当前任务
request(UPDATE_CURRENT_TASK,{id:d.projectTaskId,type:PROJECT,pid:projectId,name:d.name}) await request(UPDATE_CURRENT_TASK, {id: d.projectTaskId, type: PROJECT, pid: projectId, name: d.name})
if (d.type == 3 || d.type == 7) { if (d.type == 3 || d.type == 7) {
d.status!==1 && request(STUDY_RECORD, { d.status !== 1 && await request(STUDY_RECORD, {
studentId: userInfo.value.id, studentId: userInfo.value.id,
targetId: data.value.routerId, targetId: data.value.routerId,
logo: PROJECT, logo: PROJECT,
@@ -803,7 +804,7 @@ function toFinish(d, sName, chapterOrStageId) {
taskType: d.type, taskType: d.type,
}); });
// 此处判断外链跳转详情界面 // 此处判断外链跳转详情界面
if(d.type==7){ if (d.type == 7) {
router.push({ router.push({
path: '/outerchain', path: '/outerchain',
query: { query: {
@@ -824,7 +825,7 @@ function toFinish(d, sName, chapterOrStageId) {
if (typeof types.value.path[d.type] === "string") { if (typeof types.value.path[d.type] === "string") {
types.value.path[d.type] && types.value.path[d.type] &&
types.value.path[d.type].startsWith("http") && types.value.path[d.type].startsWith("http") &&
window.open(types.value.path[d.type] + d.targetId,'_top'); window.open(types.value.path[d.type] + d.targetId, '_top');
types.value.path[d.type] && types.value.path[d.type] &&
types.value.path[d.type].startsWith("/") && types.value.path[d.type].startsWith("/") &&
router.push({ router.push({