|
@@ -305,7 +305,11 @@ userController = {
|
|
|
// console.log('0aaaaaa=',res)
|
|
// console.log('0aaaaaa=',res)
|
|
|
// console.log('分数=',res)
|
|
// console.log('分数=',res)
|
|
|
let examUsingId = res.data.User.ExamUsingId;
|
|
let examUsingId = res.data.User.ExamUsingId;
|
|
|
- console.log('examUsingId=',examUsingId)
|
|
|
|
|
|
|
+ console.log('examUsingId=',examUsingId);
|
|
|
|
|
+ //if(mydata_examInfo.StartTime==0)
|
|
|
|
|
+ //{
|
|
|
|
|
+ // mydata_examInfo.StartTime = Math.round((new Date().getTime()+ 1000)/1000);
|
|
|
|
|
+ //}
|
|
|
if(examUsingId===undefined || examUsingId==='')
|
|
if(examUsingId===undefined || examUsingId==='')
|
|
|
{
|
|
{
|
|
|
MyRequest.CreateExam(function(res2,suc){
|
|
MyRequest.CreateExam(function(res2,suc){
|
|
@@ -317,7 +321,8 @@ userController = {
|
|
|
console.log('设置当前实验id=',res3);
|
|
console.log('设置当前实验id=',res3);
|
|
|
}, null);
|
|
}, null);
|
|
|
|
|
|
|
|
- mydata_userInfo.StartTime = Math.round((new Date().getTime()+ 2000)/1000);
|
|
|
|
|
|
|
+ //mydata_examInfo.StartTime = Math.round((new Date().getTime()+ 1000)/1000);
|
|
|
|
|
+ //console.log('登录时间戳=',mydata_examInfo.StartTime);
|
|
|
//var m = new Date();
|
|
//var m = new Date();
|
|
|
//var n = new Date(m.getTime() + 1000 * 60)
|
|
//var n = new Date(m.getTime() + 1000 * 60)
|
|
|
|
|
|
|
@@ -325,7 +330,7 @@ userController = {
|
|
|
"UserID":mydata_userInfo.UserID,
|
|
"UserID":mydata_userInfo.UserID,
|
|
|
"ExamId": mydata_examInfo.Id,
|
|
"ExamId": mydata_examInfo.Id,
|
|
|
"Score":JSON.stringify(Self.data_scores),
|
|
"Score":JSON.stringify(Self.data_scores),
|
|
|
- "StartTime":mydata_userInfo.StartTime,
|
|
|
|
|
|
|
+ "StartTime":mydata_examInfo.StartTime,
|
|
|
"EndTime":0,
|
|
"EndTime":0,
|
|
|
"TimeUsed":0
|
|
"TimeUsed":0
|
|
|
}
|
|
}
|
|
@@ -349,7 +354,7 @@ userController = {
|
|
|
MyRequest.GetExam(function(res5)
|
|
MyRequest.GetExam(function(res5)
|
|
|
{
|
|
{
|
|
|
console.log('res5=',res5)
|
|
console.log('res5=',res5)
|
|
|
- mydata_userInfo.StartTime = res5.data.Exam.StartTime;
|
|
|
|
|
|
|
+ mydata_examInfo.StartTime = res5.data.Exam.StartTime;
|
|
|
let scoreStep = res5.data.Exam.ScoreStep;
|
|
let scoreStep = res5.data.Exam.ScoreStep;
|
|
|
|
|
|
|
|
let scoreJson = JSON.parse(scoreStep);
|
|
let scoreJson = JSON.parse(scoreStep);
|
|
@@ -459,11 +464,6 @@ userController = {
|
|
|
data[0].Evaluation='优秀';
|
|
data[0].Evaluation='优秀';
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if( data[0].Score == 0)
|
|
|
|
|
- {
|
|
|
|
|
- data[0].Evaluation='不及格';
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
data[0].RepeatCount=data[0].RepeatCount+1;
|
|
data[0].RepeatCount=data[0].RepeatCount+1;
|
|
|
// console.log("原理认知上传分数333----",data);
|
|
// console.log("原理认知上传分数333----",data);
|
|
|
// MyRequest.SetupScore(data,suc, fail);
|
|
// MyRequest.SetupScore(data,suc, fail);
|