tianyan/tra-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

Browse Source
This commit is contained in:
田岩
2025-12-17 17:55:20 +08:00
parent ec75805717 ee39295a17
commit b723577f25
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development.yh
+3 -3
View File
@@ -2,14 +2,14 @@
ENV = 'development.yh' ENV = 'development.yh'
# '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.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_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_TRAEXAM = 'http://25.64.32.154:9604'
# VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603' # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603'
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601' VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601'
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.158:9601' # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.158:9601'
# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.32.154:9602' # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.32.154:9602'
src/pages/course/components/talkingItem.vue
+25
View File
@@ -67,6 +67,11 @@
:fileId="dataInfo.vidoAddrs[0].vidAddr" :fileId="dataInfo.vidoAddrs[0].vidAddr"
:picId="dataInfo.vidoAddrs[0].vidImgAddr" @click="previewVideo(dataInfo.vidoAddrs[0])"> :picId="dataInfo.vidoAddrs[0].vidImgAddr" @click="previewVideo(dataInfo.vidoAddrs[0])">
</VideoPreview> </VideoPreview>
<view class="file-items" v-if="(dataInfo.fileData || []).length > 0">
<view class="file-item" v-for="item in dataInfo.fileData" @click="previewFile(item)">
{{item.fileName.replace(/.docx|.doc|.txt/g, '.pdf')}}
</view>
</view>
</view> </view>
<!-- 举例预览 --> <!-- 举例预览 -->
<view class="talking-text" v-if="type === 3 && dataInfo.exampie" style="overflow: hidden"> <view class="talking-text" v-if="type === 3 && dataInfo.exampie" style="overflow: hidden">
@@ -245,6 +250,10 @@
import Subject from '@/components/examination/subject.vue'; import Subject from '@/components/examination/subject.vue';
// import RadioSubjectRequest from '@/pages/wrong_question_record/components/radio-subject.vue' // import RadioSubjectRequest from '@/pages/wrong_question_record/components/radio-subject.vue'
import {
previewFileFnc
} from '@/common/common'
const storageStore = useStorageStore(); const storageStore = useStorageStore();
const audioCacheObj = computed(() => storageStore.audioObj); const audioCacheObj = computed(() => storageStore.audioObj);
@@ -320,6 +329,13 @@
}); });
const mode = ref('study'); // 考试 examination 练习practice 学习study const mode = ref('study'); // 考试 examination 练习practice 学习study
const previewFile = info => {
previewFileFnc({
fileId: info.fileId,
getFileSrc: '/traapp/traFilePreview/',
fileName: info.fileName + '.pdf'
})
}
const showWithdraw = computed(() => { const showWithdraw = computed(() => {
let _isMe = unref(lastQuestionInfo).qstLogId === unref(dataInfo).qstLogId; let _isMe = unref(lastQuestionInfo).qstLogId === unref(dataInfo).qstLogId;
let _isQuestion = unref(lastQuestionInfo).isQuestion; let _isQuestion = unref(lastQuestionInfo).isQuestion;
@@ -895,6 +911,15 @@
// min-height: 36px; // min-height: 36px;
} }
} }
.file-items{
.file-item {
line-height: 36rpx;
font-size: 28rpx;
margin-bottom: 8rpx;
color: #06f;
}
}
.cont-img-box { .cont-img-box {
width: 433rpx; width: 433rpx;
src/pages/sparring/tip.vue
+1
View File
@@ -545,6 +545,7 @@ onHide(() => {
}) })
// #endif // #endif
onLoad(params => { onLoad(params => {
execId.value = ''
traId.value = params.traId traId.value = params.traId
chaId.value = params.chaId chaId.value = params.chaId
talkingType.value = params.type talkingType.value = params.type