Merge branch 'develop' into 'sit'

Develop

See merge request K17_AITS/tra-app!184

.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 # 'development'
 
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 # VITE_APP_BASE_API_Url = ' http://25.18.122.66:9786'
 #sit
 # VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
@@ -19,11 +19,11 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 # h5专用地址x2
 
-#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
-# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786'
+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_TRASTUDY = 'http://25.64.16.130:9602'
+VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
 # VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
 
 

src/api/common.js

@@ -86,9 +86,10 @@ export const commonUploadVoiceFile = (file, url, data = {}, fileKey = 'voice') =
 			filePath: file,
 			name: fileKey,
 			formData: data,
-			timeout: 6000,
+			timeout: 60000,
 			success(result) {
 				try {
+					console.log(result)
 					const res = JSON.parse(result.data);
 					if (res.rtnCode === '0000') {
 						return resolve(res);

src/pages/course/components/touchBtn.vue

@@ -352,6 +352,7 @@
 		isTalking.value = true;
 		emit('startRecord');
 		recNum.value += 1;
+		let _recnum = recNum.value
 		if (!isDisabled.value) {
 			touchX.value = obj.changedTouches[0].pageX;
 			touchY.value = obj.changedTouches[0].pageY;
@@ -361,7 +362,10 @@
 			startRecord();
 			// #endif
 			setTimeout(() => {
-				hideOverlayTalking();
+				console.log(_recnum,recNum.value)
+				if(_recnum === recNum.value) {
+					hideOverlayTalking(recNum.value);
+				}
 			}, 59 * 1010);
 		} else {
 			showTalkingModel.value = false;

src/pages/example/components/answer.vue

@@ -11,9 +11,17 @@
       <MarkdownPreview :mdString="mdText" />
     </view>
     <view class="talking-link">
-      <view class="link-cont-desc">大模型请求时长：{{ dataInfo.aiAskTime }}ms</view>
-      <view class="link-cont-desc">生成语音文件时长：{{ dataInfo.transVoice }}ms</view>
-      <view class="link-cont-desc">本次回答参考资料来源于网络</view>
+      <view class="link-cont-desc">语音转文字的耗时：{{ dataInfo.asrTime }}ms</view>
+      <!-- <view class="link-cont-desc">请求的文字：{{ dataInfo.reqContent }}</view> -->
+      <view class="link-cont-desc">请求内容的字符长度：{{ dataInfo.reqContSize }}</view>
+      <!-- <view class="link-cont-desc">AI问答返回内容：{{ dataInfo.aiContent }}</view> -->
+      <view class="link-cont-desc">AI问答返回内容字符的长度：{{ dataInfo.aiContentSize }}</view>
+      <view class="link-cont-desc">AI问答总耗时：{{ dataInfo.aiAskTime }}ms</view>
+      <view class="link-cont-desc">文字转语音消耗时长：{{ dataInfo.transVoice }}ms</view>
+      <!-- <view class="link-cont-desc">oss 文件id：{{ dataInfo.fileId }}</view> -->
+      <view class="link-cont-desc">上传OSS文件服务消耗时长：{{ dataInfo.ossUpTime }}ms</view>
+      <view class="link-cont-desc">AI回答语音长度时长：{{ dataInfo.playVoiceTime }}s</view>
+      <!-- <view class="link-cont-desc">本次回答参考资料来源于网络</view> -->
     </view>
     <view class="btns-cont">
       <view class="replay-btn" >

src/pages/example/dialog.vue

@@ -350,12 +350,13 @@
 		});
 		scrollToBottomNow()
 		chatVoice({
-			chatVoice: data.body.intrctContent
+			chatVoice: data.body.intrctContent,
+			asrTime: data.body.asrTime || 0
 		}).then(res => {
 			talkingList.value.pop()
 			talkingList.value.push({
 				type: 'answer',
-				talkingText: res.body.content,
+				talkingText: res.body.aiContent,
 				isLoading: false,
 				id: _id + 'a',
 				talkingFiles: [],
@@ -614,7 +615,8 @@
 						intrctContent: _res.body.transContent,
 						bucketKey: _res.body.fileId,
 						ossFileAddr: _res.body.ossFileAddr,
-						talkingVoice: voicePath
+						talkingVoice: voicePath,
+						asrTime: _res.body.asrTime || 1000
 					};
 					sendMessage({
 						commond: 'ASK',