学习进度

components/user/personalLearning.vue

@@ -41,6 +41,7 @@
 				</view>
 				<view class="box2-table-box df fdr">
 					<!-- <radar class=""></radar> -->
+					<web-view class='webview' :src="url" v-if="url.length"></web-view>
 					<!-- 五维图暂缓 -->
 				</view>
 			</view>
@@ -139,15 +140,16 @@
 		},
 		data() {
 			return {
+				url:'https://www.yuyekeji.cn/H5/radar.html',
 				//0添加1个人
 				showIndex_userInfo: 1,
 				sexIndex: 0,
 				zjIndex: 0,
 				mzIndex: 0,
 				//学习进度
-				YLRZ_P:80,
-				SJKC_P:10,
-				XNSY_P:10,
+				YLRZ_P:0,
+				SJKC_P:0,
+				XNSY_P:0,
 				
 				model: {
 					"Name": "", //姓名
@@ -180,6 +182,30 @@
 				this.model.Score_xnjsdj=userController.getScore_xnjsdj();
 				this.model.Score_xnyscz=userController.getScore_xnyscz();
 			},
+			updateLearnProgress(data) {
+				// console.log('data=',data)
+				
+				if( data[0].Score!=-1)
+				{
+					this.YLRZ_P = parseInt(data[0].Score/10*100);
+				}
+				if( data[1].Score!=-1)
+				{
+					this.SJKC_P = parseInt(data[1].Score/5*100);
+				}
+				
+				
+				let totalScore = 0;
+				for(let i=2;i<16;i++)
+				{
+					if(data[i].Score!=-1)
+					{
+						totalScore++;
+					}
+				}
+				
+				this.XNSY_P = parseInt(totalScore/14*100);
+			},
 		}
 	}
 </script>
@@ -462,4 +488,8 @@
 		line-height: px2vw(26);
 		margin-left: px2vw(40);
 	}
+	.webview{
+		height: 650upx;
+		width: 500upx;
+	}
 </style>

components/user/stuTestDetails.vue

@@ -42,7 +42,7 @@
 				<view class="box2-table-box df fdr">
 					<!-- <radar class=""></radar> -->
 					<!-- <canvas canvas-id="canvasRadar" id="canvasRadar" class="charts"></canvas> -->
-					
+					<web-view class='webview' :src="url" v-if="url.length"></web-view>
 					<!-- 五维图暂缓 -->
 				</view>
 			</view>
@@ -143,6 +143,7 @@
 		},
 		data() {
 			return {
+				url:'https://www.yuyekeji.cn/H5/radar.html',
 				// cWidth:'',
 				// cHeight:'',
 				// pixelRatio:1,
@@ -153,9 +154,9 @@
 				zjIndex: 0,
 				mzIndex: 0,
 				//学习进度
-				YLRZ_P:80,
-				SJKC_P:10,
-				XNSY_P:10,
+				YLRZ_P:0,
+				SJKC_P:0,
+				XNSY_P:0,
 				
 				model: {
 					"Name": "", //姓名
@@ -217,6 +218,45 @@
 				this.model.Score_xnjsdj=userController.getScore_xnjsdj();
 				this.model.Score_xnyscz=userController.getScore_xnyscz();
 			},
+			updateLearnProgress(data) {
+				// console.log('data=',data)
+				// data = [{Score: 6},
+				// {Score: 4},
+				// {Score: 1},
+				// {Score: 1},
+				// {Score: 1},
+				// {Score: 2},
+				// {Score: 1},
+				// {Score: 5},
+				// {Score: 1},
+				// {Score: 1},
+				// {Score: 1},
+				// {Score: 1},
+				// {Score: 1},
+				// {Score: 1},
+				// {Score: 1},
+				// {Score: 1}];
+				if( data[0].Score!=-1)
+				{
+					this.YLRZ_P = parseInt(data[0].Score/10*100);
+				}
+				if( data[1].Score!=-1)
+				{
+					this.SJKC_P = parseInt(data[1].Score/5*100);
+				}
+				
+				
+				let totalScore = 0;
+				for(let i=2;i<16;i++)
+				{
+					if(data[i].Score!=-1)
+					{
+						totalScore++;
+					}
+				}
+
+				this.XNSY_P = parseInt(totalScore/14*100);
+			},
 			// getServerData(){
 			// 	let data = {"categories":["维度1","维度2","维度3","维度4","维度5","维度6"],"series":[{"name":"成交量1","data":[90,110,165,195,187,172]},{"name":"成交量2","data":[190,210,105,35,27,102]}]}
 			// 	_self.showRadar("canvasRadar",data);
@@ -532,5 +572,8 @@
 		line-height: px2vw(26);
 		margin-left: px2vw(40);
 	}
-	
+	.webview{
+		height: 650upx;
+		width: 500upx;
+	}
 </style>

components/user/user.vue

@@ -174,6 +174,7 @@
 			},
 			getUserInfo() {
 				let url = this.$Api + "/user/getuserinfo";
+				let _self = this;
 				uni.request({
 					header: {
 						'Content-Type': 'application/json;charset=UTF-8'
@@ -192,10 +193,44 @@
 							this.$refs.GRXX.updateInfo(data.User);
 							mydata_userInfo.email = data.User.Email;
 							// console.log('00000000000=',mydata_userInfo.role)
+							
+							
 							if (mydata_userInfo.role == '老师') {
 								// this.$refs.XSSYQK.updateInfo(data.User);
 							} else {
 								this.$refs.GRXXJL.updateInfo(data.User);
+								//请求分数
+								url = this.$Api + "/score/getscore";
+								uni.request({
+									header: {
+										'Content-Type': 'application/json;charset=UTF-8'
+									},
+									url: url,
+									method: 'POST',
+									data: {
+										"UserID": data.User.Id,
+									},
+									dataType: 'json',
+									success: (res) => {
+										let data = res.data;
+										//100成功
+										if (data.Code == 100) {
+											console.log("请求分数成功", res);
+											 this.$refs.GRXXJL.updateLearnProgress(data.Scores);
+										}
+										//200失败
+										else {
+								
+										}
+										// console.log("success+++**+*", res.data.Code)
+									},
+									fail: (res) => {
+										console.log("fail+**+*", res)
+									}
+								});
+									
+								
+								
 							}
 						}
 						//200失败
@@ -208,6 +243,8 @@
 						console.log("fail+**+*", res)
 					}
 				});
+				
+				
 			},
 			scroll(e) {
 				//记录scroll  位置
@@ -304,7 +341,7 @@
 						//100成功
 						if (data.Code == 100) {
 							console.log("请求分数成功", res);
-							 // this.$refs.XSSYQK.updateInfo(data.User);
+							 this.$refs.XSSYQK.updateLearnProgress(data.Scores);
 						}
 						//200失败
 						else {