实景勘察加测验；

components/home/teacher/project.vue

@@ -747,15 +747,16 @@
 					}
 				});
 			},
-			//删除条目
+			//删除项目
 			deleteItemProject(){
-				console.log('UserID=',this.$UserId)
-				console.log('ProjectID=',this.projectData[0].Id)
+				// console.log('this.$Api=',this.$Api)
+				// console.log('UserID=',this.$UserId)
+				// console.log('ProjectID=',this.projectData[0].Id)
 				var temp = {
 					"UserID":this.projectData[0].CreateUserID,
 					"ProjectID" : this.projectData[0].Id,
 				}
-				console.log("要删除过去的数据为",temp)
+				console.log("要删除过去的项目为",temp)
 				uni.request({
 					url: this.$Api + "/backstage/deleteproject",
 					data: temp,

components/startLearning/learningAndExperiment/ksxx_xxysy_sjkc/ksxx_xxysy_sjkc.vue

@@ -27,7 +27,7 @@
 		<scroll-view class="rightBox" scroll-y="true" :scroll-top="scrollTop" @scroll="scroll">
 			<view class="">
 				<!-- 学习知识点 -->
-				<view class="right-content df fdc" v-show="checkedIndex1==0">
+				<!-- <view class="right-content df fdc" v-show="checkedIndex1==0">
 					<view v-for="(content,n) in myData_SJKC_ZSD[checkedIndex2].content" :key="n">
 						<view class="right-title df aic" v-show="content.type=='title'">
 							<view class="right-title-line"></view>
@@ -42,9 +42,9 @@
 					<view class="df jcc">
 						<view class="right-btn-next df aic jcc" @click="onClick_next">下一步</view>
 					</view>
-				</view>
+				</view> -->
 				<!-- 测验 -->
-				<view class="ylrz-cy df" v-show="checkedIndex1==1">
+				<view class="ylrz-cy df" v-show="checkedIndex1==0">
 					<!-- 开始测验 -->
 					<view class="ylrz-cy df jcc aic" v-show="testIndex==0">
 						<view class="df fdc ylrz-kscy-box">
@@ -97,7 +97,7 @@
 					</view>
 				</view>
 				<!-- 结论 -->
-				<view class="ylrz-cy-jl df" v-show="checkedIndex1==2">
+				<view class="ylrz-cy-jl df" v-show="checkedIndex1==1">
 					<view class="ylrz-cy-dt df fdc" v-show="testIndex==1">
 						<view class="right-title df aic">
 							<view class="right-title-line"></view>
@@ -109,7 +109,7 @@
 								{{(wrong+1)+'、'+test_YLRZ.list[wrong].q}}
 							</view>
 							<!-- 答案 -->
-							<view class="ylrz-test-a-box">
+							<!-- <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>
@@ -118,7 +118,19 @@
 										</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>
+									</view>
+								</view>
 							</view>
+							<view>{{allWrong_checked_letter[wrongIndex]}}</view>
+							<view>{{allWrong_right_letter[wrongIndex]}}</view>
 						</view>
 						<view class="ylrz-test-btn-exit ylrz-test-btn-red df aic jcc" @click="onClick_test_exit">退出</view>
 					</view>
@@ -142,6 +154,10 @@
 				curCheckedAnswer: [],
 				//玩家选择的答案
 				allCheckedAnswer: [],
+				//用户错题答案的字母
+				allWrong_checked_letter: [],
+				//正确答案的字母
+				allWrong_right_letter: [],
 				//玩家错误的题目序列号
 				allWrongTest: [],
 				scrollTop: 0,
@@ -149,12 +165,13 @@
 
 				// ------以下为静态
 				arrowSrc: require('../../../../assets/learning/icon_ylrz_arrow.png'),
-				btnList: [{
-						"text": '实景勘察',
-						"icon_btn1_checked": require('../../../../assets/learning/icon_ylrz_menu_02.png'),
-						"icon_btn1_unchecked": require('../../../../assets/learning/icon_ylrz_menu_01.png'),
-						"list": ['实景学习模块']
-					},
+				btnList: [
+					// {
+					// 	"text": '实景勘察',
+					// 	"icon_btn1_checked": require('../../../../assets/learning/icon_ylrz_menu_02.png'),
+					// 	"icon_btn1_unchecked": require('../../../../assets/learning/icon_ylrz_menu_01.png'),
+					// 	"list": ['实景学习模块']
+					// },
 					{
 						"text": '测验（完成获得10分）',
 						"icon_btn1_checked": require('../../../../assets/learning/icon_ylrz_menu_02.png'),
@@ -178,7 +195,7 @@
 				],
 				text_ksdt: '你必须正确回答所有测试问题才能完成课程。测试没有次数限制，也没有惩罚，即使你已经通过测试也可以再次回答。你可以在课程页面上的测试模块中点击“结果‘按钮查看测试结果的详细报告。',
 				//原理认知测试题
-				test_YLRZ: myData_test_YLRZ,
+				test_YLRZ: myData_test_SJKC,
 				//答案小标号
 				test_answer_pre: ['A', 'B', 'C', 'D', 'E', 'F', 'G'],
 				test_answer_icon_checked: require('../../../../assets/learning/icon_test_03_02.png'),
@@ -289,14 +306,55 @@
 					}
 				}
 				console.log("检测结果为", this.allWrongTest);
-				this.checkedIndex1 = 2;
-				let score = 10-this.allWrongTest.length;
+				this.updateCheckedAnswerLetter();
+				this.checkedIndex1 = 1;
+				let score = 5-this.allWrongTest.length;
 				userController.setupScore_sjkc(score,function(res){
 					alert("提交成功");
 				},function(res){
 					alert("提交失败");
 				});
 			},
+			//更新用户选择答案字母
+			updateCheckedAnswerLetter() {
+				this.allWrong_checked_letter = [];
+				// console.log("更新用户选择答案字母", this.allCheckedAnswer, this.allWrongTest);
+				for (let i = 0; i < this.allWrongTest.length; i++) {
+					//把用户选择的答案放进去
+					let curCheckedLetter = '我的答案：【';
+					for (let j = 0; j < this.allCheckedAnswer[i].length; j++) {
+						if (this.allCheckedAnswer[i][j] == 1) {
+							curCheckedLetter += this.test_answer_pre[j];
+							curCheckedLetter += ','
+						}
+					}
+					if (curCheckedLetter[curCheckedLetter.length - 1] == ',') {
+						curCheckedLetter = curCheckedLetter.substring(0, curCheckedLetter.length - 1);
+					}
+					curCheckedLetter += '】';
+					this.allWrong_checked_letter.push(curCheckedLetter);
+				}
+				// console.log("用户选择的答案", this.allWrong_checked_letter);
+
+				this.allWrong_right_letter = [];
+				for (let i = 0; i < this.allWrongTest.length; i++) {
+					//把正确的答案放进去
+					let curRightLetter = '正确答案：【';
+					let testIndex = this.allWrongTest[i];
+					for (let j = 0; j < this.test_YLRZ.list[testIndex].a.length; j++) {
+						if (this.test_YLRZ.list[testIndex].a[j] == 1) {
+							curRightLetter += this.test_answer_pre[j];
+							curRightLetter += ','
+						}
+					}
+					if (curRightLetter[curRightLetter.length - 1] == ',') {
+						curRightLetter = curRightLetter.substring(0, curRightLetter.length - 1);
+					}
+					curRightLetter += '】'
+					this.allWrong_right_letter.push(curRightLetter);
+				}
+				// console.log("正确答案", this.allWrong_right_letter);
+			},
 			onClick_test_exit() {
 				this.checkedIndex1 = 1;
 				this.testIndex = 0;

components/startLearning/learningAndExperiment/ksxx_xxysy_ylrz/ksxx_xxysy_ylrz.vue

@@ -318,11 +318,11 @@
 				this.updateCheckedAnswerLetter();
 				this.checkedIndex1 = 2;
 				let score = 10 - this.allWrongTest.length;
-				// userController.setupScore_ylrz(score,function(res){
-				// 	alert("提交成功");
-				// },function(res){
-				// 	alert("提交失败");
-				// });
+				userController.setupScore_ylrz(score,function(res){
+					alert("提交成功");
+				},function(res){
+					alert("提交失败");
+				});
 			},
 			//更新用户选择答案字母
 			updateCheckedAnswerLetter() {

components/startLearning/learningAndExperiment/learningAndExperiment.vue

@@ -21,7 +21,10 @@
 			<!-- 按钮 -->
 			<view class="df jcc">
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==0' @click="onClick_KSRZ">开始认知</view>
-				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==1' @click="onClick_KSKC">开始勘察</view>
+				<view class="df jcc fdc">
+					<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==1' @click="onClick_KSKC">开始勘察</view>
+					<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==1' @click="onClick_KSCY">开始测验</view>
+				</view>
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==2' @click="onClick_download_btn">下载客户端</view>
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==3' @click="onClick_download_btn">下载客户端</view>
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==4'>进入虚拟资源库</view>
@@ -77,6 +80,9 @@
 				this.$emit("onShowWebview720");
 				// this.$emit("onClick_KSKC")
 			},
+			onClick_KSCY(){
+				this.$emit("onClick_KSKC");
+			},
 			onClick_download_btn() {
 				let url = this.$Api + "/file/simulationexe";
 				uni.request({

components/user/userController.js

@@ -3,6 +3,7 @@ userController = {
 	updateScore: function() {
 		MyRequest.GetScore(function(res) {
 			userController.data_scores = res.data.Scores;
+			console.log("获取分数",res);
 			// console.log("******", userController,userController.data_scores);
 		}, null);
 	},
@@ -81,7 +82,8 @@ userController = {
 		// console.log("请求上传分数1111----",score);
 		// let data = JSON.parse(userController.data_scores); 
 		let data = userController.data_scores;
-		// console.log("请求上传分数2222----",typeof(data),data.length,"====",data[15].Score,"----",data[14].Score);
+		// console.log("请求上传分数2222----",typeof(data),data.length,"====");
+		// console.log("请求上传分数2222----",data[15].Score,"----",data[14].Score);
 		data[1].Score=Number(score);
 		// console.log("请求上传分数3333----",data);
 		MyRequest.SetupScore(data,suc, fail);

myData/myData_tests.js

@@ -54,3 +54,35 @@ myData_test_YLRZ={
 		},
 	]
 }
+// 测验题目-实景勘察
+myData_test_SJKC={
+	"test":'实景勘察',
+	"list":[
+		{
+			"q":'虚拟制片是',
+			"a_list":['一种全新的制片方式。','一种全新的创作流程。','制片人通过虚拟技术管理的方法。','一种所见即所得的创作方式。'],
+			"a":[1,1,0,1]
+		},
+		{
+			"q":'UE',
+			"a_list":['是虚拟引擎。','最初用于游戏行业，核心是实时渲染技术。','在现阶段，相比Unity有更加逼真的效果，因此更多应用于影视行业。Unity更具有使用环境便捷，灵活低廉等优势，广泛应用于博物馆、展览等行业，其高清管线技术正在弥补其逼真度的劣势问题。','在虚拟制片中处于核心地位。'],
+			"a":[1,1,1,1]
+		},
+		{
+			"q":'虚拟制片流程的特点是',
+			"a_list":['将前期虚拟艺术直接投入制作使用，有效节省资本与时间。','改变传统的依次创作流程，在中期拍摄阶段实现各部门的实时协作。','节省后期合成时间成本，避免传统绿屏拍摄的溢出等问题。','在现场，使各部门都能感受到最终场景的气氛，有利于各部门创作。'],
+			"a":[1,1,1,1]
+		},
+		{
+			"q":'下列属于虚拟制片的是',
+			"a_list":['运动捕捉','实时抠像','虚拟','LED幕布'],
+			"a":[1,1,1,1]
+		},
+		{
+			"q":'虚拟制片流程更适用于',
+			"a_list":['工业级特效电影','文艺片','现实题材电影','大量绿屏拍摄电影'],
+			"a":[1,0,0,1]
+		}
+	]
+}
+

pages/home.vue

@@ -172,9 +172,8 @@
 							
 							if (mydata_userInfo.role == '老师') {
 								userController.updateStudentList(null,null);
-							} else {
-								userController.updateScore();
 							}
+							userController.updateScore();
 							userController.updateUserInfo();
 							MyRequest.SetUserType(mydata_userInfo.role,null,null);