modify home page

components/home/simulation.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="s_container">
-		<image src="../../assets/home/homeBG.png" class="s_logo" mode=""></image>
+		<image src="../../assets/home/homeBG.jpg" class="s_logo" mode=""></image>
 		<view class="s_content_container">
 			<view class="s_title" v-text="'虚拟仿真1号摄影棚'">
 

components/home/simulationBase.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="s_container">
-		<image src="../../assets/home/homeBG.png" class="s_logo" mode=""></image>
+		<image src="../../assets/home/homeBG.jpg" class="s_logo" mode=""></image>
 		<view class="s_content_container">
 			<view class="s_title" v-text="'虚拟仿真真题拍摄基地'">
 
@@ -15,7 +15,7 @@
 		</view>
 
 		<view class="s_footer" style="text-align: center;padding: 80rpx;">
-			<image src="../../assets/home/homeBG.png" style="width:1200rpx;height: 800rpx;" mode=""></image>
+			<image src="../../assets/home/homeBG.jpg" style="width:1200rpx;height: 800rpx;" mode=""></image>
 
 		</view>
 	</view>

components/home/simulationCore.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="s_container">
-		<image src="../../assets/home/homeBG.png" class="s_logo" mode=""></image>
+		<image src="../../assets/home/homeBG.jpg" class="s_logo" mode=""></image>
 		<view class="s_content_container">
 			<view class="s_title" v-text="'虚拟仿真1号摄影棚'"></view>
 			<view class="s_content">

components/home/simulationLibrary.vue

@@ -158,7 +158,7 @@
 				act3: -1,
 				array: ['项目类型'],
 				index: 0,
-				url: '/assets/home/homeBG.png',
+				url: '/assets/home/homeBG.jpg',
 				allContentArr:[],
 				itemArr:[],
 				charactorArr:[],

components/home/sy.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="myComRoot">
 		<view class="df homeBG">
-			<!-- <image class="homeBG" mode="aspectFill" src="../../assets/home/homeBG.png"></image> -->
-			<view class="sy-menu">
+			<!-- <image class="homeBG" mode="aspectFill" src="../../assets/home/homeBG.jpg"></image> -->
+			<!-- <view class="sy-menu">
 				<view class="sy-menu-box menu-box1 df jcc" @click="onClick_menu(0)">
 					<view class="sy-menu-text menu-text1">{{menu[0].title}}</view>
 				</view>
@@ -47,21 +47,19 @@
 					</view>
 					<img src="../../assets/home/home_bubble_02.png" />
 				</view>
-			</view>
-			<!-- <image class="BG" src="../../assets/home/homeBG.png" mode="widthFix" ></image> -->
-			<img src="../../assets/home/homeBG.png" />
+			</view> -->
+			<!-- <image class="BG" src="../../assets/home/homeBG.jpg" mode="widthFix" ></image> -->
+			
+			
+			<img src="../../assets/home/homeBG.jpg" />
+			<view class = 'theoryLearn' @click="onTheoryLearn()">理论学习</view>
+			<view class = 'startExperiment' @click="onStartExperiment()">开始实验</view>
 		</view>
 	</view>
 </template>
 
 <script>
 	export default {
-		components: {
-
-		},
-		mounted() {
-
-		},
 		data() {
 			return {
 				showIndex: -1,
@@ -99,24 +97,68 @@
 			},
 			onClick_menu_btn(index) {
 				this.$emit("onClick_menu_btn", index);
+			},
+			onTheoryLearn(){
+				this.$emit("onTheoryLearnu_btn");
+			},
+			onStartExperiment(){
+				this.$emit("onStartExperiment_btn");
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	// .homeBG {
-	// 	width: 100%;
-	// 	height: 100%;
-	// }
+	.homeBG {
+		width: 100%;
+		height: 100%;
+		// background-image: url('../../assets/home/homeBG.jpg');
+	}
 
 	.homeBG img {
 		// max-width: 100%;
 		width: 100%;
 	}
-
+	
+	.theoryLearn{
+		position: absolute;
+		
+		left: 35%;
+		bottom: 10%;
+		
+		width: 10%;
+		height: 5%;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;
+		
+		background-color: #ff0000;
+		color: #ffffff;
+		
+		border-radius: 15px 15px 15px 15px;
+	}
+		
+	.startExperiment{
+		position: absolute;
+		right: 35%;
+		bottom: 10%;
+			
+		width: 10%;
+		height: 5%;	
+			
+		display: flex;
+		justify-content: center;
+		align-items:center;	
+		
+		background-color: #ff0000;
+		color: #ffffff;
+		
+		border-radius: 15px 15px 15px 15px;
+	}
+	
 	.sy-menu {
-	// 	background-image: url('../../assets/home/homeBG.png');
+	// 	background-image: url('../../assets/home/homeBG.jpg');
 	
 	// 	background-repeat: no-repeat;
 	// 	background-size: cover;

components/home/teacher/create.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/homeBG.jpg" class="s_logo" mode=""></image>
 		<view class="s_content_container">
 			<view class="s_content">
 				<view class="uni-form-item  df fdr aic">

components/home/teacher/project.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/homeBG.jpg" class="s_logo" mode=""></image> -->
 		<view class="m_right_container">
 		
 			<view class="m_row_class">
@@ -81,6 +81,9 @@
 							<th>{{item.Type}}</th>
 							<th>{{item.UploadUserName}}</th>
 							<th>{{item.UPloadTime.substring(0,9)}}</th>
+<!-- 							<th><button type="default" size="mini" @click="download(index,item)" class="m_edit_1">下载</button></th>
+							<th><button type="default" size="mini" @click="deleteFile(index,item)" class="m_delete_1">删除</button></th>
+							<th><button type="default" size="mini" @click="audit(index,item)" class="m_audit_1">审核</button></th> -->
 							<th style="position: relative;"><button type="default" size="mini" @click="download(index,item)" class="m_edit_1">下载</button></th>
 							<th style="position: relative;"><button type="default" size="mini" @click="deleteFile(index,item)" class="m_delete_1">删除</button></th>
 							<th style="position: relative;"><button type="default" size="mini" @click="audit(index,item)" class="m_audit_1">审核</button></th>
@@ -461,7 +464,7 @@
 				this.currentSelect = {section:0,buttonType:'delete',index:index};
 			},
 			download(index,item) {
-				this.title = "下载成功?";
+				this.title = "是否确定下载?";
 				this.arr = ["确认"];
 				this.show = true;
                 this.currentSelect = {section:0,buttonType:'downloadIMG',index:index,item:item};
@@ -634,8 +637,9 @@
 					dataType: "json",
 					success: res => {
 						if (res.data.Code == 100) {
-							this.projectData[0] = null
+							// this.projectData[0] = null
 							this.projectData[0] = res.data.Project;
+							// console.log('projectData=',this.projectData[0])
 							this.$forceUpdate()
 						}
 						// console.log("获取了什么样子的信息", this.projectData[0]);
@@ -657,9 +661,43 @@
 					}
 				})
 			},
-			viewProject(obj) {
+			viewProject(obj,index) {
 				// console.log('进来的什么信息',obj)
 				this.projectData = [obj];
+				if(index==0){
+					this.fileData = [
+						{
+							"AliyunOssName": "_59458299-3b84-4895-98f6-b990cdaedc72_chrome_elf.dll",
+							"Id": "0b0d8876-71de-43e6-a3dd-59a3c8f6d069",
+							"Name": "《火星计划》气氛图",
+							"Pass": false,
+							"ProjectID": 30,
+							"ProjectName": "《火星计划》",
+							"Type": "气氛图",
+							"UPloadTime": "2021-05-13 18:19:12",
+							"URL": "https://www.yuyekeji.cn/H5/ZhongChuang/《火星计划》气氛图.jpeg",
+							"UpLoadUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
+							"UploadUserDuty": "创建人",
+							"UploadUserName": "朱峰",
+						},
+						{
+							"AliyunOssName": "_59458299-3b84-4895-98f6-b990cdaedc72_chrome_elf.dll",
+							"Id": "0b0d8876-71de-43e6-a3dd-59a3c8f6d069",
+							"Name": "《火星计划》气氛图2",
+							"Pass": false,
+							"ProjectID": 30,
+							"ProjectName": "《火星计划》",
+							"Type": "气氛图",
+							"UPloadTime": "2021-05-13 18:19:12",
+							"URL": "https://www.yuyekeji.cn/H5/ZhongChuang/《火星计划》气氛图2.jpg",
+							"UpLoadUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
+							"UploadUserDuty": "创建人",
+							"UploadUserName": "朱峰",
+						}
+					]
+					return;
+				}
+				
 				this.getFileList();
 				this.getMemberList();
 			},
@@ -841,7 +879,7 @@
 				})
             },
             DownloadFile() {
-				window.location.href = this.currentSelect.item.URL;
+				window.open(this.currentSelect.item.URL);		
             },
 			shut_down_pop_view(){
 				// this.bShowEdit = false;
@@ -1088,20 +1126,20 @@
 	}
 	
 	.m_edit_1 {
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
+		// position: absolute;
+		// top: 50%;
+		// left: 50%;
+		// transform: translate(-50%, -50%);
 		background: rgb(67, 127, 250);
 		color: rgb(255, 255, 255);
-		min-width: 110rpx;
+		// min-width: 110rpx;
 	}
 	.m_delete_1 {
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		min-width: 110rpx;
-		transform: translate(-50%, -50%);
+		// position: absolute;
+		// top: 50%;
+		// left: 50%;
+		// min-width: 110rpx;
+		// transform: translate(-50%, -50%);
 		background: rgb(234, 37, 44);
 		color: rgb(255, 255, 255);
 	}
@@ -1157,12 +1195,12 @@
 		background-color: #FF791B;
 	}
 	.m_audit_1 {
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		min-width: 55px;
-		-webkit-transform: translate(-50%, -50%);
-		transform: translate(-50%, -50%);
+		// position: absolute;
+		// top: 50%;
+		// left: 50%;
+		// min-width: 55px;
+		// -webkit-transform: translate(-50%, -50%);
+		// transform: translate(-50%, -50%);
 		color: white;
 		background-color: #FF791B;
 	}

components/home/teacher/table.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="m_right">
-		<image src="../../../assets/home/topImg.jpg" class="s_logo" mode=""></image>
+		<img src="../../../assets/home/topImg.jpg" class="s_logo" mode=""></img>
 		<view class="m_right_container">
 			<table style="width: 100%;border: 1px solid #DDDDDD;border-collapse: collapse">
 				<thead class="m-table-hander">
@@ -63,7 +63,19 @@
 					dataType: "json",
 					success: res => {
 						this.tabledata = res.data.Projects
-						// console.log("table页面请求所有项目",res);
+						let aData = {
+							"CreateTime": "2020-01-01 00:00:00",
+							"CreateUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
+							"CreateUserName": "朱峰",
+							"Describe": '“实验以振兴国产科技电影”和“实现中国航天强国梦”的宏大蓝图为背景，以我国首次登陆火星计划为现实脚本，运用现场实时特效技术手段，对火星地面、外太空等场景进行“经典学习”和“实践创兴”并通过持续开发和学生在实验过程中的资源上传不断扩大现场创作的实景和虚拟资产库，使学生再学习过程中，即是资源学习者和方案讨论者，也是资源建设者',
+							"Id": 30,
+							"ProjectName": "《火星计划》",
+							"ProjectReviewImage": "../../../assets/studentAndTeacher/table/marsPlanReviewImage.png",
+							"ReviewImageOss": "../../../assets/studentAndTeacher/table/marsPlanMainCover.png",
+							"Type": "科幻",
+						}
+						this.tabledata.unshift(aData);
+						console.log("table页面请求所有项目",res);
 						this.$forceUpdate();//强制刷新页面
 					}
 				})

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> -->
+		<img src="../../../assets/home/homeBG.jpg" class="s_logo" mode=""></img>
 		<view class="s_content_container">
 			<view class="s_title" v-text="'项目简介'">
 

components/home/teacherCreation.vue

@@ -139,7 +139,7 @@
 				// this.menu[1].list[0].title = '项目' + (index + 1);
 				// this.checkMenu(this.menu[1].list[0], 1);
 				this.checkMenu({id:4}, 1);
-				this.$refs.project.viewProject(obj);
+				this.$refs.project.viewProject(obj,index);
 			},
 			onBackCreateInfo(){
 				this.index = 1;

components/startLearning/startLearning.vue

@@ -62,7 +62,7 @@
 					},
 					{
 						"src": require("../../assets/learning/icon_ksxx_04.png"),
-						"text": "虚拟艺术制作"
+						"text": "虚拟艺术创作"
 					},
 					{
 						"src": require("../../assets/learning/icon_ksxx_05.png"),

components/student/Index.vue

@@ -100,10 +100,10 @@
 				this.name=mydata_userInfo.Name;
 				this.position=userController.userInfo.Profession;
 			},
-			viewProject(obj, index) {
+			viewProject(obj, aIndex) {
 				// this.checkMenu({id:4}, 1);
 				this.index = 4;
-				this.$refs.project.viewProject(obj);
+				this.$refs.project.viewProject(obj, aIndex);
 			},
 			onBackToProjectList(){
 				this.index = 1;

components/student/project.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="m_right">
-		<image src="@/assets/home/homeBG.png" class="s_logo" mode=""></image>
+		<!-- <img src="@/assets/home/homeBG.jpg" class="s_logo" mode=""></img> -->
 		<view class="m_right_container">
 		
 			<view class="m_row_class">
@@ -169,7 +169,8 @@
 				return t
 			},
 			download(index,item) {
-				window.location.href = item.URL;
+				// window.location.href = item.URL;
+				window.open(item.URL);
 			},
 			getlist() {
 				uni.request({
@@ -182,8 +183,9 @@
 					dataType: "json",
 					success: res => {
 						if (res.data.Code == 100) {
-							this.projectData[0] = null
+							// this.projectData[0] = null
 							this.projectData[0] = res.data.Project;
+							// console.log('projectData=',this.projectData[0])
 							this.$forceUpdate()
 						}
 						// console.log("获取了什么样子的信息", this.projectData[0]);
@@ -205,9 +207,42 @@
 					}
 				})
 			},
-			viewProject(obj) {
+			viewProject(obj, index) {
 				// console.log('进来的什么信息',obj)
 				this.projectData = [obj];
+				if(index==0){
+					this.fileData = [
+						{
+							"AliyunOssName": "_59458299-3b84-4895-98f6-b990cdaedc72_chrome_elf.dll",
+							"Id": "0b0d8876-71de-43e6-a3dd-59a3c8f6d069",
+							"Name": "《火星计划》气氛图",
+							"Pass": false,
+							"ProjectID": 30,
+							"ProjectName": "《火星计划》",
+							"Type": "气氛图",
+							"UPloadTime": "2021-05-13 18:19:12",
+							"URL": "https://www.yuyekeji.cn/H5/ZhongChuang/《火星计划》气氛图.jpeg",
+							"UpLoadUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
+							"UploadUserDuty": "创建人",
+							"UploadUserName": "朱峰",
+						},
+						{
+							"AliyunOssName": "_59458299-3b84-4895-98f6-b990cdaedc72_chrome_elf.dll",
+							"Id": "0b0d8876-71de-43e6-a3dd-59a3c8f6d069",
+							"Name": "《火星计划》气氛图2",
+							"Pass": false,
+							"ProjectID": 30,
+							"ProjectName": "《火星计划》",
+							"Type": "气氛图",
+							"UPloadTime": "2021-05-13 18:19:12",
+							"URL": "https://www.yuyekeji.cn/H5/ZhongChuang/《火星计划》气氛图2.jpg",
+							"UpLoadUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
+							"UploadUserDuty": "创建人",
+							"UploadUserName": "朱峰",
+						}
+					]
+					return;
+				}
 				this.getFileList();
 				this.getMemberList();
 			},
@@ -346,6 +381,7 @@
 	tbody tr {
 		border-top: 2rpx solid #DDDDDD !important;
 	}
+	
 	tbody tr th:first-child {
 		position: relative;
 	}
@@ -400,6 +436,7 @@
 		background: rgb(67, 127, 250);
 		color: rgb(255, 255, 255);
 		min-width: 130rpx;
+		z-index: 0;
 	}
 	.m_delete_1 {
 		position: absolute;

components/student/table.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="m_right">
-		<image src="../../assets/home/topImg.jpg" class="s_logo" mode=""></image>
+		<img src="../../assets/home/topImg.jpg" class="s_logo" mode=""></img>
 		<view class="m_right_container">
 			<table style="width: 100%;border: 1px solid #DDDDDD;border-collapse: collapse">
 				<thead class="m-table-hander">
@@ -64,8 +64,21 @@
 					method: "POST",
 					dataType: "json",
 					success: res => {
-					
+			
 						this.tabledata = res.data.Projects
+						// console.log('tabledata=',this.tabledata)
+						let aData = {
+							"CreateTime": "2020-01-01 00:00:00",
+							"CreateUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
+							"CreateUserName": "朱峰",
+							"Describe": '“实验以振兴国产科技电影”和“实现中国航天强国梦”的宏大蓝图为背景，以我国首次登陆火星计划为现实脚本，运用现场实时特效技术手段，对火星地面、外太空等场景进行“经典学习”和“实践创兴”并通过持续开发和学生在实验过程中的资源上传不断扩大现场创作的实景和虚拟资产库，使学生再学习过程中，即是资源学习者和方案讨论者，也是资源建设者',
+							"Id": 30,
+							"ProjectName": "《火星计划》",
+							"ProjectReviewImage": "../../../assets/studentAndTeacher/table/marsPlanReviewImage.png",
+							"ReviewImageOss": "../../../assets/studentAndTeacher/table/marsPlanMainCover.png",
+							"Type": "科幻",
+						}
+						this.tabledata.unshift(aData);
 						// console.log('res=',this.tabledata)
 						this.$forceUpdate();//强制刷新页面
 					}
@@ -163,6 +176,7 @@
 		transform: translate(-50%, -50%);
 		background: rgb(234, 37, 44);
 		color: rgb(255, 255, 255);
+		z-index: 100;
 	}
 
 	.m_right_footer {

pages/home.vue

@@ -11,8 +11,8 @@
 			<!-- <XXLC ref="XXLC" v-show="bShow[2]" v-on:onClick_ksxx="onClick_ksxx"></XXLC> -->
 			<XQDL ref="XQDL" v-show="bShow[2]" v-on:onClick_Btn1="onClick_XQDL_btn1"></XQDL>
 			<KSXX ref="KSXX" v-show="bShow[3]" v-on:on2thTitleClick="on2thKSXXClick"></KSXX>
-			<!-- <image v-show="bShow[4]" class="homeBG" mode="aspectFill" src="../assets/home/homeBG.png"></image> -->
-			<SY ref="SY" v-show="bShow[4]" v-on:onClick_menu_btn="onClick_sy_btn"></SY>
+			<!-- <image v-show="bShow[4]" class="homeBG" mode="aspectFill" src="../assets/home/homeBG.jpg"></image> -->
+			<SY ref="SY" v-show="bShow[4]" v-on:onClick_menu_btn="onClick_sy_btn" v-on:onTheoryLearnu_btn="onTheoryLearnu_btn" v-on:onStartExperiment_btn="onStartExperiment_btn"></SY>
 			<QXZB ref="QXZB" v-show="bShow[5]"></QXZB>
 			<XXYSY ref="XXYSY" v-show="bShow[6]" v-on:onClick_KSRZ="onClick_KSRZ" v-on:onClick_KSKC="onClick_KSKC"
 				v-on:onShowWebview720="onShowWebview720"></XXYSY>
@@ -166,7 +166,7 @@
 					false, //21实景勘察
 					false, //22学习资料下载
 				],
-				checkedIndex_SYJJ: 0, //实验简介选中标题索引值
+				checkedIndex_SYJJ: 0, //实F验简介选中标题索引值
 				bShowQrCode:false,
 				bShowMail:false,
 				bShowTel:false,
@@ -599,7 +599,7 @@
 				this.$refs.webview720.onClickShow();
 			},
 			showContact(idx){
-				console.log('idx=',idx)
+				// console.log('idx=',idx)
 				if(0==idx)
 				{
 					this.bShowQrCode = true;
@@ -622,9 +622,16 @@
 					this.bShowQrCode = false;
 					this.bShowMail = false;
 					this.bShowTel = false;
-				}
-				
-				
+				}	
+			},
+			onTheoryLearnu_btn(){
+				this.showPage(6);
+				this.$refs.XXYSY.checkedIndex_topTitle = 0;
+			},
+			onStartExperiment_btn(){
+				this.showPage(6)
+				this.$refs.TopMenu.switchMiddleState(topMenuS.XXYSY, 3);
+				this.$refs.XXYSY.onTopXXYSYClick(3);
 			}
 		}
 	}