mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-17 23:06:45 +08:00
Merge branch 'dev0124' into dev0515
This commit is contained in:
@@ -16,7 +16,7 @@
|
|||||||
<li v-if="testPaper.deadlineTime">结束时间: {{ testPaper.deadlineTime }}</li>
|
<li v-if="testPaper.deadlineTime">结束时间: {{ testPaper.deadlineTime }}</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="testPaper.testFront" style="padding: 20px;text-align: center;" v-html="testPaper.testFront">
|
<div v-if="testPaper.testFront && testPaper.testFront != 'null'" style="padding: 20px;text-align: center;" v-html="testPaper.testFront">
|
||||||
<!--考前说明-->
|
<!--考前说明-->
|
||||||
</div>
|
</div>
|
||||||
<div v-if="canExam" class="test-time" style="margin-top:20px" >
|
<div v-if="canExam" class="test-time" style="margin-top:20px" >
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<el-table :data="tableData" style="width: 100%" v-if="loading == 2">
|
<el-table :data="tableData" style="width: 100%" v-if="loading == 2">
|
||||||
<el-table-column prop="startTime" label="完成时间" width="200"></el-table-column>
|
<el-table-column prop="endTime" label="完成时间" width="200"></el-table-column>
|
||||||
<el-table-column prop="score" align="center" label="成绩">
|
<el-table-column prop="score" align="center" label="成绩">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{toScoreTow(scope.row.score)}}分</span>
|
<span>{{toScoreTow(scope.row.score)}}分</span>
|
||||||
|
|||||||
@@ -692,6 +692,9 @@ export default {
|
|||||||
console.log(item,'在线')
|
console.log(item,'在线')
|
||||||
this.$router.push("/course/studyindex?id=" + item.targetId);
|
this.$router.push("/course/studyindex?id=" + item.targetId);
|
||||||
}else if (item.type == 5) {
|
}else if (item.type == 5) {
|
||||||
|
if(item.examType == 2){
|
||||||
|
window.open(`${process.env.VUE_APP_BOE_WEB_URL}/fe-student/externalexamination?id=${item.id}&type=${item.type}&infoId=${item.id}&courseId=${item.id}&pName=${item.name}&exname=${item.name}&chapterOrStageId=${0}`)
|
||||||
|
}
|
||||||
console.log(item,'考试')
|
console.log(item,'考试')
|
||||||
this.$router.push("exam/test?id=" + item.targetId);
|
this.$router.push("exam/test?id=" + item.targetId);
|
||||||
}else{
|
}else{
|
||||||
|
|||||||
Reference in New Issue
Block a user