diff --git a/.env.development b/.env.development index 8ef84d56..148c3d27 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # 'development' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # VITE_APP_BASE_API_Url = ' http://25.18.122.66:9786' #sit # VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' @@ -24,7 +24,7 @@ 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.78:9786' -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' +# 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' diff --git a/.env.development_h5 b/.env.development_h5 new file mode 100644 index 00000000..3b50f23b --- /dev/null +++ b/.env.development_h5 @@ -0,0 +1,5 @@ +# 开发环境 +ENV = 'development' +# 'development' + +VITE_APP_BASE_API_Url = '' diff --git a/.env.production b/.env.production index 6cbcc735..143ff549 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,4 @@ ENV = 'production' # base api -VITE_APP_BASE_API_Url = 'http://localhost:7000' \ No newline at end of file +VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' \ No newline at end of file diff --git a/package.json b/package.json index dbc667a0..cc24343e 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "build:app-plus:sit": "uni build -p app-plus --mode sit", "build:app-plus:uat": "uni build -p app-plus --mode uat", "build:app-plus:prod": "uni build -p app-plus", + "build:h5:dev": "uni build -p app-plus --mode development_h5", "build:h5": "uni build" }, "dependencies": { diff --git a/src/api/dialog.js b/src/api/dialog.js index 846708a7..99b1584d 100644 --- a/src/api/dialog.js +++ b/src/api/dialog.js @@ -58,6 +58,7 @@ export const chatVoice = (data) => { return request({ url: '/traask/traTestchat/chatVoice', method: 'post', + timeout: 120000, data }); }; diff --git a/src/api/request.js b/src/api/request.js index 519dfdf0..1d2ff316 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -6,7 +6,7 @@ import common from '@/common/common.js' const ENV = import.meta.env export const get_base_url = (url = '') => { - + return '' if (ENV.MODE === 'development') { // 开发环境 // #ifdef H5 if (url) { diff --git a/src/components/examination/es-analysis.vue b/src/components/examination/es-analysis.vue index 169031ba..0e22662b 100644 --- a/src/components/examination/es-analysis.vue +++ b/src/components/examination/es-analysis.vue @@ -12,8 +12,7 @@ {{ item.gradeDimens }}： {{ item.anlyGrade }} - 关键词：{{ passKeyword }} - + @@ -50,20 +49,20 @@ if (!props.value.relKeyword) return []; return props.value.relKeyword.split(/[,、]/).map((key) => key.trim()); }); + + const highlightedText = computed(() => { + // 如果没有关键词，直接返回原文本 + if (!keywords.value.length) return '你的答案：' + props.answerText; + // 构建正则表达式，匹配所有关键词（不区分大小写） + // 对关键词进行转义，避免特殊字符影响正则 + const escapedKeywords = keywords.value.map((keyword) => keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')); - // const highlightedText = computed(() => { - // // 如果没有关键词，直接返回原文本 - // if (!keywords.value.length) return '你的答案：' + props.answerText; - // // 构建正则表达式，匹配所有关键词（不区分大小写） - // // 对关键词进行转义，避免特殊字符影响正则 - // const escapedKeywords = keywords.value.map((keyword) => keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')); + // 创建正则表达式，g表示全局匹配，i表示不区分大小写 + const regex = new RegExp(`(${escapedKeywords.join('|')})`, 'gi'); - // // 创建正则表达式，g表示全局匹配，i表示不区分大小写 - // const regex = new RegExp(`(${escapedKeywords.join('|')})`, 'gi'); - - // // 替换匹配到的关键词，用span包裹并添加高亮样式 - // return '你的答案：' + props.answerText.replace(regex, (match) => `${match}`); - // }); + // 替换匹配到的关键词，用span包裹并添加高亮样式 + return '你的答案：' + props.answerText.replace(regex, (match) => `${match}`); + }); const dimension_all_score = computed(() => { return ( evalSettingVos.value diff --git a/src/manifest.json b/src/manifest.json index dc47c470..1df64dec 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,16 +2,16 @@ "name" : "tra-app", "appid" : "__UNI__EDE0E52", "description" : "", - "versionName" : "0.0.1", - "versionCode" : 1, + "versionName" : "0.0.2", + "versionCode" : 2, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { "usingComponents" : true, "nvueStyleCompiler" : "uni-app", "compilerVersion" : 3, - "renderer": "auto", - "orientation": ["portrait-primary"], + "renderer" : "auto", + "orientation" : [ "portrait-primary" ], "splashscreen" : { "alwaysShowBeforeRender" : true, "waiting" : false, diff --git a/src/pages/example/components/answer.vue b/src/pages/example/components/answer.vue index 1aa254c6..054b9b4c 100644 --- a/src/pages/example/components/answer.vue +++ b/src/pages/example/components/answer.vue @@ -11,23 +11,9 @@ - - - 引用知识库{{ fileList.length }}篇相关资料 - - - {{ index + 1 }}. {{ item.docName }} - - - 本次回答参考资料来源于网络 - - - 发现{{ crsList.length }}个关联课程 - - - {{ index + 1 }}. {{ item.crsName }} - - + 大模型请求时长：{{ dataInfo.aiAskTime }}ms + 生成语音文件时长：{{ dataInfo.transVoice }}ms + 本次回答参考资料来源于网络 @@ -87,7 +73,28 @@ watch( ) watch( () => props.isLoading, - () => {}, + (val) => { + if(!val){ + setTimeout(()=> { + playVoice() + },500) + } + }, + { + deep: true, + immediate: true + } +) +const isPlaying = ref(false) +watch( + () => props.activeVoiceId, + (val) => { + if(val === props.dataInfo.id){ + isPlaying.value = true + }else{ + isPlaying.value = false + } + }, { deep: true, immediate: true @@ -100,7 +107,6 @@ const mdText = computed(() => { const fileList = computed(() => props.dataInfo?.talkingFiles || []) const crsList = computed(() => props.dataInfo?.talkingCrsList || []) const activeNames = ref([1, 2]) -const isPlaying = ref(false) const talkVoiceObj = ref(null) const voiceLoading = ref(false) @@ -118,11 +124,6 @@ const isPlaying = ref(false) talkVoiceObj.value.src = '' isPlaying.value = false }) - // itemVoice.value = unref(dataInfo).talkingVoice - // talkVoiceObj.value.src = itemVoice.value - // setTimeout(()=>{ - // setVoiceTime(0) - // },100) } const setVoiceTime = (sum) => { sum += 1 diff --git a/src/pages/example/dialog.vue b/src/pages/example/dialog.vue index c24bc920..aeea75c5 100644 --- a/src/pages/example/dialog.vue +++ b/src/pages/example/dialog.vue @@ -348,6 +348,7 @@ isLoading: true, id: _id + 'loading' }); + scrollToBottomNow() chatVoice({ chatVoice: data.body.intrctContent }).then(res => { @@ -360,8 +361,10 @@ talkingFiles: [], talkingCrsList: [], talkingVoice: '', - talkingVoiceId: res.body.fileId + talkingVoiceId: res.body.fileId, + ...res.body }); + scrollToBottomNow() }) }; @@ -604,6 +607,7 @@ commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {}) .then((_res) => { if (!!(_res.body.transContent || '').trim()) { + talkingList.value.pop(); askData.value = { reqBatch: reqBatch.value, intrctWay: '02', //01-文本；02-语音；03-图片 diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue index 9286a6b7..0c8e4fe1 100644 --- a/src/pages/me/index.vue +++ b/src/pages/me/index.vue @@ -101,7 +101,7 @@ - + { console.log('goTest');