mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-10 19:36:43 +08:00
Merge branch 'zcwy_0723_hotforum' into master_1008
This commit is contained in:
@@ -326,12 +326,11 @@ export default {
|
||||
return qitems;
|
||||
},
|
||||
startTest(){
|
||||
if(this.info.paperType==2){
|
||||
apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
|
||||
if(rs.status=200){
|
||||
this.examPaper.json=JSON.parse(rs.result);
|
||||
//console.log(this.examPaper.json,'this.examPaper.json');
|
||||
let qitems=this.convertToItems(this.examPaper.json);
|
||||
apiExamPaper.newPaperContent(this.info.id).then(res=>{
|
||||
if(res.error == ''&&res.result != ''){
|
||||
if(this.info.paperType==2){
|
||||
this.examPaper.json=res.result;
|
||||
let qitems=this.convertToItems(this.examPaper.json);
|
||||
this.paper ={items:qitems};
|
||||
this.total=qitems.length;
|
||||
this.curItem=qitems[this.curIndex];
|
||||
@@ -340,34 +339,74 @@ export default {
|
||||
this.timer=setInterval(this.changeTimer,60000);
|
||||
this.testStart=true;
|
||||
}else{
|
||||
this.$message.error('加载试卷内容失败,请与管理员联系,试卷是否已删除');
|
||||
}
|
||||
})
|
||||
}else{
|
||||
let paper= JSON.parse(this.info.paperContent);
|
||||
paper.items.forEach(item=>{
|
||||
//console.log(item);
|
||||
if(item.type==101){
|
||||
item.userAnswer='';
|
||||
}else if(item.type==102){
|
||||
item.userAnswer=[];
|
||||
}else{
|
||||
item.userAnswer=''
|
||||
}
|
||||
item.options.forEach(opt=>{
|
||||
opt.checked=false;
|
||||
})
|
||||
});
|
||||
this.total=paper.items.length;
|
||||
this.paper =paper;
|
||||
//console.log(this.paper);
|
||||
let paper= {items:res.result};
|
||||
paper.items.forEach(item=>{
|
||||
if(item.type==101){
|
||||
item.userAnswer='';
|
||||
}else if(item.type==102){
|
||||
item.userAnswer=[];
|
||||
}else{
|
||||
item.userAnswer=''
|
||||
}
|
||||
item.options.forEach(opt=>{
|
||||
opt.checked=false;
|
||||
})
|
||||
});
|
||||
this.total=paper.items.length;
|
||||
this.paper =paper;
|
||||
|
||||
this.curItem=paper.items[this.curIndex];
|
||||
this.startTime=new Date();//记录开始时间
|
||||
this.timerValue=this.info.testDuration;
|
||||
this.timer=setInterval(this.changeTimer,60000);
|
||||
this.testStart=true;
|
||||
}
|
||||
this.curItem=paper.items[this.curIndex];
|
||||
this.startTime=new Date();//记录开始时间
|
||||
this.timerValue=this.info.testDuration;
|
||||
this.timer=setInterval(this.changeTimer,60000);
|
||||
this.testStart=true;
|
||||
}
|
||||
}else{
|
||||
this.$message.error('加载试卷内容失败,请与管理员联系,试卷是否已删除');
|
||||
}
|
||||
})
|
||||
// if(this.info.paperType==2){
|
||||
// apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
|
||||
// if(rs.status=200){
|
||||
// this.examPaper.json=JSON.parse(rs.result);
|
||||
// //console.log(this.examPaper.json,'this.examPaper.json');
|
||||
// let qitems=this.convertToItems(this.examPaper.json);
|
||||
// this.paper ={items:qitems};
|
||||
// this.total=qitems.length;
|
||||
// this.curItem=qitems[this.curIndex];
|
||||
// this.startTime=new Date();//记录开始时间
|
||||
// this.timerValue=this.info.testDuration;
|
||||
// this.timer=setInterval(this.changeTimer,60000);
|
||||
// this.testStart=true;
|
||||
// }else{
|
||||
// this.$message.error('加载试卷内容失败,请与管理员联系,试卷是否已删除');
|
||||
// }
|
||||
// })
|
||||
// }else{
|
||||
// let paper= JSON.parse(this.info.paperContent);
|
||||
// paper.items.forEach(item=>{
|
||||
// //console.log(item);
|
||||
// if(item.type==101){
|
||||
// item.userAnswer='';
|
||||
// }else if(item.type==102){
|
||||
// item.userAnswer=[];
|
||||
// }else{
|
||||
// item.userAnswer=''
|
||||
// }
|
||||
// item.options.forEach(opt=>{
|
||||
// opt.checked=false;
|
||||
// })
|
||||
// });
|
||||
// this.total=paper.items.length;
|
||||
// this.paper =paper;
|
||||
// //console.log(this.paper);
|
||||
|
||||
// this.curItem=paper.items[this.curIndex];
|
||||
// this.startTime=new Date();//记录开始时间
|
||||
// this.timerValue=this.info.testDuration;
|
||||
// this.timer=setInterval(this.changeTimer,60000);
|
||||
// this.testStart=true;
|
||||
// }
|
||||
},
|
||||
chooseOption(opt){
|
||||
if(this.curItem.type==101 || this.curItem.type==103){
|
||||
|
||||
Reference in New Issue
Block a user