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-11-28 16:04:29 +08:00
parent 86bbd25059 0e3baa12cf
commit 666d46c19d
6 changed files with 67 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development
+1 -1
View File
@@ -8,7 +8,7 @@ ENV = 'development'
# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # 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 = 'https://aitstest.jlbank.com.cn:7002'
# VITE_APP_BASE_API_Url = 'http://192.168.247.200' # VITE_APP_BASE_API_Url = 'http://192.168.247.200'
# VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001' # VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001'
src/common/common.js
+23 -22
View File
@@ -305,28 +305,29 @@ export const previewFileFnc = ({
}) => { }) => {
let userInfo = getUserInfo() let userInfo = getUserInfo()
let userParams = '/' + (userInfo?.loginName ?? '') let userParams = '/' + (userInfo?.loginName ?? '')
if (getPhoneEnvBool('AND')) { navigateTo('/pages/index/preview?fileId=' + fileId + '&fileApiSrc=' + getFileSrc);
navigateTo('/pages/index/preview?fileId=' + fileId + '&fileApiSrc=' + getFileSrc); // if (getPhoneEnvBool('AND')) {
} else { // navigateTo('/pages/index/preview?fileId=' + fileId + '&fileApiSrc=' + getFileSrc);
if (isDownloading) return // } else {
const base_url = get_base_url(getFileSrc); // if (isDownloading) return
let fileUrl = base_url + getFileSrc + fileId + userParams; // const base_url = get_base_url(getFileSrc);
const localFilePath = '_doc/pdf_view/' + fileName + '.pdf'; // let fileUrl = base_url + getFileSrc + fileId + userParams;
isDownloading = true // const localFilePath = '_doc/pdf_view/' + fileName + '.pdf';
downloadFileFnc(fileUrl, localFilePath).then((res) => { // isDownloading = true
uni.openDocument({ // downloadFileFnc(fileUrl, localFilePath).then((res) => {
filePath: res, // uni.openDocument({
showMenu: true, // filePath: res,
success: function() { // showMenu: true,
console.log('打开文档成功'); // success: function() {
} // console.log('打开文档成功');
}) // }
}).finally(() => { // })
setTimeout(() => { // }).finally(() => {
isDownloading = false // setTimeout(() => {
}, 1000) // isDownloading = false
}); // }, 1000)
} // });
// }
} }
const downloadFileFnc = async (fileUrl, localFilePath) => { const downloadFileFnc = async (fileUrl, localFilePath) => {
try { try {
src/pages/example/dialog.vue
+17 -16
View File
@@ -465,22 +465,23 @@
}); });
break; break;
case 'preview': case 'preview':
if (getPhoneEnvBool('AND')) { common.navigateTo('/pages/index/preview?fileId=' + info.docId);
common.navigateTo('/pages/index/preview?fileId=' + info.docId); // if (getPhoneEnvBool('AND')) {
} else { // common.navigateTo('/pages/index/preview?fileId=' + info.docId);
const base_url = get_base_url('/traask/traFilePreview/'); // } else {
let fileUrl = base_url + '/traask/traFilePreview/' + info.docId + userParams; // const base_url = get_base_url('/traask/traFilePreview/');
const localFilePath = '_doc/pdf_view/' + info.docName + '.pdf'; // let fileUrl = base_url + '/traask/traFilePreview/' + info.docId + userParams;
downloadAndSaveAvatar(fileUrl, localFilePath).then((res) => { // const localFilePath = '_doc/pdf_view/' + info.docName + '.pdf';
uni.openDocument({ // downloadAndSaveAvatar(fileUrl, localFilePath).then((res) => {
filePath: res, // uni.openDocument({
showMenu: true, // filePath: res,
success: function() { // showMenu: true,
console.log('打开文档成功'); // success: function() {
} // console.log('打开文档成功');
}); // }
}); // });
} // });
// }
break; break;
case 'toCourse': case 'toCourse':
console.log(type, data, id); console.log(type, data, id);
src/pages/index/dialog.vue
+24 -41
View File
@@ -492,47 +492,30 @@
}); });
break; break;
case 'preview': case 'preview':
if (getPhoneEnvBool('AND')) { common.navigateTo('/pages/index/preview?fileId=' + info.docId);
common.navigateTo('/pages/index/preview?fileId=' + info.docId); // if (getPhoneEnvBool('AND')) {
} else { // common.navigateTo('/pages/index/preview?fileId=' + info.docId);
if(isDownloading.value) return // } else {
const base_url = get_base_url('/traask/traFilePreview/'); // common.navigateTo('/pages/index/preview?fileId=' + info.docId); return
let fileUrl = base_url + '/traask/traFilePreview/' + info.docId + userParams; // if(isDownloading.value) return
const localFilePath = '_doc/pdf_view/' + info.docName + '.pdf'; // const base_url = get_base_url('/traask/traFilePreview/');
isDownloading.value = true // let fileUrl = base_url + '/traask/traFilePreview/' + info.docId + userParams;
downloadAndSaveAvatar(fileUrl, localFilePath).then((res) => { // const localFilePath = '_doc/pdf_view/' + info.docName + '.pdf';
uni.openDocument({ // isDownloading.value = true
filePath: res, // downloadAndSaveAvatar(fileUrl, localFilePath).then((res) => {
showMenu: true, // uni.openDocument({
success: function () { // filePath: res,
console.log('打开文档成功'); // showMenu: true,
} // success: function () {
}) // console.log('打开文档成功');
}).finally(()=>{ // }
setTimeout(()=>{ // })
isDownloading.value = false // }).finally(()=>{
},1000) // setTimeout(()=>{
}); // isDownloading.value = false
// uni.downloadFile({ // },1000)
// url: fileUrl, // });
// success: function (res) { // }
// uni.saveFile({
// tempFilePath: res.tempFilePath,
// success: function (resS) {
// var filePath = resS.savedFilePath
// uni.openDocument({
// filePath: filePath,
// showMenu: true,
// success: function () {
// console.log('打开文档成功')
// }
// })
// }
// })
// }
// })
}
break; break;
case 'toCourse': case 'toCourse':
console.log(type, data, id); console.log(type, data, id);
src/pages/index/preview.vue
+2 -2
View File
@@ -30,7 +30,7 @@ export default {
showUrl: '', showUrl: '',
// viewerUrl: '/static/pdf-view/web/viewer.html', // viewerUrl: '/static/pdf-view/web/viewer.html',
viewerUrl: '/static/view-pdf/pdf.html', viewerUrl: '/static/view-pdf/pdf.html',
showView: false, showView: true,
wv: null, wv: null,
userParams: '' userParams: ''
} }
@@ -64,7 +64,7 @@ export default {
wv.setStyle({ wv.setStyle({
top: 80 top: 80
}) })
uni.onKeyboardHeightChange(setHeight) uni.onKeyboardHeightChange(this.setHeight)
}, 1000) }, 1000)
// #endif // #endif
}, },
src/pages/sparring/talk.vue
-3
View File
@@ -67,9 +67,6 @@
traId: traId.value, traId: traId.value,
talkingType: isPreview.value? 'preview' : 'practice' talkingType: isPreview.value? 'preview' : 'practice'
}).then(res=>{ }).then(res=>{
watchFlag.value = 1;
socketStore?.closeSocket();
changePlayItemId('')
common.navigateTo('/pages/sparring/result?isOver=1&traId=' common.navigateTo('/pages/sparring/result?isOver=1&traId='
+ traId.value + traId.value
+ '&execId=' + '&execId='