last version

components/startLearning/learningAndExperiment/ksxx_xxysy_sjkc/ksxx_xxysy_sjkc.vue

@@ -235,9 +235,8 @@
 				this.allCheckedAnswer[this.curQIndex] = this.curCheckedAnswer;
 			},
 			onClick_test_a(answerI) {
-			    console.log("点击答案",answerI);
+				// console.log("点击答案");
 				let answer = this.curCheckedAnswer[answerI] == 1 ? 0 : 1;
-				console.log("对还是错",answer);
 				this.curCheckedAnswer[answerI] = answer;
 				this.allCheckedAnswer[this.curQIndex] = this.curCheckedAnswer;
 				this.$forceUpdate();
@@ -247,7 +246,6 @@
 				this.resetCurCheckedAnswer();
 			},
 			onClick_test_next() {
-				console.log("这道题选了什么", this.curCheckedAnswer);
 				if (this.checkedAnswer() == true) {
 					this.curQIndex++;
 					this.resetCurCheckedAnswer();
@@ -289,7 +287,7 @@
 				this.checkedIndex1 = 1;
 				let score = 5-this.allWrongTest.length;
 				this.totalScore = score;
-				
+				console.log("xxysy分数=",score);
 				this.endTime = new Date();
 				userController.setupScore_sjkc(this.startTime,this.endTime,score,function(res){
 					// alert("提交成功");
@@ -307,7 +305,7 @@
 					//把用户选择的答案放进去
 					let curCheckedLetter = '我的答案：【';
 					for (let j = 0; j < this.allCheckedAnswer[this.allWrongTest[i]].length; j++) {
-						if (this.allCheckedAnswer[i][j] == 1) {
+						if (this.allCheckedAnswer[this.allWrongTest[i]][j] == 1) {
 							curCheckedLetter += this.test_answer_pre[j];
 							curCheckedLetter += ','
 						}

components/startLearning/learningAndExperiment/ksxx_xxysy_ylrz/ksxx_xxysy_ylrz.vue

@@ -26,6 +26,7 @@
 		<!-- 右边详情页 -->
 		<scroll-view class="rightBox" scroll-y="true" :scroll-top="scrollTop" @scroll="scroll">
 			<view class="">
+				<!-- <view class="rightBox showboder2"> -->
 				<!-- 学习知识点 -->
 				<view class="right-content df fdc" v-show="checkedIndex1==0">
 					<view v-for="(content,n) in myData_YLRZ_ZSD[checkedIndex2].content" :key="n">
@@ -109,9 +110,21 @@
 							<view class="ylrz-test-q">
 								{{(wrong+1)+'、'+test_YLRZ.list[wrong].q}}
 							</view>
+							<!-- 答案 -->
+							<!-- <view class="ylrz-test-a-box">
+								<view class="ylrz-test-a-box2">
+									<view class="df aic fdr ylrz-test-a" v-for="(answer2,answerI2) in test_YLRZ.list[wrong].a_list" :key="answerI2">
+										<img class="ylrz-test-a-img" :src="test_YLRZ.list[wrong].a[answerI2]==1?test_answer_icon_checked:allCheckedAnswer[wrong][answerI2]==1?test_answer_icon_wrong:test_answer_icon_unchecked"></img>
+										<view class="ylrz-test-a-text" :style="{color:test_YLRZ.list[wrong].a[answerI2]==1?test_answer_color_checked:allCheckedAnswer[wrong][answerI2]==1?test_answer_color_wrong:test_answer_color_unchecked}">
+											{{test_answer_pre[answerI2]+':'+answer2}}
+										</view>
+									</view>
+								</view>
+							</view> -->
 							<view class="ylrz-test-a-box">
 								<view class="ylrz-test-a-box2">
 									<view class="df aic fdr ylrz-test-a" v-for="(answer2,answerI2) in test_YLRZ.list[wrong].a_list" :key="answerI2">
+										<!-- <img class="ylrz-test-a-img" :src="test_YLRZ.list[wrong].a[answerI2]==1?test_answer_icon_checked:allCheckedAnswer[wrong][answerI2]==1?test_answer_icon_wrong:test_answer_icon_unchecked"></img> -->
 										<view class="ylrz-test-a-text">
 											{{test_answer_pre[answerI2]+':'+answer2}}
 										</view>
@@ -201,7 +214,9 @@
 		},
 		methods: {
 			initData() {
-				mydata_examInfo.StartTime = Math.round((new Date().getTime() - 1000)/1000);
+				// this.checkedIndex1 = 0;
+				// this.checkedIndex2 = 0;
+				// console.log('111111111111111')
 				
 				let startTimeInt = userController.data_scores[0].StartTime;
 				if(startTimeInt==0)
@@ -210,7 +225,7 @@
 					return;
 				}
 				
-				//怕和开始时间重叠 加1秒
+				//this.startTime = new Date(startTimeInt).getTime()/1000;
 				this.startTime = Math.round((new Date().getTime()+ 1000)/1000);
 			},
 			onLeftBtn1Click(index) {
@@ -262,9 +277,8 @@
 				this.allCheckedAnswer[this.curQIndex] = this.curCheckedAnswer;
 			},
 			onClick_test_a(answerI) {
-				console.log("点击答案",answerI);
+				// console.log("点击答案");
 				let answer = this.curCheckedAnswer[answerI] == 1 ? 0 : 1;
-				console.log("对还是错",answer);
 				this.curCheckedAnswer[answerI] = answer;
 				this.allCheckedAnswer[this.curQIndex] = this.curCheckedAnswer;
 				this.$forceUpdate();
@@ -274,7 +288,7 @@
 				this.resetCurCheckedAnswer();
 			},
 			onClick_test_next() {
-			    console.log("这道题选了什么", this.curCheckedAnswer);
+				 // console.log("这道题选了什么", this.curCheckedAnswer);
 				if (this.checkedAnswer() == true) {
 					this.curQIndex++;
 					this.resetCurCheckedAnswer();
@@ -316,7 +330,7 @@
 				//let score = 10 - this.allWrongTest.length;
 				let score = 20 - this.allWrongTest.length*2;
 				this.totalScore = score;
-				
+				console.log("ylrz分数=",score);
 				this.endTime = new Date();
 				userController.setupScore_ylrz(this.startTime,this.endTime,score,function(res){
 					// alert("提交成功");
@@ -334,7 +348,7 @@
 					//把用户选择的答案放进去
 					let curCheckedLetter = '我的答案：【';
 					for (let j = 0; j < this.allCheckedAnswer[this.allWrongTest[i]].length; j++) {
-						if (this.allCheckedAnswer[i][j] == 1) {
+						if (this.allCheckedAnswer[this.allWrongTest[i]][j] == 1) {
 							curCheckedLetter += this.test_answer_pre[j];
 							curCheckedLetter += ','
 						}

components/startLearning/learningAndExperiment/learningAndExperiment.vue

@@ -89,23 +89,7 @@
 			},
 			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=CAEQGBiBgMCIoq.v9BciIDAzOTY2ZTVmZjhjNzRjYTdhYTgxMGMwNThjZGUyNmMy';
-				
-				// let url = mydata_api + "/file/simulationexe";
-				// uni.request({
-				// 	url: url, //仅为示例，并非真实接口地址。
-				// 	success: (res) => {
-				// 		console.log('get成功');
-				// 		console.log(res.data);
-
-				// 		window.location.href = res.data;
-
-				// 	},
-				// 	fail: (res) => {
-				// 		console.log('get失败');
-				// 		console.log(res.data);
-				// 	}
-				// });
+				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';
 			}
 		}
 	}

components/user/userController.js

@@ -305,11 +305,7 @@ userController = {
 			// console.log('0aaaaaa=',res)
 		// console.log('分数=',res)
 			let examUsingId = res.data.User.ExamUsingId;
-			console.log('examUsingId=',examUsingId);
-			//if(mydata_examInfo.StartTime==0)
-			//{
-			//	mydata_examInfo.StartTime = Math.round((new Date().getTime()+ 1000)/1000);
-			//}
+			console.log('examUsingId=',examUsingId)	
 			if(examUsingId===undefined || examUsingId==='')
 			{
 				MyRequest.CreateExam(function(res2,suc){
@@ -321,8 +317,7 @@ userController = {
 						console.log('设置当前实验id=',res3);
 					}, null);
 					
-					//mydata_examInfo.StartTime = Math.round((new Date().getTime()+ 1000)/1000);
-					//console.log('登录时间戳=',mydata_examInfo.StartTime);
+					mydata_userInfo.StartTime = Math.round((new Date().getTime()+ 1000)/1000);
 					//var m = new Date();
 					//var n = new Date(m.getTime() + 1000 * 60)
 					
@@ -330,7 +325,7 @@ userController = {
 						"UserID":mydata_userInfo.UserID,
 						"ExamId": mydata_examInfo.Id,
 						"Score":JSON.stringify(Self.data_scores),
-						"StartTime":mydata_examInfo.StartTime,
+						"StartTime":mydata_userInfo.StartTime,
 						"EndTime":0,					
 						"TimeUsed":0	
 					}
@@ -354,7 +349,7 @@ userController = {
 			MyRequest.GetExam(function(res5)
 			{
 				console.log('res5=',res5)
-				mydata_examInfo.StartTime = res5.data.Exam.StartTime;
+				mydata_userInfo.StartTime = res5.data.Exam.StartTime;
 				let  scoreStep = res5.data.Exam.ScoreStep;
 				
 				let scoreJson = JSON.parse(scoreStep);

myData.js

@@ -39,4 +39,4 @@ mydata_examInfo = {
 // mydata_api='http://8.140.128.1:8085'
 // mydata_api='http://ilabtft.cuc.edu.cn/web'
 //mydata_api='http://www.tanhuagame.com:8085/web'
-mydata_api='https://ilabtft.cuc.edu.cn/web'
+ mydata_api='https://ilabtft.cuc.edu.cn/web'

pages/home.vue

@@ -221,7 +221,7 @@
 						let data = res.data;
 						//登录成功
 						if (data.Code == 100) {
-							//console.log('登录时间戳=',new Date().getTime());
+							console.log('登录时间戳=',new Date().getTime());
 							console.log("home从保存用户名密码登录data=", data);
 								console.log("Token=", data.Token);
 							this.onLoginSuccess(data.UserID,data.Name,data.Type,data.Image);

request.js

@@ -149,12 +149,42 @@ 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,
 			"ExamId": mydata_examInfo.Id,
 			"Score":JSON.stringify(jsonData),
-			"StartTime":mydata_examInfo.StartTime,
+			"StartTime":mydata_userInfo.StartTime,
 			"EndTime":0,					
 			"TimeUsed":0	
 		}