From 810a829d5f94acf5e6bf616d7bf5c11f46383fcb Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Fri, 8 Mar 2024 10:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=A1=B5=E9=9D=A2=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E5=9B=9E=E9=A1=BE,=20=E9=87=8D=E6=96=B0=E6=8C=91?=
 =?UTF-8?q?=E6=88=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/s-video/res-s-video.vue | 101 ++++++++++++++++++++---------
 components/s-video/s-video.vue     |   9 +--
 subpkg/complete/complete.vue       |   9 +--
 subpkg/practice/practice.vue       |   2 -
 subpkg/respractice/respractice.vue |  64 ++++++++----------
 subpkg/review/review.vue           |  27 ++++++--
 subpkg/role/role.vue               |   2 +-
 7 files changed, 134 insertions(+), 80 deletions(-)

diff --git a/components/s-video/res-s-video.vue b/components/s-video/res-s-video.vue
index 3025aae..00139d9 100644
--- a/components/s-video/res-s-video.vue
+++ b/components/s-video/res-s-video.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="video-wrapper" id="video-container">
 		<view style="position:relative;width:100%;" :style="{'height':videoHeight+'px'}">
-			<video id="video_play" :controls="false" :src="videoObj.videoUrl" @ended="videoEnded()" :autoplay="auto" :show-fullscreen-btn="false" :loop="isLoop" style="width: 100%;height: 90%;"></video>
+			<video id="video_play" :controls="false" :src="videoObj.videoUrl" @ended="videoEnded()" :autoplay="auto" :show-fullscreen-btn="false" :loop="isLoop" style="width: 100%;height: 100%;" object-fit="cover"></video>
 			<view class="question"></view>
 			<view class="popup-layer-back" v-if="!start" v-show="question">
 				<!-- <view class="popup-layer-close" @click="question=false">关闭</view> -->
@@ -24,7 +24,10 @@
 			</view> -->
 			<view class="popup-layer-back" v-show="resCheck">
 				<view class="popup-layer" style="color: red;" @click="toResVideo()">
-					<p>重新选择逃生路线</p>
+					<view class="anitem1">
+						<image class="animg1" src="/static/videos/skin_bg_v1.png"></image>
+						<!-- <view class="antxt1">重新选择逃生路线</view> -->
+					</view>
 				</view>
 			</view>
 		</view>
@@ -54,7 +57,6 @@
 				end: false,
 				auto: true,
 				question: false,
-				questionFreId: "",
 				preQuestionId: "",
 				correct: "",
 				ask: "",
@@ -71,12 +73,25 @@
 			   handler:function(){
 				   this.getBindJson();
 			   }
-		   }	
+		   },
+		   questionFreId: {
+				handler: function() {
+					this.queryQAByFreId();
+				}
+		   }
 		},
 		props:{
 			jsonId: {
 				type: String,
 				default: "",
+			},
+			sceneId: {
+				type: String,
+				default: "",
+			},
+			questionFreId: {
+				type: String,
+				default: "",
 			}
 		},
 		created() {
@@ -88,7 +103,7 @@
 			
 			this.videoContext = uni.createVideoContext("video_play");
 			this.videoContext.requestFullScreen();
-			this.queryQAByFreId();
+			// this.queryQAByFreId();
 		},
 		methods: {
 			videoEnded() {
@@ -118,9 +133,9 @@
 						this.end = true;
 						this.answerList = [];
 						this.question = false;
-						uni.navigateTo({
-						  url: '/subpkg/complete/complete?questionFreId='+this.questionFreId+'&roleId='+this.jsonId
-						})
+						// uni.navigateTo({
+						//   url: '/subpkg/complete/complete?questionFreId='+this.questionFreId+'&roleId='+this.jsonId
+						// })
 					} else {
 						// 不为空表示答题错误展示返回重新选择
 						this.resCheck = true;
@@ -232,7 +247,7 @@
 					}).catch((e) => console.log(e)); //捕获异常
 			},
 			queryQAByFreId() {
-				this.$api.queryQAByFreId('084ddf84e4be4b02acdcfad396c28f98')
+				this.$api.queryQAByFreId(this.questionFreId)
 					.then(res => {
 						this.autoAnswerList.push(...res.data);
 					}).catch((e) => console.log(e)); //捕获异常
@@ -261,9 +276,9 @@
 					this.end = true;
 					this.answerList = [];
 					this.question = false;
-					uni.navigateTo({
-					  url: '/subpkg/complete/complete?questionFreId='+this.questionFreId+'&roleId='+this.jsonId
-					})
+					// uni.navigateTo({
+					//   url: '/subpkg/complete/complete?questionFreId='+this.questionFreId+'&roleId='+this.jsonId
+					// })
 				}
 			}
 		}
@@ -271,6 +286,22 @@
 </script>
 
 <style>
+	/* 设置弹出层 */
+	.marsk {
+		position: absolute;
+		z-index: 999;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, .35);
+	}
+	.animg {
+		position:absolute;
+		top:0;left:0;right:0;bottom:0;
+		margin:auto;
+		width: 100px;
+		height: 100px;
+	}
+	
 	/* 首先设置背景层 */
 	.popup-layer-back {
 		position: absolute;
@@ -293,7 +324,28 @@
 		padding: 20px;
 		z-index: 9999;
 	}
-	
+
+	.popup-layer .anitem1 {
+		position: relative;
+		/* margin: 80rpx; */
+		width: 650rpx;
+		height: 200rpx;
+		/* text-align: center; */
+	}
+
+	.popup-layer .anitem1 .animg1 {
+		width: 100%;
+		height: 100%;
+	}
+
+	.popup-layer .anitem1 .antxt1 {
+		position: absolute;
+		top: 45%;
+		left: 10%;
+		width: 100%;
+		font-size: 1.2rem;
+	}
+
 	.popup-layer .anitem {
 		position: relative;
 		margin: 80rpx;
@@ -301,27 +353,19 @@
 		height: 100rpx;
 		text-align: center;
 	}
-	
+
 	.popup-layer .anitem .animg {
 		width: 100%;
 		height: 160rpx;
 	}
-	
+
 	.popup-layer .anitem .antxt {
 		position: absolute;
-		top: 60%;
+		top: 30%;
 		width: 100%;
 		font-size: 1.2rem;
 	}
-	
-	.antxtCheck {
-		position: absolute;
-		top: 60%;
-		width: 100%;
-		font-size: 1.2rem;
-		color: red;
-	}
-	
+
 	.judd {
 		position: absolute;
 		top: -20rpx;
@@ -330,15 +374,15 @@
 		height: 100rpx;
 		border-radius: 50%;
 	}
-	
+
 	.jdok {
 		background-color: rgba(3, 173, 55, .35);
 	}
-	
+
 	.jderr {
 		background-color: rgba(249, 21, 43, .35);
 	}
-	
+
 	.judd .judimg {
 		position: absolute;
 		top: 50%;
@@ -348,7 +392,6 @@
 		width: 50%;
 		height: 50%;
 	}
-	
 
 	/* 设置关闭按钮 */
 	.popup-layer-close {
diff --git a/components/s-video/s-video.vue b/components/s-video/s-video.vue
index b92b8d6..53052a2 100644
--- a/components/s-video/s-video.vue
+++ b/components/s-video/s-video.vue
@@ -5,7 +5,6 @@
 		</view>
 		<view style="position:relative;width:100%;" :style="{'height':videoHeight+'px'}">
 			<video id="video_play" @click="stopPlay" :controls="false" :src="videoObj.videoUrl" @ended="videoEnded()" :autoplay="auto" :show-fullscreen-btn="false" :loop="isLoop" style="width: 100%;height: 100%;" object-fit="cover"></video>
-
 			<view class="question"></view>
 			<view class="popup-layer-back" v-if="!start" v-show="question">
 				<!-- <view class="popup-layer-close" @click="question=false">关闭</view> -->
@@ -15,8 +14,7 @@
 						<image class="animg1" src="/static/videos/skin_bg_v1.png"></image>
 						<view class="antxt1">{{ask}}</view>
 					</view>
-					<view class="anitem" @click="nextQuestion(item.outs[0], item)" v-for="(item, index) in answerList"
-						:key="index">
+					<view class="anitem" @click="nextQuestion(item.outs[0], item)" v-for="(item, index) in answerList" :key="index">
 						<image class="animg" src="/static/videos/skin_bg_1a.png"></image>
 						<view class="antxt">{{item.channel}}</view>
 						<view class="judd jdok" v-show="isOk && item.choose === 'true'">
@@ -35,7 +33,10 @@
 			</view> -->
 			<view class="popup-layer-back" v-show="resCheck">
 				<view class="popup-layer" @click="toResVideo()">
-					<p>重新选择逃生路线</p>
+					<view class="anitem1">
+						<image class="animg1" src="/static/videos/skin_bg_v1.png"></image>
+						<view class="antxt1">重新选择逃生路线</view>
+					</view>
 				</view>
 			</view>
 		</view>
diff --git a/subpkg/complete/complete.vue b/subpkg/complete/complete.vue
index a0866a9..49d487f 100644
--- a/subpkg/complete/complete.vue
+++ b/subpkg/complete/complete.vue
@@ -119,8 +119,8 @@
 			  clearTimeout(this.timer)
 			}, 5000)
 			this.roleId = options.roleId
-			//this.questionFreId = options.questionFreId
-			//this.sceneId = options.sceneId;
+			this.questionFreId = options.questionFreId
+			this.sceneId = options.sceneId;
 			this.getQuestionList()
 			this.getRecordList()
 			this.editUserMedal();
@@ -191,12 +191,13 @@
 			},
 			reChallenge() {
 				uni.navigateTo({
-					url: '/subpkg/rechallenge/rechallenge?questionFreId=' + this.questionFreId
+					// url: '/subpkg/rechallenge/rechallenge?questionFreId=' + this.questionFreId
+					url: '/subpkg/practice/practice?roleId='+this.roleId+'&sceneId='+this.sceneId
 				})
 			},
 			review() {
 				uni.navigateTo({
-					url: '/subpkg/review/review?questionFreId=' + this.questionFreId
+					url: '/subpkg/review/review?questionFreId=' + this.questionFreId +'&sceneId=' + this.sceneId +"&roleId=" + this.roleId
 				})
 			},
 			closeShare() {
diff --git a/subpkg/practice/practice.vue b/subpkg/practice/practice.vue
index 02f243a..244a7ae 100644
--- a/subpkg/practice/practice.vue
+++ b/subpkg/practice/practice.vue
@@ -1,7 +1,5 @@
 <template>
 		<view class="wrap">
-			<!-- <view class="video-wrapper" id="video-container"></view>
-			<view class="stabar"></view>-->
 			<view class="secbar"> <label class="back" @click="back()"></label></view>
 			<view class="mainwrap3">
 				<view class="role_wrap"><sVideo :jsonId="jsonId" :sceneId="sceneId"></sVideo></view>
diff --git a/subpkg/respractice/respractice.vue b/subpkg/respractice/respractice.vue
index c6dd9e6..48d84ab 100644
--- a/subpkg/respractice/respractice.vue
+++ b/subpkg/respractice/respractice.vue
@@ -1,10 +1,8 @@
 <template>
-	<view class="role-container">
-		<view class="wrap">
-			<view class="secbar"> <span class="back" @click="back()"></span></view>
-			<view class="mainwrap3">
-				<view class="role_wrap"><sVideo :jsonId="jsonId"></sVideo></view>
-			</view>
+	<view class="wrap">
+		<view class="secbar"> <span class="back" @click="back()"></span></view>
+		<view class="mainwrap3">
+			<view class="role_wrap"><sVideo :jsonId="jsonId" :questionFreId="questionFreId" :sceneId="sceneId"></sVideo></view>
 		</view>
 	</view>
 </template>
@@ -16,28 +14,18 @@
 		data() {
 			return {
 				page: "",
-				jsonId: "",
+				questionFreId: "",
 				roleId:"",
+				jsonId:""
 			};
 		},
 		onLoad(options) {
-			this.jsonId = options.roleId
-		},
-		onReady() {
-			this.QR();
+			this.jsonId = options.roleId;
+			this.questionFreId = options.questionFreId;
+			console.log(this.questionFreId);
+			this.sceneId = options.sceneId;
 		},
 		methods: {
-			QR() {
-				// uni.scanCode({
-				// 	onlyFromCamera: true,
-				// 	success: (res) => {
-				// 		console.log('扫描二维码成功,结果:' + res.result);
-				// 	},
-				// 	error: (res) => {
-				// 		console.log('扫描二维码出现错误')
-				// 	}
-				// })
-			},
 			back(){
 				uni.navigateBack({
 					delta:1,//返回层数，2则上上页
@@ -53,30 +41,34 @@
 <style lang="scss">
 
 @import url("@/static/base_css.css");	
-.role-container {
-	width: 100%;
-	height: 100%;	
-}
 
 .secbar {
-    top: 0;
-    z-index: 1;
+	position: absolute;
+	z-index: 999999;
+	background-color: transparent;
 }
 
-.secbar ._span.back {
-    top: 50px;
+.secbar label.back {
+    position: absolute;
+	top: 6rpx;
+    left: 4%;
+    padding-left: 0;
+    background: url(/static/images/icon_arbw.png) no-repeat left 40% center;
+	background-size: auto 50%;
+	background-color: rgba(255, 255, 255, .2);
+	border: 1rpx solid rgba(255, 255, 255, .7);
+    border-radius: 50%;
 }
 
 .mainwrap3 {
-	top: 0;
-	height: calc(100% - 70px);
-	overflow: hidden;
+	height: 100%;
+	background-color: #000;
 }
-
 .role_wrap {
-	position: absolute;
-	top: 5%;
+	position: relative;
+	/* top: -62rpx; */
 	margin: 0;
 	width: 100%;
+	height: 100%;
 }
 </style>
\ No newline at end of file
diff --git a/subpkg/review/review.vue b/subpkg/review/review.vue
index d440fed..52140eb 100644
--- a/subpkg/review/review.vue
+++ b/subpkg/review/review.vue
@@ -14,9 +14,10 @@
 			</view>
 		<scroll-view  class="question-info" scroll-y>
 	       <view class="question-list">
-			 <view class="question-item" v-for="(item, i) in questionList" :key="i" @click="itemClickHandler(item)">
+		    <image :src="imgUrl" @click="respractice"></image>
+			 <!-- <view class="question-item" v-for="(item, i) in questionList" :key="i" @click="itemClickHandler(item)">
 			    
-			 </view>
+			 </view> -->
 		   </view>
 		</scroll-view>
 	</view>
@@ -30,14 +31,20 @@
 			   "sceneName":"",
 			   "roleName":"",
 			   "total":0,
-			   "questionFreId":"",
+			   questionFreId: "",
+			   sceneId: "",
+			   roleId: "",
+			   imgUrl: "",
 			   questionList:[]
 			}
 		},
 		onLoad(options) {
-			this.questionFreId = options.questionFreId
+			this.roleId = options.roleId;
+			this.questionFreId = options.questionFreId;
+			this.sceneId = options.sceneId;
 			this.getQuestionList()
 			this.getRelationInfo()
+			this.getFiles();
 		},
 		methods: {
 			async getQuestionList() {
@@ -61,6 +68,18 @@
 				}
 		    	//uni.$showMsg('数据请求成功！')
 		    },
+			async getFiles() {
+				const {
+					data: res
+				} = await uni.$http.get('/small/scene/manage/queryFiles/'+this.sceneId);
+				this.imgUrl = uni.$http.baseUrl + res.data.filePreview.fileList[0];
+				//uni.$showMsg('数据请求成功！')
+			},
+			respractice() {
+				uni.navigateTo({
+					url: '/subpkg/respractice/respractice?questionFreId=' + this.questionFreId +'&sceneId=' + this.sceneId +"&roleId=" + this.roleId
+				})
+			},
 			back(){
 				uni.navigateBack({
 					delta:1,//返回层数，2则上上页
diff --git a/subpkg/role/role.vue b/subpkg/role/role.vue
index 5a1b2b2..a640cdc 100644
--- a/subpkg/role/role.vue
+++ b/subpkg/role/role.vue
@@ -113,7 +113,7 @@
 			  }
 			  uni.navigateTo({
 			    url: '/subpkg/practice/practice?roleId='+this.roleId+'&sceneId='+this.sceneId
-			    //url: '/subpkg/practice/respractice?roleId='+this.roleId
+				// url: '/subpkg/respractice/respractice?questionFreId=' + 'b40c04f73cec48389efa8ac81e6a5194' +'&sceneId=' + this.sceneId +"&roleId=" + this.roleId
 			  })
 			},
 			back(){