Parcourir la source

修改首页视频以及名字

yichael il y a 4 ans
Parent
commit
859fa05474

BIN
assets/home/homeBG.jpg


+ 123 - 38
components/home/sy.vue

@@ -53,29 +53,28 @@
 			
 			
 			<img src="../../assets/home/homeBG.jpg" />
 			<img src="../../assets/home/homeBG.jpg" />
 
 
-			<video class="myVideo" 
+			<!-- <video class="myVideo" 
 				:src="src"
 				:src="src"
 				:controls="controls"
 				:controls="controls"
 			     preload="auto"
 			     preload="auto"
 			     autoplay
 			     autoplay
 			     loop muted>
 			     loop muted>
-			</video>
-			
-			<!-- <video v-show="os!=='iOS'"
-			               class="myVideo"
-			               preload="auto"
-			               autoplay
-			               loop muted
-			               webkit-playsinline="true"
-			               playsinline="true"
-			               @loadstart="videoLoadStart"
-			               @canplaythrough="videoLoaded"
-			               poster="./images/cover.png"
-			               ref="videoEle"
-			               id="android"
-			        >
-				<source :src="src" type="video/mp4">
 			</video> -->
 			</video> -->
+			<view class='introVideo'>
+				<video class="myVideo"
+					:src="src">
+				</video>
+				<view class='videoControl'>
+					<!-- <view class='experimentIntro' :class="[bExperimentIntroSelected==1?'experimentIntro-selected':'experimentIntro-noselect']" @click="onClickExperimentIntro">实验简介视频</view>
+					<view class='slice'> / </view>
+					<view class='teachingGuide' :class="[bTeachingGuideSelected==1?'teachingGuide-selected':'teachingGuide-noselect']" @click="onClickTeachingGuide">教学引导视频</view> -->
+					<view :class="[bExperimentIntroSelected==1?'experimentIntro-selected':'experimentIntro-noselect']" @click="onClickExperimentIntro">实验简介视频</view>
+					<view class='slice'> / </view>
+					<view :class="[bteachingGuideSelected==1?'teachingGuide-selected':'teachingGuide-noselect']" @click="onClickTeachingGuide">教学引导视频</view>			
+				</view>	
+			</view>	
+			
+			
 		<!-- 	<view class = 'theoryLearn' @click="onTheoryLearn()">理论学习</view>
 		<!-- 	<view class = 'theoryLearn' @click="onTheoryLearn()">理论学习</view>
 			<view class = 'startExperiment' @click="onStartExperiment()">开始实验</view> -->
 			<view class = 'startExperiment' @click="onStartExperiment()">开始实验</view> -->
 		</view>
 		</view>
@@ -88,7 +87,9 @@
 			return {
 			return {
 				showIndex: -1,
 				showIndex: -1,
 				src:'https://zhongchuan1.oss-cn-beijing.aliyuncs.com/Video/home.MP4?versionId=CAEQDxiBgIDmyO_o0BciIGExNjQ1ZmJkNTVkOTRlMWRhNGRkZjAxNTEzZTMxOTll',
 				src:'https://zhongchuan1.oss-cn-beijing.aliyuncs.com/Video/home.MP4?versionId=CAEQDxiBgIDmyO_o0BciIGExNjQ1ZmJkNTVkOTRlMWRhNGRkZjAxNTEzZTMxOTll',
-				controls:false,
+				// controls:false,
+				bExperimentIntroSelected:1,
+				bteachingGuideSelected:0,
 				menu: [{
 				menu: [{
 						"title": '虚拟仿真资产库',
 						"title": '虚拟仿真资产库',
 						"text": '科学实验,是指根据一定目的,运用一定的仪器、设备等物质手'
 						"text": '科学实验,是指根据一定目的,运用一定的仪器、设备等物质手'
@@ -186,6 +187,16 @@
 				};
 				};
 				
 				
 				this.$emit("onStartExperiment_btn");
 				this.$emit("onStartExperiment_btn");
+			},
+			onClickExperimentIntro(){
+				this.bExperimentIntroSelected=1;
+				this.bteachingGuideSelected=0;
+				this.src='https://zhongchuan1.oss-cn-beijing.aliyuncs.com/Video/home.MP4?versionId=CAEQDxiBgIDmyO_o0BciIGExNjQ1ZmJkNTVkOTRlMWRhNGRkZjAxNTEzZTMxOTll';
+			},
+			onClickTeachingGuide(){
+				this.bExperimentIntroSelected=0;
+				this.bteachingGuideSelected=1;
+				this.src='https://zhongchuan1.oss-cn-beijing.aliyuncs.com/Video/home.MP4?versionId=CAEQDxiBgIDmyO_o0BciIGExNjQ1ZmJkNTVkOTRlMWRhNGRkZjAxNTEzZTMxOTll';
 			}
 			}
 		}
 		}
 	}
 	}
@@ -195,11 +206,9 @@
 	.homeBG {
 	.homeBG {
 		width: 100%;
 		width: 100%;
 		height: 100%;
 		height: 100%;
-		// background-image: url('../../assets/home/homeBG.jpg');
 	}
 	}
 
 
 	.homeBG img {
 	.homeBG img {
-		// max-width: 100%;
 		width: 100%;
 		width: 100%;
 	}
 	}
 	
 	
@@ -234,6 +243,7 @@
 		justify-content: center;
 		justify-content: center;
 		align-items:center;	
 		align-items:center;	
 		
 		
+		
 		background-color: #ff0000;
 		background-color: #ff0000;
 		color: #ffffff;
 		color: #ffffff;
 		
 		
@@ -241,12 +251,6 @@
 	}
 	}
 	
 	
 	.sy-menu {
 	.sy-menu {
-	// 	background-image: url('../../assets/home/homeBG.jpg');
-	
-	// 	background-repeat: no-repeat;
-	// 	background-size: cover;
-		// background-position: center;
-			
 		position: absolute;
 		position: absolute;
 		width: 100%;
 		width: 100%;
 		height: 100%;
 		height: 100%;
@@ -254,7 +258,6 @@
 
 
 	.sy-menu-box {
 	.sy-menu-box {
 		position: absolute;
 		position: absolute;
-		// background: #FFFFFF;
 	}
 	}
 
 
 	.sy-menu-text {
 	.sy-menu-text {
@@ -380,22 +383,104 @@
 		margin-top: px2vw(171);
 		margin-top: px2vw(171);
 	}
 	}
 	
 	
-	.myVideo{
+	.introVideo{
 		position: absolute;
 		position: absolute;
 		
 		
-		left: px2vw(770);
-		top: px2vw(371);
+		left: px2vw(24);
+		top: px2vw(154);
+		
+		// width: px2vw(380);
+		// height: px2vw(232);
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;	
+		flex-direction: column;
+		
+		// border: 3rpx solid #D7D7D7;
+	}
+	.myVideo{
+		width: px2vw(380);
+		height: px2vw(232);
+	}
+	.videoControl{
+		width: 100%;
+		height: 100%;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;	
+		flex-direction: row;
+		
+		// border: 3rpx solid #D7D7D7;
+	}
+	.experimentIntro-selected{
+		width: 100%;
+		height: 100%;
+		
+		font-size: 30rpx;
+		color: #ff0000;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;	
+		
+		margin-left: 15%;
+		// border: 3rpx solid #D7D7D7;
+	}
+	.experimentIntro-noselect{
+		width: 100%;
+		height: 100%;
+		
+		font-size: 30rpx;
+		color: #c0c0c0;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;	
+		
+		margin-left: 15%;
+		// border: 3rpx solid #D7D7D7;
+	}
+	.slice{
+		// width: 100%;
+		height: 100%;
+		
+		font-size: 30rpx;
+		color: #c0c0c0;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;	
 		
 		
-		width: px2vw(360);
-		height: px2vw(203);
+		// border: 3rpx solid #D7D7D7;
+	}
+	.teachingGuide-selected{
+		width: 100%;
+		height: 100%;
 		
 		
-		// display: flex;
-		// justify-content: center;
-		// align-items:center;
+		font-size: 30rpx;
+		color: #ff0000;
 		
 		
-		// background-color: #ff0000;
-		// color: #ffffff;
+		display: flex;
+		justify-content: center;
+		align-items:center;	
 		
 		
-		// border-radius: 15px 15px 15px 15px;
+		margin-right: 15%;
+		// border: 3rpx solid #D7D7D7;
 	}
 	}
+	.teachingGuide-noselect{
+		width: 100%;
+		height: 100%;
+		
+		font-size: 30rpx;
+		color: #c0c0c0;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;	
+		
+		margin-right: 15%;
+		// border: 3rpx solid #D7D7D7;
+	}			
 </style>
 </style>

+ 1 - 1
components/home/teacher/project.vue

@@ -711,7 +711,7 @@
 					method: "POST",
 					method: "POST",
 					dataType: "json",
 					dataType: "json",
 					success: res => {
 					success: res => {
-						// console.log("请求学生", res);
+						console.log("请求学生", res);
 						if (res.data.Code == 100) {
 						if (res.data.Code == 100) {
 							this.projectMembers = res.data.Users;
 							this.projectMembers = res.data.Users;
 							// console.log();
 							// console.log();

+ 2 - 1
components/student/Index.vue

@@ -85,7 +85,7 @@
 				}
 				}
 				if (obj.id == 2) {
 				if (obj.id == 2) {
 					// this.$refs.table.$forceUpdate();//强制刷新页面
 					// this.$refs.table.$forceUpdate();//强制刷新页面
-					this.$refs.table.getList();
+					this.$refs.vtable.getList();
 				}
 				}
 
 
 			},
 			},
@@ -98,6 +98,7 @@
 			updateInfo(){
 			updateInfo(){
 				// console.log("onShow_学生项目管理平台");
 				// console.log("onShow_学生项目管理平台");
 				this.index = 1;
 				this.index = 1;
+				this.$refs.vtable.getList();
 				this.name=mydata_userInfo.Name;
 				this.name=mydata_userInfo.Name;
 				this.position=userController.userInfo.Profession;
 				this.position=userController.userInfo.Profession;
 			},
 			},

+ 1 - 1
components/student/table.vue

@@ -49,7 +49,7 @@
 			// locationtemp
 			// locationtemp
 		},
 		},
 		created() {
 		created() {
-			this.getList();
+			// this.getList();
 		},
 		},
 		methods: {
 		methods: {
 			paging(obj) {
 			paging(obj) {

+ 1 - 1
components/topMenu.vue

@@ -180,7 +180,7 @@
 						"icon_unchecked": require("../assets/topMenu/learningProcessUnchecked.png"),
 						"icon_unchecked": require("../assets/topMenu/learningProcessUnchecked.png"),
 					},
 					},
 					{
 					{
-						"text": '开始学习',
+						"text": '开始实验',
 						"icon_checked": require("../assets/topMenu/startLearningChecked.png"),
 						"icon_checked": require("../assets/topMenu/startLearningChecked.png"),
 						"icon_unchecked": require("../assets/topMenu/startLearningUnchecked.png"),
 						"icon_unchecked": require("../assets/topMenu/startLearningUnchecked.png"),
 					},
 					},

+ 1 - 1
manifest.json

@@ -1,5 +1,5 @@
 {
 {
-    "name" : "戏剧影视美术XR创作",
+    "name" : "基于XR技术的影视与演播空间设计虚拟仿真实验",
     "appid" : "__UNI__210CF7C",
     "appid" : "__UNI__210CF7C",
     "description" : "",
     "description" : "",
     "versionName" : "1.0.0",
     "versionName" : "1.0.0",

+ 1 - 1
pages.json

@@ -11,7 +11,7 @@
     ],
     ],
 	"globalStyle": {
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "戏剧影视美术XR创作",
+		"navigationBarTitleText": "基于XR技术的影视与演播空间设计虚拟仿真实验",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 		"backgroundColor": "#F8F8F8"
 	}
 	}