mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-10 11:26:43 +08:00
Merge branch '250220-pre-126-177-gx' into master_1202
This commit is contained in:
@@ -329,6 +329,8 @@ export default {
|
|||||||
apiExamPaper.newPaperContent(this.info.id).then(res=>{
|
apiExamPaper.newPaperContent(this.info.id).then(res=>{
|
||||||
if(!res.error&&res.result != ''){
|
if(!res.error&&res.result != ''){
|
||||||
if(this.info.paperType==2){
|
if(this.info.paperType==2){
|
||||||
|
//TODO1
|
||||||
|
console.log("调用开始考试 if paperType == 2")
|
||||||
this.examPaper.json=res.result;
|
this.examPaper.json=res.result;
|
||||||
let qitems=this.convertToItems(this.examPaper.json);
|
let qitems=this.convertToItems(this.examPaper.json);
|
||||||
this.paper ={items:qitems};
|
this.paper ={items:qitems};
|
||||||
@@ -336,9 +338,11 @@ export default {
|
|||||||
this.curItem=qitems[this.curIndex];
|
this.curItem=qitems[this.curIndex];
|
||||||
this.startTime=new Date();//记录开始时间
|
this.startTime=new Date();//记录开始时间
|
||||||
this.timerValue=this.info.testDuration;
|
this.timerValue=this.info.testDuration;
|
||||||
|
this.content.status=1;
|
||||||
this.timer=setInterval(this.changeTimer,60000);
|
this.timer=setInterval(this.changeTimer,60000);
|
||||||
this.testStart=true;
|
this.testStart=true;
|
||||||
}else{
|
}else{
|
||||||
|
console.log("调用开始考试 else paperType != 2")
|
||||||
let paper= {items:res.result};
|
let paper= {items:res.result};
|
||||||
paper.items.forEach(item=>{
|
paper.items.forEach(item=>{
|
||||||
if(item.type==101){
|
if(item.type==101){
|
||||||
@@ -585,8 +589,10 @@ export default {
|
|||||||
console.log("获取数据结果 考试 res ==>",res)
|
console.log("获取数据结果 考试 res ==>",res)
|
||||||
this.records.push(res.result);
|
this.records.push(res.result);
|
||||||
//TODO 评分更改 最终完成
|
//TODO 评分更改 最终完成
|
||||||
if(res.result.scope > res.result.passLine){
|
if(res.result.score > res.result.passLine){
|
||||||
this.content.status=9;//表已学习完,判断上级的章是否已完成
|
this.content.status=9;//表已学习完,判断上级的章是否已完成
|
||||||
|
}else{
|
||||||
|
this.content.status=1;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.studyItemId=res.result.studyItemId;//第一次保存时是没有的,所以这里要赋值
|
this.studyItemId=res.result.studyItemId;//第一次保存时是没有的,所以这里要赋值
|
||||||
|
|||||||
Reference in New Issue
Block a user