学生管理

components/leftMenu.vue

@@ -59,7 +59,7 @@
 						"list": ['学习概要', '实验步骤', '实验引导视频', '学习资料下载']
 					},
 					{
-						"text": '开始学习',
+						"text": '开始实验',
 						"icon_btn1_checked": require('../assets/leftMenu/icon_ksxx_02.png'),
 						"icon_btn1_unchecked": require('../assets/leftMenu/icon_ksxx_01.png'),
 						"list": ["原理认知", "实景勘察", "虚拟技术搭建", "虚拟艺术创作", "虚拟资源库"]

components/user/personalLearning.vue

@@ -209,6 +209,7 @@
 				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);
 				}
@@ -232,14 +233,14 @@
 				if (data[0].Score == '-1') {
 					aData.push(miniPoint);
 				} else {
-					aData.push(parseInt(data[0].Score));
+					aData.push(parseInt(data[0].Score)/10*1000);
 				}
 			
 				//实景考察
 				if (data[1].Score == '-1') {
 					aData.push(miniPoint);
 				} else {
-					aData.push(parseInt(data[1].Score));
+					aData.push(parseInt(data[1].Score)/5*1000);
 				}
 				//虚拟技术搭建
 				let XNJSDJ_score = 0;
@@ -249,7 +250,7 @@
 					}
 				}
 				// = parseInt(data[3])+parseInt(data[4])+parseInt(data[5]);
-				aData.push(XNJSDJ_score);
+				aData.push(XNJSDJ_score/10*1000);
 			
 				//虚拟艺术创作
 				// let XNYSCZ_score = parseInt(data[6])+parseInt(data[7])+parseInt(data[8])+parseInt(data[9])+parseInt(data[10])+parseInt(data[11])+parseInt(data[12])+parseInt(data[13])+parseInt(data[14])+parseInt(data[15]);
@@ -259,13 +260,13 @@
 						XNYSCZ_score += parseInt(data[i].Score);
 					}
 				}
-				aData.push(XNYSCZ_score);
+				aData.push(XNYSCZ_score/55*1000);
 				// console.log('data=',data);
 				//教师评分（加分项目）
 				if (data[15].Score == '-1') {
 					aData.push(miniPoint);
 				} else {
-					aData.push(parseInt(data[15].Score));
+					aData.push(parseInt(data[15].Score)/20*1000);
 				}
 				// aData.push(parseInt(data[16]));
 				// console.log('aData=', aData)
@@ -277,13 +278,11 @@
 				// let data = {"categories":["原理认知","实景勘察","虚拟技术搭建","虚拟艺术创作","教师评分(加分项目)"],"series":[{"name":"成绩分布","data":[90,110,165,195,187]}]}
 				// let data = {"categories":["维度1","维度2","维度3"],"series":[{"name":"成交量1","data":[90,110,165,195,187,172]}]}
 				
-				for(let i=0;i<aData.length;i++){
-					// console.log('aData=',aData[i])
-					
-					aData[i]=aData[i]*20;
-				}
+				// for(let i=0;i<aData.length;i++){
+				// 	aData[i]=aData[i]*20;
+				// }
 				
-				aData = [800,600,800,600,800,500];
+				// aData = [800,600,800,600,800,500];
 				
 				let data = {
 					"categories": ["原理认知", "实景考察", "虚拟技术搭建", "虚拟艺术创作", "教师评分(加分项目)"],

components/user/stuManage.vue

@@ -102,7 +102,7 @@
 				
 				let fromIndex = this.totalItem*(i-1);
 				let toIndex = fromIndex+this.totalItem;
-				
+			
 				let data = {
 					"UserID": mydata_userInfo.userID,
 					"BeginNum": fromIndex, //用户数组索引
@@ -120,7 +120,7 @@
 					success: (res) => {
 						//100成功
 						if (res.data.Code == 100) {
-							console.log("请求全部资产", res);
+							console.log("请求全部学生", res);
 							this.allStudent = res.data.Items;
 							this.pageTotalNum = Math.ceil(res.data.AllOfItem/this.totalItem);
 							this.currentPage = i;					
@@ -177,31 +177,31 @@
 			onClick_addStudent() {
 				this.isShowAdd = true;
 			},
-			updateInfo() {
-				// this.index = 1;
-				this.allStudent = userController.studentList;
-				// console.log('this.allStudent=',this.allStudent)
-				// this.currentPage = Math.ceil(this.allStudent.length / 7);
-				this.updateTable();
-				// console.log("学生管理，更新页面", this.allStudent);
-			},
-			updateTable() {
-				this.curPageStudentList = [];
-				for (let i = 0; i < 7; i++) {
-					let student = this.allStudent[(this.currentPage - 1) * 7 + i];
-					if (student) {
-						let astudent = {
-							"userName": student.IlabAccount,
-							"name": student.Name,
-							"class": student.Class,
-							"progress": '',
-							"score": student.Scores.Score,
-						}
-						this.curPageStudentList.push(astudent);
-					}
-				}
-				// console.log("当前页学生列表", this.curPageStudentList);
-			},
+			// updateInfo() {
+			// 	// this.index = 1;
+			// 	this.allStudent = userController.studentList;
+			// 	// console.log('this.allStudent=',this.allStudent)
+			// 	// this.currentPage = Math.ceil(this.allStudent.length / 7);
+			// 	this.updateTable();
+			// 	// console.log("学生管理，更新页面", this.allStudent);
+			// },
+			// updateTable() {
+			// 	this.curPageStudentList = [];
+			// 	for (let i = 0; i < 7; i++) {
+			// 		let student = this.allStudent[(this.currentPage - 1) * 7 + i];
+			// 		if (student) {
+			// 			let astudent = {
+			// 				"userName": student.IlabAccount,
+			// 				"name": student.Name,
+			// 				"class": student.Class,
+			// 				"progress": '',
+			// 				"score": student.Scores.Score,
+			// 			}
+			// 			this.curPageStudentList.push(astudent);
+			// 		}
+			// 	}
+			// 	// console.log("当前页学生列表", this.curPageStudentList);
+			// },
 			onClick_addStu_add() {
 				// console.log(this.addStudentData);
 				let self = this;

components/user/stuTestDetails.vue

@@ -282,14 +282,14 @@
 				if (data[0].Score == '-1') {
 					aData.push(miniPoint);
 				} else {
-					aData.push(parseInt(data[0].Score));
+					aData.push(parseInt(data[0].Score)/10*1000);
 				}
 
 				//实景考察
 				if (data[1].Score == '-1') {
 					aData.push(miniPoint);
 				} else {
-					aData.push(parseInt(data[1].Score));
+					aData.push(parseInt(data[1].Score)/5*1000);
 				}
 				
 				//虚拟技术搭建
@@ -300,7 +300,7 @@
 					}
 				}
 				// = parseInt(data[3])+parseInt(data[4])+parseInt(data[5]);
-				aData.push(XNJSDJ_score);
+				aData.push(XNJSDJ_score/10*1000);
 
 				//虚拟艺术创作
 				// let XNYSCZ_score = parseInt(data[6])+parseInt(data[7])+parseInt(data[8])+parseInt(data[9])+parseInt(data[10])+parseInt(data[11])+parseInt(data[12])+parseInt(data[13])+parseInt(data[14])+parseInt(data[15]);
@@ -310,13 +310,13 @@
 						XNYSCZ_score += parseInt(data[i].Score);
 					}
 				}
-				aData.push(XNYSCZ_score);
+				aData.push(XNYSCZ_score/55*1000);
 				// console.log('data=',data);
 				//教师评分（加分项目）
 				if (data[15].Score == '-1') {
 					aData.push(miniPoint);
 				} else {
-					aData.push(parseInt(data[15].Score));
+					aData.push(parseInt(data[15].Score)/20*1000);
 				}
 				// aData.push(parseInt(data[16]));
 				// console.log('aData=', aData)

components/user/user.vue

@@ -159,7 +159,9 @@
 
 							break;
 						case 1: //学生管理
-							this.$refs.XSGL.updateInfo();
+							// this.$refs.XSGL.updateInfo();
+							this.$refs.XSGL.initPage();
+							
 							break;
 						case 2: //创作项目管理平台
 

myData.js

@@ -29,5 +29,5 @@ mydata_userInfo = {
 	"Position":''
 }
 // mydata_api='http://39.105.166.141:8085'
-mydata_api='http://8.140.128.1:8085'
-
+// mydata_api='http://8.140.128.1:8085'
+mydata_api='http://tanhuagame.com:8085'

request.js

@@ -59,7 +59,10 @@ MyRequest = {
 	},
 	GetStudentList(suc, fail) {
 		let data = {
-			"UserID": mydata_userInfo.UserID
+			// "UserID": mydata_userInfo.UserID,
+			"UserID": mydata_userInfo.userID,
+			"BeginNum": 0, //用户数组索引
+			"EndNum": 100, //用户数组索引结束
 		};
 		// console.log("请求学生列表，自己ID",data);
 		this.uniRquest('/user/getallstudent', data, suc, fail);