last version

components/startLearning/learningAndExperiment/learningAndExperiment.vue

@@ -88,8 +88,8 @@
 				this.$emit("onClick_KSKC");
 			},
 			onClick_download_btn() {
-				
-				window.location.href = 'https://zhongchuan1.oss-cn-beijing.aliyuncs.com/WebDownload/%E5%BD%B1%E8%A7%86%E7%8E%B0%E5%9C%BA%E5%AE%9E%E6%97%B6%E7%89%B9%E6%95%88%E5%88%9B%E4%BD%9C%E5%AE%9E%E9%AA%8C%E5%AE%A2%E6%88%B7%E7%AB%AF.rar?versionId=CAEQGxiBgMDjteu1gRgiIDIwYzAwNzc2Zjk2OTRmNGQ5YjZhMDEwYWEzZjUxZGM3';
+				//客户端下载
+				window.location.href = 'https://zhongchuan1.oss-cn-beijing.aliyuncs.com/WebDownload/%E5%BD%B1%E8%A7%86%E7%8E%B0%E5%9C%BA%E5%AE%9E%E6%97%B6%E7%89%B9%E6%95%88%E5%88%9B%E4%BD%9C%E5%AE%9E%E9%AA%8C%E5%AE%A2%E6%88%B7%E7%AB%AF.rar?versionId=CAEQGxiBgIDo8L.sghgiIGQ1OWQwZDliMjgzMDQ5YmViN2U2ZTFmM2IzN2ViZjFm';
 			}
 		}
 	}

components/user/userController.js

@@ -302,8 +302,7 @@ userController = {
 		let Self = this;
 	// console.log('JSON.stringify(Self.data_scores)=',JSON.stringify(Self.data_scores))
 		MyRequest.GetUserInfo(function(res){
-			// console.log('0aaaaaa=',res)
-		// console.log('分数=',res)
+			// console.log('分数=',res)
 			let examUsingId = res.data.User.ExamUsingId;
 			console.log('examUsingId=',examUsingId)	
 			if(examUsingId===undefined || examUsingId==='')
@@ -316,7 +315,7 @@ userController = {
 					Self.setCurrentExam(function(res3){
 						console.log('设置当前实验id=',res3);
 					}, null);
-					
+					//如果开始时间为0
 					mydata_userInfo.StartTime = Math.round((new Date().getTime()+ 1000)/1000);
 					//var m = new Date();
 					//var n = new Date(m.getTime() + 1000 * 60)
@@ -349,12 +348,23 @@ userController = {
 			MyRequest.GetExam(function(res5)
 			{
 				console.log('res5=',res5)
-				mydata_userInfo.StartTime = res5.data.Exam.StartTime;
-				let  scoreStep = res5.data.Exam.ScoreStep;
-				
-				let scoreJson = JSON.parse(scoreStep);
+				//如果开始时间为0
+				if(res5.data.Exam.StartTime == 0)
+				{
+					mydata_userInfo.StartTime = Math.round((new Date().getTime()+ 1000)/1000);
+				}
+				else
+				{
+					mydata_userInfo.StartTime = res5.data.Exam.StartTime;
+				}
 				
-				data_scores = scoreJson;
+				let  scoreStep = res5.data.Exam.ScoreStep;
+				if(scoreStep != '')
+				{
+					data_scores = JSON.parse(scoreStep);
+				}
+				// let scoreJson = JSON.parse(scoreStep);
+				// data_scores = scoreJson;
 				// console.log('分数=',res5)
 			}, null);
 			

request.js

@@ -149,36 +149,6 @@ MyRequest = {
 	},
 	UpdateScoreStep(data, suc, fail) {
 		let jsonData = JSON.parse (data);
-		// console.log('jsonData=',jsonData)
-		// let startTime = 0; 
-		
-		// for(let i=0;i<jsonData.length;i++)
-		// {
-		// 	let sTime = jsonData[i].StartTime;
-		// 	if(sTime!=0)
-		// 	{
-		// 		startTime = sTime;
-		// 	}
-		// }
-		
-		// let endTime = 0;
-		
-		// for(let i=0;i<jsonData.length;i++)
-		// {
-		// 	let eTime = jsonData[i].EndTime;
-		// 	if(eTime!=0)
-		// 	{
-		// 		endTime = eTime;
-		// 	}
-		// }
-		
-		// // let sTime = new Date(startTime); 
-		// let sTime = new Date(this.dateFormat(startTime*1000));
-		// let eTime = new Date(this.dateFormat(endTime*1000));
-		// // console.log('eTime=',eTime)
-		// //分钟
-		// let timeUsed = Math.round((eTime-sTime)/1000);
-		// console.log('timeUsed=',timeUsed)
 		
 		let parameter={
 			"UserID":mydata_userInfo.UserID,