From 537f943409c78f87891ede6addd8990772bec6ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 9 Dec 2025 15:21:39 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix=EF=BC=9A=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/sparring/tip.vue | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue
index 8eb377f0..c244c0be 100644
--- a/src/pages/sparring/tip.vue
+++ b/src/pages/sparring/tip.vue
@@ -323,17 +323,28 @@
 			}
 			showModelComfirm.value = true;
 			reconcatNum.value += 1;
-			// common
-			// 	.show('提示信息', '网络环境不稳定，请重试！', false, '', '确认')
-			// 	.then((res) => {
-			// 		overNow(() => {
-			// 			reconcatNum.value += 1;
-			// 			common.redirectTo(`/pages/index/dialog`);
-			// 		});
-			// 	})
-			// 	.finally(() => {
-			// 		showModelComfirm.value = false;
-			// 	});
+			common
+				.show('提示信息', '网络环境不稳定，请重试！', false, '', '确认')
+				.then((res) => {
+					overNow(() => {
+						reconcatNum.value += 1;
+						// common.redirectTo(`/pages/index/dialog`);
+						socketStore?.closeSocket();
+						common.navigateTo(
+							'/pages/sparring/result?isOver=1&traId=' +
+								traId.value +
+								'&execId=' +
+								execId.value +
+								'&type=' +
+								talkingType.value +
+								'&isPreview=' +
+								(isPreview.value ? '1' : '')
+						);
+					});
+				})
+				.finally(() => {
+					showModelComfirm.value = false;
+				});
 		});
 		unref(SocketObj).on('message', (res) => {
 			const { rtnCode, body, commond } = JSON.parse(res.data);

From 46d1817a2703e22006526e27ac9083f0ffd63be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 9 Dec 2025 15:42:05 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E8=AF=AD=E9=9F=B3=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=92=AD=E6=94=BE=E8=AF=AD=E9=9F=B3?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/sparring/components/answer.vue             | 11 ++++++++---
 src/pages/sparring/components/question-preview.vue   | 12 ++++++++----
 .../sparring/components/talking-preview-item.vue     | 11 ++++++++---
 src/pages/sparring/result.vue                        |  6 ++++--
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/pages/sparring/components/answer.vue b/src/pages/sparring/components/answer.vue
index c9ee8049..5df462ba 100644
--- a/src/pages/sparring/components/answer.vue
+++ b/src/pages/sparring/components/answer.vue
@@ -5,13 +5,13 @@
 		</view>
 	</view>
 	<view class="answer-content" v-else>
-		<view :class="['talking-gif', !voiceLoading&&(props.activeVoiceId === dataInfo.id) ? 'is-play' : '']">
+		<view v-if="showVoice" :class="['talking-gif', !voiceLoading&&(props.activeVoiceId === dataInfo.id) ? 'is-play' : '']">
 			<CommonLoading color="#06f" v-show="voiceLoading" />
 		</view>
 		<view class="talking-cont">
 			<MarkdownPreview :mdString="mdText" />
 		</view>
-		<view class="btns-cont" v-if="!dataInfo.isLoading">
+		<view class="btns-cont" v-if="!dataInfo.isLoading && showVoice">
 			<!-- <view class="replay-btn" @click="reAnswer" v-if="!props.dataInfo.isHistory">
 				<image class="icon" src="@/static/images/dialog/answer-restart1.png" style="width: 100%; height: 100%"></image>
 			</view>
@@ -83,13 +83,18 @@
 			default: true,
 			type: Boolean
 		},
+		showVoice: {
+			default: true,
+			type: Boolean
+		},
 	})
 	const {
 		isLast,
 		dataInfo,
 		roleInfo,
 		activeVoiceId,
-		isStudy
+		isStudy,
+		showVoice
 	} = toRefs(props)
 	const isPlaying = ref(false)
 	const voiceIsPlaying = ref(false)
diff --git a/src/pages/sparring/components/question-preview.vue b/src/pages/sparring/components/question-preview.vue
index e340391c..cadda673 100644
--- a/src/pages/sparring/components/question-preview.vue
+++ b/src/pages/sparring/components/question-preview.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="talking-info"  v-if="dataInfo.intrctWay === '02'">
-		<view :class="['talking-gif', !voiceLoading&&(props.activeVoiceId === dataInfo.id) ? 'is-play' : '']">
+		<view v-if="showVoice" :class="['talking-gif', !voiceLoading&&(props.activeVoiceId === dataInfo.id) ? 'is-play' : '']">
 			<CommonLoading color="#f60" v-show="voiceLoading"/>
 		</view>
-		<view class="right-time">{{voiceTime}}</view>
+		<view v-if="showVoice" class="right-time">{{voiceTime}}</view>
 		<view class="talking-cont">
 			<rich-text :class="['talking-text translate-text loading']" v-show="!translateLoading" :nodes="`<span>${showContent}</span>`">
 			</rich-text>
@@ -11,7 +11,7 @@
 				<CommonLoading color="#f60"/>
 			</view>
 		</view>
-		<view class="btns-cont">
+		<view class="btns-cont"  v-if="showVoice">
 			<view class="play-btn">
 				<image class="icon" 
 					v-show="!(!voiceLoading&&(props.activeVoiceId === dataInfo.id))" 
@@ -64,8 +64,12 @@ import { onUnload } from '@dcloudio/uni-app';
 			default:'',
 			type: String
 		},
+		showVoice: {
+			default: true,
+			type: Boolean
+		}
 	})
-	const { activeVoiceId, dataInfo } = toRefs(props)
+	const { activeVoiceId, dataInfo, showVoice } = toRefs(props)
 	const emit = defineEmits(['changePlay'])
 	// 声音播放初始化
 	const talkVoiceObj = ref(null)
diff --git a/src/pages/sparring/components/talking-preview-item.vue b/src/pages/sparring/components/talking-preview-item.vue
index e584d157..307e4499 100644
--- a/src/pages/sparring/components/talking-preview-item.vue
+++ b/src/pages/sparring/components/talking-preview-item.vue
@@ -11,9 +11,9 @@
 			</view>
 		</view>
 		<questionVue v-if="talkingType === 'question'" @changePlay="changePlay" :dataInfo="talkingInfo" :isLast="isLast" :roleInfo="roleInfo"
-			:activeVoiceId="activeVoiceId"></questionVue>
+			:activeVoiceId="activeVoiceId" :showVoice="showVoice"></questionVue>
 		<answerVue v-else-if="talkingType === 'answer'" @changePlay="changePlay" :dataInfo="talkingInfo" :isLast="isLast" :roleInfo="roleInfo"
-		 :isAnswering="props.isAnswering" @handleEvents="handleEvents" :activeVoiceId="activeVoiceId" :isStudy="false">
+		 :isAnswering="props.isAnswering" @handleEvents="handleEvents" :activeVoiceId="activeVoiceId" :isStudy="false" :showVoice="showVoice">
 		</answerVue>
 		<view v-else></view>
 	</view>
@@ -63,6 +63,10 @@
 			default: false,
 			type: Boolean
 		},
+		showVoice: {
+			default: true,
+			type: Boolean
+		}
 	})
 	watch(() => props.activeVoiceId, () => {}, {
 		deep: true,
@@ -75,7 +79,8 @@
 	const {
 		talkingType,
 		talkingInfo,
-		roleInfo
+		roleInfo,
+		showVoice
 	} = toRefs(props)
 	
 	const loadingTips = ref(false)
diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue
index fb752a7e..4a561726 100644
--- a/src/pages/sparring/result.vue
+++ b/src/pages/sparring/result.vue
@@ -41,12 +41,12 @@
 					<view class="loading-box" v-if="isLoading"></view>
 					<TalkingPreviewItem class="talk-item" v-for="item in showTalkList" :talkingType="item.type"
 						:talkingInfo="item" :roleInfo="roleInfo" :traId="traId" :execId="execId" :isAnswering="false"
-						:activeVoiceId="activeVoiceTalkingItemId" @handleEvents="talkItemEvents"></TalkingPreviewItem>
+						:activeVoiceId="activeVoiceTalkingItemId" @handleEvents="talkItemEvents" :showVoice="isTalking"></TalkingPreviewItem>
 				</view>
 				<view :class="['body-top-collepse-cont', showAllTalk?'show-all':'']">
 					<TalkingPreviewItem class="talk-item" v-for="item in hideTalkList" :talkingType="item.type"
 						:talkingInfo="item" :roleInfo="roleInfo" :traId="traId" :execId="execId" :isAnswering="false"
-						:activeVoiceId="activeVoiceTalkingItemId" @handleEvents="talkItemEvents"></TalkingPreviewItem>
+						:activeVoiceId="activeVoiceTalkingItemId" @handleEvents="talkItemEvents" :showVoice="isTalking"></TalkingPreviewItem>
 				</view>
 			</view>
 			<view class="body-bottom">
@@ -210,6 +210,7 @@
 	const negativeList = ref([]) // 劣质话术
 	const positiveList = ref([]) // 劣质话术
 	const isLoading = ref(false)
+	const isTalking = ref(true)
 	const getData = () => {
 		isLoading.value = true
 		partnerChatReport({
@@ -228,6 +229,7 @@
 				positiveList.value = res.body.positiveList || []
 				negativeList.value = res.body.negativeList || []
 				hitBanWords.value = res.body.traPartnerExecuteHisVo?.hitBanWords || ''
+				isTalking.value = res.body.traPartnerExecuteHisVo?.traInterTyp  === '01'
 				let _evalDimens = res.body.traPartnerSettlement || []
 				evalDimens.value = _evalDimens.map((t, index) => {
 					return {

From 422dd1715f49959e4538d37897f91fbd239005a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 9 Dec 2025 16:10:55 +0800
Subject: [PATCH 3/4] fix: bug

---
 src/pages/sparring/detail.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/sparring/detail.vue b/src/pages/sparring/detail.vue
index 368bcbf8..e64fb579 100644
--- a/src/pages/sparring/detail.vue
+++ b/src/pages/sparring/detail.vue
@@ -394,7 +394,8 @@
 					font-size: 28rpx;
 					line-height: 52rpx;
 					color: #333;
-
+					white-space: pre-line;
+					
 					&-file {
 						color: #06f;
 					}

From f3235a706f43fdecc7b62c6c9f9859aa8d5a9a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 9 Dec 2025 20:29:25 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=AD=A6=E4=B9=A0=E5=88=86=E6=9E=90?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development.yh           |  4 ++--
 src/api/sparring.js           |  1 +
 src/pages/analytics/study.vue | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/.env.development.yh b/.env.development.yh
index 2b8b529b..95d4857d 100644
--- a/.env.development.yh
+++ b/.env.development.yh
@@ -2,10 +2,10 @@
 ENV = 'development.yh'
 # 'development.yh'
 
-VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
+# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
-# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
+VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
 # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604'
 # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603'
diff --git a/src/api/sparring.js b/src/api/sparring.js
index 2b9c8f05..d34cc3ee 100644
--- a/src/api/sparring.js
+++ b/src/api/sparring.js
@@ -62,6 +62,7 @@ export const partnerChatReportTrigger = (data) => {
 export const partnerChatPrompt = (data) => {
 	return request({
 		url: base_url + '/traPartnerChat/partnerChatPrompt',
+		timeout: 60000,
 		method: 'post',
 		data
 	});
diff --git a/src/pages/analytics/study.vue b/src/pages/analytics/study.vue
index 64a62a9a..429f1f15 100644
--- a/src/pages/analytics/study.vue
+++ b/src/pages/analytics/study.vue
@@ -16,6 +16,8 @@
 						:current="currentTab" class="font_pf my_tabs"
 						:inactive-style="{ color: '#333333', fontSize: '28rpx', fontWeight: '500' }"
 						:activeStyle="{ color: '#333333', fontSize: '28rpx', fontWeight: '600' }"></uv-tabs>
+					<view class="tab-btn" v-show="!overLoading" @click="showToast"></view>
+					<!--  v-if="!overLoading" -->
 				</view>
 				<!-- <view class="calendar-box" @click="openCalendar">统计周期</view>
 				<uv-calendar ref="calendarRef" mode="range" @confirm="calendarConfirm" minDate="2025-01-01" :maxDate="maxDate" monthNum="100" :allowSameDay="true"></uv-calendar> -->
@@ -229,6 +231,12 @@
 	const loading2 = ref(false)
 	const loading3 = ref(false)
 	const loading4 = ref(false)
+	const overLoading = computed(()=>{
+		return !loading.value && !loading1.value && !loading2.value && !loading3.value && !loading4.value
+	})
+	const showToast = () => {
+		common.msg('学习分析生成中，请稍后再试！')
+	}
 	const getInfoNow = async (params) => {
 		loading.value = true
 		loading2.value = true
@@ -440,6 +448,17 @@
 
 				.tabs-box {
 					width: 600rpx;
+					height: 88rpx;
+					position: relative;
+					.tab-btn{
+						position: absolute;
+						width: 600rpx;
+						height: 88rpx;
+						top: 0;
+						left: 0;
+						z-index: 23;
+						// background-color: #ccc;
+					}
 				}
 
 				.analytics-items {