modify version 1

components/home/simulationLibrary.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="s_container">
-		<image src="../../assets/test/4.png" class="s_logo" mode=""></image>
+		<image src="../../assets/home/simulationLibrary/topImg.png" class="s_logo" mode=""></image>
 		<view class="s_content_container">
 			<view class="s_search" style="">
 				<view class="" style="position: relative;width: 100%;">
@@ -9,7 +9,7 @@
 				</view>
 				<button type="warn" size="mini" class="s_btn_search">搜索</button>
 			</view>
-			<view class="s_search_condition">
+			<!-- <view class="s_search_condition">
 				<view class="uni-list">
 					<view class="uni-list-cell">
 						<view class="uni-list-cell-db">
@@ -64,7 +64,7 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 
 			<view class="s_search_img">
 
@@ -538,10 +538,6 @@
 		width: 100%;
 	}
 
-	/* @media sscreen (min-with:1050px)  and (max-width: 1920px) and {
-		
-	} */
-
 	.s_operation {
 		/* 	position: absolute;
 		bottom: -10rpx;

components/home/teacher/create.vue

@@ -9,9 +9,6 @@
 				</view>
 				<view class="uni-form-item df fdr aic">
 					<view class="title">项目类型</view>
-					<!-- <input type="number"  class="form-input" value=""  placeholder="这是一个项目类型"/> -->
-					<!-- <input name="input" v-model="model.type" class="form-input" type="number" placeholder="这是一个项目类型" /> -->
-
 					<picker class="form-input" @change="bindPickerChange_proType" :value="index_proType" :range="proType">
 						<view class=" df fdr aic jcsb">
 							<view>{{proType[index_proType]}}</view>

components/home/teacher/project.vue

@@ -130,7 +130,8 @@
 								</div>
 							</th>
 							<th>{{item.User.PhoneNum}}</th>
-							<th style="position: relative;"><button type="default" size="mini" class="m_delete" @click="deleteMember(item)"  v-show="item.User.Id != projectData[0].CreateUserID">删除</button></th>
+							<!-- <th style="position: relative;"><button type="default" size="mini" class="m_delete" @click="deleteMember(item)"  v-show="item.User.Id != projectData[0].CreateUserID">删除</button></th> -->
+							<th><button type="default" size="mini" class="m_delete2" @click="deleteMember(item)"  v-show="item.User.Id != projectData[0].CreateUserID">删除</button></th>
 						</tr>
 					</tbody>
 				</table>
@@ -1074,6 +1075,18 @@
 		background: rgb(234, 37, 44);
 		color: rgb(255, 255, 255);
 	}
+	
+	.m_delete2 {
+		// position: absolute;
+		// top: 50%;
+		// left: 50%;
+		// width: 80%;
+		// transform: translate(-50%, -50%);
+		background: rgb(234, 37, 44);
+		color: rgb(255, 255, 255);
+		// z-index: 3;
+	}
+	
 	.m_edit_1 {
 		position: absolute;
 		top: 50%;

components/home/teacher/table.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="m_right">
-		<image src="../../../assets/home/homeBG.png" class="s_logo" mode=""></image>
+		<image src="../../../assets/home/topImg.jpg" class="s_logo" mode=""></image>
 		<view class="m_right_container">
 			<table style="width: 100%;border: 1px solid #DDDDDD;border-collapse: collapse">
 				<thead class="m-table-hander">
@@ -30,8 +30,6 @@
 				<text selectable="true"class="m_paging_item m_paging_lower">下一页</text>
 			</view> -->
 		</view>
-
-		<!-- <locationtemp ref="locationtemp"></locationtemp> -->
 	</view>
 </template>
 
@@ -93,7 +91,7 @@
 
 		.s_logo {
 			width: 100%;
-			height: 800rpx;
+			// height: 800rpx;
 		}
 
 		.m_right_hander {
@@ -163,6 +161,7 @@
 		transform: translate(-50%, -50%);
 		background: rgb(234, 37, 44);
 		color: rgb(255, 255, 255);
+		z-index: 3;
 	}
 
 	.m_right_footer {

components/home/teacher/teacher.vue

@@ -1,7 +1,7 @@
 <template>
 
 	<view class="m_right">
-		<image src="../../../assets/home/homeBG.png" class="s_logo" mode=""></image>
+		<!-- <image src="../../../assets/home/homeBG.png" class="s_logo" mode=""></image> -->
 		<view class="s_content_container">
 			<view class="s_title" v-text="'项目简介'">
 

components/home/teacherCreation.vue

@@ -40,7 +40,7 @@
 			<create ref="create" v-show="index==3" v-on:onBackCreateInfo="onBackCreateInfo"></create>
 			<vtable ref="table" v-show="index==2" v-on:viewProject='viewProject'></vtable>
 			<project ref="project" v-show="index==4" v-on:onBackToProjectList='onBackToProjectList'></project>
-			<location ref="location" v-show="index==2||index==4"></location>
+			<!-- <location ref="location" v-show="index==2||index==4"></location> -->
 			<!-- </view> -->
 		</scroll-view>
 	</view>

components/login/loginByPWD.vue

@@ -93,32 +93,13 @@
 								mydata_userInfo.avatarSrc = data.Image;
 							}
 							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 = mydata_api + "/user/setusertype";
-							// uni.request({
-							// 	header: {
-							// 		'Content-Type': 'application/json;charset=UTF-8'
-							// 	},
-							// 	url: url,
-							// 	method: 'POST',
-							// 	data: {
-							// 		"UserID" : data.UserID,                //虚拟仿真用户ID
-							// 		"Type":"学生"
-							// 	},
-							// 	dataType: 'json',
-							// 	success: (res) => {
-							// 		console.log("success+++**+*", res)
-							// 	},
-							// 	fail: (res) => {
-							// 		console.log("fail+**+*", res)
-							// 	}
-							// });
-
+							
 							// console.log("登陆成功，个人信息", mydata_userInfo);
 							if (mydata_userInfo.role == '老师') {
 								userController.updateStudentList(null, null);

components/student/project.vue

@@ -5,12 +5,8 @@
 		
 			<view class="m_row_class">
 				<view class="m_row">
-					<view class="m_row_link">
-
-					</view>
-					<view class="m_row_title" v-text="'项目管理'">
-
-					</view>
+					<view class="m_row_link"></view>
+					<view class="m_row_title" v-text="'项目管理'"></view>
 					<view style="position: relative;margin-left: 40rpx;">
 						<div class="triangle_border_down">
 							<span></span>

components/student/table.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="m_right">
-		<image src="../../assets/home/homeBG.png" class="s_logo" mode=""></image>
+		<image src="../../assets/home/topImg.jpg" class="s_logo" mode=""></image>
 		<view class="m_right_container">
 			<table style="width: 100%;border: 1px solid #DDDDDD;border-collapse: collapse">
 				<thead class="m-table-hander">
@@ -92,7 +92,8 @@
 
 		.s_logo {
 			width: 100%;
-			height: 800rpx;
+			// height: 800rpx;
+			// object-fit: cover;
 		}
 
 		.m_right_hander {

components/topMenu.vue

@@ -8,7 +8,8 @@
 			</view>
 			<!-- 左上角标题 -->
 			<view class="df aic topMenu-lefttitle-box">
-				<view v-show="middleShowIndex==0" @click="onClick_topMenu_sy">影视现场实时特效虚拟仿真实验</view>
+				<!-- <view v-show="middleShowIndex==0" @click="onClick_topMenu_sy">影视现场实时特效虚拟仿真实验</view> -->
+				<view v-show="middleShowIndex==0" @click="onClick_topMenu_sy">中国传媒大学 | XR创作虚拟仿真实验</view>
 				<view v-show="middleShowIndex==1" class="df fdr aic">
 					<img src="../assets/learning/icon_ksxx_qxzb.png"></img>
 					<view>前序准备</view>

components/user/personalLearning.vue

@@ -223,7 +223,7 @@
 					}
 				}
 			
-				this.XNSY_P = parseInt(totalScore / 14 * 100);
+				this.XNSY_P = parseInt(totalScore / 85 * 100);
 			
 				//五维图
 				let aData = [];

components/user/stuManage.vue

@@ -32,11 +32,11 @@
 			</view>
 			<view class="m_right_footer">
 				<view class="m_paging">
-					<text selectable="true"class="m_paging_item m_paging_upper" @click="onClick_last" v-show="pageCount>1">上一页</text>
-					<text selectable="true"class="m_paging_item" :key="i" v-for="i in pageCount" @click="paging(i)" :class="i==index?'p_act':''">
+					<text selectable="true"class="m_paging_item m_paging_upper" @click="onClick_last" v-show="currentPage>1">上一页</text>
+					<text selectable="true"class="m_paging_item" :key="i" v-for="i in currentPage" @click="paging(i)" :class="i==currentPage?'p_act':''">
 						{{i}}
 					</text>
-					<text selectable="true"class="m_paging_item m_paging_lower" @click="onClick_next" v-show="pageCount>1">下一页</text>
+					<text selectable="true"class="m_paging_item m_paging_lower" @click="onClick_next" v-show="currentPage>1">下一页</text>
 				</view>
 			</view>
 		</view>
@@ -51,6 +51,7 @@
 				</view>
 				<view class="addStu-addBox df jcfe">
 					<button class="addStu-addBtn df jcc aic" @click="onClick_addStu_add">添加</button>
+					<button class="addStu-addBtn df jcc aic" @click="onClick_cancel">取消</button>
 				</view>
 			</view>
 		</view>
@@ -63,10 +64,18 @@
 		data() {
 			return {
 				isShowAdd: false,
+				
+				pageTotalNum:1,
+				currentPage:1,
+				totalItem:2,
+				// dataUsers_all: [],
+				bShowLastPageBtn:false,
+				bShowNextPageBtn:false,
+				
 				//当前页数
-				index: 1,
+				// index: 1,
 				//总计页数
-				pageCount: 0,
+				// currentPage: 0,
 				//所有学生
 				allStudent: null,
 				//当前页学生
@@ -86,37 +95,100 @@
 			}
 		},
 		methods: {
-			paging(index) {
-				this.index = index;
-				this.updateTable();
-			},
-			onClick_last() {
-				if (this.index > 1) {
-					this.index--;
-					this.updateTable();
+			paging(i) {
+				uni.showLoading({
+				    title: '加载中'  
+				});
+				
+				let fromIndex = this.totalItem*(i-1);
+				let toIndex = fromIndex+this.totalItem;
+				
+				let data = {
+					"UserID": mydata_userInfo.userID,
+					"BeginNum": fromIndex, //用户数组索引
+					"EndNum": toIndex, //用户数组索引结束
 				}
+				
+				uni.request({
+					header: {
+						'Content-Type': 'application/json;charset=UTF-8'
+					},
+					url: mydata_api + '/user/getallstudent',
+					method: 'POST',
+					data: data,
+					dataType: 'json',
+					success: (res) => {
+						//100成功
+						if (res.data.Code == 100) {
+							console.log("请求全部资产", res);
+							this.allStudent = res.data.Items;
+							this.pageTotalNum = Math.ceil(res.data.AllOfItem/this.totalItem);
+							this.currentPage = i;					
+							this.showNextOrLastPageBtn();
+						}
+						//200失败
+						else {
+							console.log('suc200', res);
+						}
+						uni.hideLoading();					
+					},
+					fail: (res) => {
+						console.log("请求失败****");	
+						uni.hideLoading();
+					}
+				});
 			},
-			onClick_next() {
-				if (this.index < this.pageCount) {
-					this.index++;
-					this.updateTable();
+			initPage() {
+				this.paging(1);
+			},
+			onClick_last()
+			{
+				this.currentPage--;
+				this.paging(this.currentPage);
+			},
+			onClick_next()
+			{
+				this.currentPage++;
+				this.paging(this.currentPage);
+			},
+			showNextOrLastPageBtn()
+			{
+				if(this.pageTotalNum==this.currentPage)
+				{
+					this.bShowLastPageBtn = true;
+					this.bShowNextPageBtn = false;
+				}
+				else if(1==this.currentPage)
+				{
+					this.bShowLastPageBtn = false;
+					this.bShowNextPageBtn = true;
+				}
+				else
+				{
+					this.bShowLastPageBtn = true;
+					this.bShowNextPageBtn = true;
+				}
+				
+				if(this.pageTotalNum==1){
+					this.bShowLastPageBtn = false;
+					this.bShowNextPageBtn = false;
 				}
 			},
 			onClick_addStudent() {
 				this.isShowAdd = true;
 			},
 			updateInfo() {
-				this.index = 1;
+				// this.index = 1;
 				this.allStudent = userController.studentList;
 				// console.log('this.allStudent=',this.allStudent)
-				this.pageCount = Math.ceil(this.allStudent.length / 7);
+				// 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.index - 1) * 7 + i];
+					let student = this.allStudent[(this.currentPage - 1) * 7 + i];
 					if (student) {
 						let astudent = {
 							"userName": student.IlabAccount,
@@ -150,6 +222,11 @@
 					userController.updateStudentList(self.updateInfo,null)
 				}, null);
 			},
+			onClick_cancel(){
+				this.isShowAdd = false;
+				this.addStudentData = {};
+				userController.updateStudentList(this.updateInfo,null)
+			},
 			onClick_XSSYQK(studentI){
 				// console.log("实验情况studentI=",studentI);
 				let UserID = this.allStudent[studentI].UserID;
@@ -280,11 +357,11 @@
 		line-height: 140rpx;
 	}
 
-	tbody tr:hover {
-		// color: #fff;
-		background: #FDEBEC;
-		// opacity: 0.08;
-	}
+	// tbody tr:hover {
+	// 	// color: #fff;
+	// 	background: #FDEBEC;
+	// 	// opacity: 0.08;
+	// }
 
 	.m-table-hander {
 		background-color: #FFF8F7;

components/user/stuTestDetails.vue

@@ -267,12 +267,13 @@
 				// 虚拟实验
 				let aTotalScore = 0;
 				for (let i = 2; i < 16; i++) {
+					console.log('data[i].Score=',data[i].Score)
 					if (data[i].Score != -1) {
 						aTotalScore+=data[i].Score;
 					}
 				}
 			
-				this.XNSY_P = parseInt(aTotalScore / 14 * 100);
+				this.XNSY_P = parseInt(aTotalScore / 85 * 100);
 				
 				//五维图
 				let aData = [];

myData.js

@@ -14,8 +14,10 @@ topMenuS = {
 	"home2": "虚拟仿真库",
 	"home3": "虚拟影视项目开发管理中心",
 	"home4": "虚拟仿真真题拍摄基地",
-	"home5": "影视现场实时特效虚拟仿真实验",
-	"info": "影视现场实时特效虚拟仿真实验",
+	// "home5": "影视现场实时特效虚拟仿真实验",
+	// "info": "影视现场实时特效虚拟仿真实验",
+	"home5": "中国传媒大学 | XR创作虚拟仿真实验",
+	"info": "中国传媒大学 | XR创作虚拟仿真实验",
 }
 
 mydata_userInfo = {