调整页面

api/kaoshi.js

@@ -200,3 +200,16 @@ export function getClientKaoshiBiaoji(data = {}) {
     timeout: 20000
   })
 }
+
+
+export function getFileUpload(data = {}) {
+  return request({
+    url: '/app/file/upload',
+    headers: {
+      isToken: true
+    },
+    method: 'post',
+    data,
+    timeout: 20000
+  })
+}

components/score/topCard.vue

@@ -3,7 +3,7 @@
 		<view class="title-types"><text>{{name}}</text> <text>{{zyLevelName}}</text></view>
 		<view>
 			<text>{{userScore}}/{{Score}}</text>
-			<text @click="handleOpenCard"><i></i> {{count}}/{{total}}</text>
+			<!-- <text @click="handleOpenCard"><i></i> {{count}}/{{total}}</text> -->
 		</view>
 	</view>
 </template>
@@ -22,17 +22,17 @@
 		Score: {
 			type: [String,Number]
 		},
-		count: {
-			type:  [String,Number]
-		},
-		total: {
-			type:  [String,Number]
-		},
+		// count: {
+		// 	type:  [String,Number]
+		// },
+		// total: {
+		// 	type:  [String,Number]
+		// },
 	})
-	const emits = defineEmits(['openCard'])
-	function handleOpenCard (){
-		emits('openCard')
-	}
+	// const emits = defineEmits(['openCard'])
+	// function handleOpenCard (){
+	// 	emits('openCard')
+	// }
 </script>
 
 <style>

components/zhuapaiConfirm/useCamera.js

@@ -302,6 +302,8 @@ import {
 	nextTick
 } from "vue"
 import {useZhuapaiStore} from "@/store/zhuapai.js"
+import {getFileUpload} from "@/api/kaoshi.js"
+
 // H5 播放抓拍功能
 export function useH5Camera({
 	elVideoId,
@@ -309,6 +311,7 @@ export function useH5Camera({
 	onVideoSuccess, // 成功播放回调
 	onVideoError, // 失败回调
 	zhuapaiHttp, // 抓拍接口将base64 上传
+	operId
 }) {
 
 	const zhuapaiStore = useZhuapaiStore();
@@ -432,21 +435,38 @@ export function useH5Camera({
 		};
 
 		console.log('optoptopt', opt)
-		zhuapaiHttp && zhuapaiHttp(opt)
-			.then(res => {
-				console.log('【源 ： 获取抓拍数据】');
-				this.$emit('getImage', res.data);
-			})
-			.catch(err => {
-				console.error('源 ：抓拍接口异常', err);
-				uni.showToast({
-					icon: 'none',
-					title: '抓拍图片异常!'
-				})
-				uni.redirectTo({
-					url: "/pages/client/Kaoshi/list"
+		
+		getFileUpload(opt).then(res => {
+			const dOption = {
+				operId,
+				url: res.data
+			}
+			zhuapaiHttp && zhuapaiHttp(opt)
+				.then(res => {
+					console.log('【源 ： 获取抓拍数据】');
+					this.$emit('getImage', res.data);
 				})
-			});
+				.catch(err => {
+					console.error('源 ：抓拍接口异常', err);
+					uni.showToast({
+						icon: 'none',
+						title: '抓拍图片异常!'
+					})
+					uni.redirectTo({
+						url: "/pages/client/Kaoshi/list"
+					})
+				});
+		}).catch(err => {
+			uni.showToast({
+				icon: 'none',
+				title: '抓拍图片异常!'
+			})
+			uni.redirectTo({
+				url: "/pages/client/Kaoshi/list"
+			})
+		})
+		
+		
 	}
 
 	return {

components/zhuapaiConfirm/zhuapai.vue

@@ -184,8 +184,8 @@
 	}
 	
 	#Drop {
-		width: 30vw;
-		height: 150rpx;
+		width: 150rpx;
+		height: 200rpx;
 		margin: 0;
 		padding: 0;
 		z-index: 10;

pages/client/Chengji/ksScoreShijuan.vue

@@ -6,7 +6,7 @@
 			<text class="nav-bar-title">{{data.ksName}}</text>
 		</view>
 		<!-- 上方区域 -->
-		<topCard @openCard="handleOpenCard" :name="data.ksName" :zyLevelName="data.zyLevelName" :userScore="data.userScore" :Score="data.Score" :count="activeSt && activeSt.onlyNum||0" :total="data.StListForSearch.length"></topCard>
+		<topCard @openCard="handleOpenCard" :name="data.ksName" :zyLevelName="data.zyLevelName" :userScore="data.userScore" :Score="data.Score"></topCard>
 		
 			<!-- 段落 -->
 			<view class="score-shiti-content">
@@ -57,6 +57,7 @@
 			</view>
 			<!-- 上下按钮 -->
 			<template v-if="activeSt">
+				<text  @click="handleOpenCard"><i></i> {{activeSt && activeSt.onlyNum||0}}/{{data.StListForSearch.length}}</text>
 				<button type="default" size="mini" hover-class="none" class="phone-green-btn score-answer-btn" @click="handlePrev" v-if="!isFistStId">上一题</button>
 				<button type="default" size="mini" hover-class="none"class="phone-green-btn score-answer-btn" @click="handleNext" v-if="!isLastStId">下一题</button>
 			</template>

pages/client/Chengji/lxScoreShijuan.vue

@@ -6,7 +6,7 @@
 			<text class="nav-bar-title">{{data.lxName}}</text>
 		</view>
 		<!-- 上方区域 -->
-		<topCard @openCard="handleOpenCard" :name="data.lxName" :zyLevelName="data.zyLevelName" :userScore="data.userScore" :Score="data.Score" :count="activeSt && activeSt.onlyNum||0" :total="data.StListForSearch.length"></topCard>
+		<topCard @openCard="handleOpenCard" :name="data.lxName" :zyLevelName="data.zyLevelName" :userScore="data.userScore" :Score="data.Score"></topCard>
 		
 		<view>
 			<!-- 段落 -->
@@ -58,6 +58,7 @@
 			</view>	
 			<!-- 上下按钮 -->
 			<template v-if="activeSt">
+				<text  @click="handleOpenCard"><i></i> {{activeSt && activeSt.onlyNum||0}}/{{data.StListForSearch.length}}</text>
 				<button type="default" size="mini" hover-class="none" class="phone-green-btn ks-btn-prev" @click="handlePrev" v-if="!isFistStId">上一题</button>
 				<button type="default" size="mini" hover-class="none"class="phone-green-btn ks-btn-next" @click="handleNext" v-if="!isLastStId">下一题</button>
 			</template>

pages/client/Kaoshi/exam.vue

@@ -691,7 +691,8 @@
 			formatKaoshiData();
 			// 设置抓拍监听
 			zhuapaiRef.value.init({
-				zhuapai: zhuapai || 1
+				zhuapai: zhuapai || 1,
+				operId: operId
 			});
 			// 设置切屏监听
 			qiepingRef.value.init({