wangxy 2 kuukautta sitten
vanhempi
commit
c6490195ef

+ 8 - 3
components/zhuapaiConfirm/useCamera.js

@@ -428,6 +428,7 @@ export function useH5Camera({
 			data: imgData[1],
 			prefix: 'kaoshi/zhuapai',
 			suffix: 'png',
+			
 		};
 
 		console.log('optoptopt', opt)
@@ -438,9 +439,13 @@ export function useH5Camera({
 			})
 			.catch(err => {
 				console.error('源 :抓拍接口异常', err);
-				this.$router.push({
-					name: 'examList'
-				});
+				uni.showToast({
+					icon: 'none',
+					title: '抓拍图片异常!'
+				})
+				uni.redirectTo({
+					url: "/pages/client/Kaoshi/list"
+				})
 			});
 	}
 

+ 60 - 11
components/zhuapaiConfirm/zhuapai.vue

@@ -112,9 +112,10 @@
 			// 启动摄像头
 			nextTick(() => {
 				startCamera()
+				// 设定计时器
+				setInterval(() => handleZhua(), zhuapai.value * 60 * 1000)
 			})
-			// 设定计时器
-			// setInterval(() => handleZhua(), zhuapai.value * 60 * 1000 || 6000000)
+
 		}
 	}
 
@@ -166,15 +167,63 @@
 </script>
 
 <style lang="scss">
-	.zhuapai-drop-container {
-		width: 160rpx;height: 300rpx;margin: 0;padding: 0;z-index: 10;position: absolute;right: 0;top: 30%;overflow: hidden;
-		.phone-camera-box-zhuapai{
-			width: 100%;height: 200rpx;position: absolute;overflow: hidden;
-			.uni-video-container{background-color: transparent;}
-			.hidden-video{transform: translateY(500rpx);}
+	// .zhuapai-drop-container {
+	// 	width: 160rpx;height: 300rpx;margin: 0;padding: 0;z-index: 10;position: absolute;right: 0;top: 30%;overflow: hidden;
+	// 	.phone-camera-box-zhuapai{
+	// 		width: 100%;height: 200rpx;position: absolute;overflow: hidden;
+	// 		.uni-video-container{background-color: transparent;}
+	// 		.hidden-video{transform: translateY(500rpx);}
+	// 	}
+	// 	.video-view-box{/*width:100%;-height: 200rpx;*/position: absolute;}
+	// 	.shiti-video-hidden-btn,.shiti-video-show-btn{
+	// 		background-color: red;width: 50rpx;height: 50rpx;display: block;position: absolute;bottom:50px;}
+	// }
+	
+	.dropContainer {
+		height: 200rpx;
+	}
+	
+	#Drop {
+		width: 30vw;
+		height: 150rpx;
+		margin: 0;
+		padding: 0;
+		z-index: 10;
+		position: absolute;
+		right: 0;
+		top: 30%;
+		
+		.uni-video-container{background-color: transparent;}
+		
+		.video-view-box {
+			height: 10vh;
+			width: 100%
+		}
+		
+		::v-deep .uni-video-container {
+			position: absolute;
 		}
-		.video-view-box{/*width:100%;-height: 200rpx;*/position: absolute;}
-		.shiti-video-hidden-btn,.shiti-video-show-btn{
-			background-color: red;width: 50rpx;height: 50rpx;display: block;position: absolute;bottom:50px;}
+		::v-deep .uni-video-video {
+			position: absolute;
+		}
+		::v-deep .uni-canvas-canvas {
+			position: absolute;
+		}
+		::v-deep .show-video {
+			z-index: 10;
+			.uni-video-video,
+			.uni-canvas-canvas {
+				z-index: 10;
+			}
+		}
+		::v-deep .uni-video-container {}
+		::v-deep .hidden-video {
+			z-index: -10;
+			.uni-video-video,
+			.uni-canvas-canvas,
+			{
+			z-index: -10;
+		}
+	}
 	}
 </style>

+ 2 - 2
pages/client/Kaoshi/exam.vue

@@ -618,7 +618,7 @@
 
 	function handleBiaoji() {
 		activeSt.value.marked = !activeSt.value.marked;
-		data.biaoji.value[activeSt.value.stId] = activeSt.value.marked
+		data.biaoji[activeSt.value.stId] = activeSt.value.marked
 		ksApi.getClientKaoshiBiaoji({
 			operId: data.operId,
 			biaoji: JSON.stringify(data.biaoji)
@@ -691,7 +691,7 @@
 			formatKaoshiData();
 			// 设置抓拍监听
 			zhuapaiRef.value.init({
-				zhuapai: zhuapai
+				zhuapai: zhuapai || 1
 			});
 			// 设置切屏监听
 			qiepingRef.value.init({