eraser 4 жил өмнө
parent
commit
5981a2dc04

+ 4 - 4
components/home/sy.vue

@@ -104,10 +104,10 @@
 </script>
 
 <style lang="scss">
-	.homeBG {
-		width: 100%;
-		height: 100%;
-	}
+	// .homeBG {
+	// 	width: 100%;
+	// 	height: 100%;
+	// }
 	.homeBG img {
 		max-width: 100%;
 	}

+ 7 - 8
components/login/loginByPWD.vue

@@ -95,12 +95,12 @@
 							if (data.Image != '') {
 								mydata_userInfo.avatarSrc = data.Image;
 							}
-							console.log("登陆成功data=",data);
+							console.log("登陆成功data=", data);
 							mydata_userInfo.Name = data.Name;
 							mydata_userInfo.UserID = data.UserID;
 							mydata_userInfo.Position = data.Position;
 							mydata_userInfo.role = data.Type;
-							
+
 							// let url = this.$Api + "/user/setusertype";
 							// console.log('url=',url)
 							// let aData = {
@@ -126,16 +126,15 @@
 							// 		console.log("fail+**+*", res)
 							// 	}
 							// });
-							
+
 							// console.log("登陆成功,个人信息", mydata_userInfo);
 							if (mydata_userInfo.role == '老师') {
-								userController.updateStudentList(null,null);
-							} else {
-								userController.updateScore();
+								userController.updateStudentList(null, null);
 							}
+							userController.updateScore();
 							userController.updateUserInfo();
-							MyRequest.SetUserType(mydata_userInfo.role,null,null);
-							
+							MyRequest.SetUserType(mydata_userInfo.role, null, null);
+
 							this.$emit("onLogin");
 						}
 						//密码错误

+ 7 - 1
components/startLearning/learningAndExperiment/ksxx_xxysy_sjkc/ksxx_xxysy_sjkc.vue

@@ -51,7 +51,7 @@
 							<view class="df fdr jcse">
 								<view class="df fdc aic">
 									<img src='../../../../assets/learning/icon_test_01.png'></img>
-									<view>100%及格率</view>
+									<view>多项选择题</view>
 								</view>
 								<view class="df fdc aic">
 									<img src='../../../../assets/learning/icon_test_02.png'></img>
@@ -290,6 +290,12 @@
 				}
 				console.log("检测结果为", this.allWrongTest);
 				this.checkedIndex1 = 2;
+				let score = 10-this.allWrongTest.length;
+				userController.setupScore_sjkc(score,function(res){
+					alert("提交成功");
+				},function(res){
+					alert("提交失败");
+				});
 			},
 			onClick_test_exit() {
 				this.checkedIndex1 = 1;

+ 7 - 1
components/startLearning/learningAndExperiment/ksxx_xxysy_ylrz/ksxx_xxysy_ylrz.vue

@@ -52,7 +52,7 @@
 							<view class="df fdr jcse">
 								<view class="df fdc aic">
 									<img src='../../../../assets/learning/icon_test_01.png'></img>
-									<view>100%及格率</view>
+									<view>多项选择题</view>
 								</view>
 								<view class="df fdc aic">
 									<img src='../../../../assets/learning/icon_test_02.png'></img>
@@ -300,6 +300,12 @@
 				}
 				console.log("检测结果为", this.allWrongTest);
 				this.checkedIndex1 = 2;
+				let score = 10-this.allWrongTest.length;
+				userController.setupScore_ylrz(score,function(res){
+					alert("提交成功");
+				},function(res){
+					alert("提交失败");
+				});
 			},
 			onClick_test_exit() {
 				this.checkedIndex1 = 1;

+ 20 - 0
components/user/userController.js

@@ -65,5 +65,25 @@ userController = {
 		data[15].Score=Number(score);
 		// console.log("请求上传分数3333----",data);
 		MyRequest.SetupScore(data,suc, fail);
+	},
+	//上传分数-原理认知
+	setupScore_ylrz(score,suc,fail){
+		// 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);
+		data[0].Score=Number(score);
+		// console.log("请求上传分数3333----",data);
+		MyRequest.SetupScore(data,suc, fail);
+	},
+	//上传分数-实景勘察
+	setupScore_sjkc(score,suc,fail){
+		// 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);
+		data[1].Score=Number(score);
+		// console.log("请求上传分数3333----",data);
+		MyRequest.SetupScore(data,suc, fail);
 	}
 }