From 83b407c3764bd1914ea95f85b0447beb44989f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Wed, 11 Oct 2023 16:06:35 +0800 Subject: [PATCH] =?UTF-8?q?update=20kkFile=E9=A2=84=E8=A7=88=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/production_address_config.js | 4 ++-- src/components/jero/JImageUpload.vue | 2 +- src/components/jero/JUpload.vue | 10 +++++----- src/components/jero/PreviewFile.vue | 6 +++--- .../meetManage/modules/UploadMeetFileModal.vue | 5 ++++- .../WorkingGroupMemberUnitMaintenance.vue | 2 +- .../modules/CommitteeUnderStudyFilesModal.vue | 7 +++++-- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/public/production_address_config.js b/public/production_address_config.js index 3b6e726..3c7cc39 100644 --- a/public/production_address_config.js +++ b/public/production_address_config.js @@ -9,7 +9,7 @@ window._CONFIG["staticDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/d window._CONFIG["pdfDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/pdf/pdfPreviewIframe"; window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; // 预览文件地址 -window._CONFIG["onlinePreviewDomainURL"] = "http://cwp.catarc.org.cn:8092/onlinePreview"; +window._CONFIG["onlinePreviewDomainURL"] = "http://cwp.catarc.org.cn:8092/perview/onlinePreview"; // 会议管理报名二维码地址 window._CONFIG["singUpQRCodeURL"] = "https://cwp.catarc.org.cn/signupentrance" @@ -29,4 +29,4 @@ window._CONFIG["sendPostCode"] = "300300" window._CONFIG["lookExpressDomainURL"] = "http://cwp.catarc.org.cn/lookExpressInfo" // 来款内部部署的ip -window._CONFIG["intranetUrl"] = "http://10.12.8.1/"; \ No newline at end of file +window._CONFIG["intranetUrl"] = "http://10.12.8.1/"; diff --git a/src/components/jero/JImageUpload.vue b/src/components/jero/JImageUpload.vue index e824011..a8424c7 100644 --- a/src/components/jero/JImageUpload.vue +++ b/src/components/jero/JImageUpload.vue @@ -236,7 +236,7 @@ if (file && file.url) { var fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.previewName || file.name}` // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}` - let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` + let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}` window.open(url) } }, diff --git a/src/components/jero/JUpload.vue b/src/components/jero/JUpload.vue index c2e8d76..b90a0c5 100644 --- a/src/components/jero/JUpload.vue +++ b/src/components/jero/JUpload.vue @@ -54,10 +54,9 @@ import Vue from 'vue' import {ACCESS_TOKEN} from '@/store/mutation-types' import {getFileAccessHttpUrl, downloadFile} from '@/api/manage' import {getFileInfo} from '@/api/api' -import { isExternalTerminal } from '../../utils/util' - +import {isExternalTerminal} from '../../utils/util' // eslint-disable-next-line no-undef -// const Base64 = require('js-base64').Base64 +const Base64 = require('js-base64').Base64 const FILE_TYPE_ALL = 'all' const FILE_TYPE_IMG = 'image' @@ -393,7 +392,8 @@ export default { // eslint-disable-next-line no-unreachable if (file && file.url) { const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.previewName}` - let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` + + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(Base64.encode(fileFullUrl)) // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` window.open(url) } @@ -447,7 +447,7 @@ export default { myPreview(file) { if (file && file.url) { const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.previewName}` - let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(Base64.encode(fileFullUrl)) // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` window.open(url) } diff --git a/src/components/jero/PreviewFile.vue b/src/components/jero/PreviewFile.vue index bb9a27f..1da4217 100644 --- a/src/components/jero/PreviewFile.vue +++ b/src/components/jero/PreviewFile.vue @@ -13,7 +13,7 @@ import {ACCESS_TOKEN} from '@/store/mutation-types' import {getFileInfo} from '@/api/api' import {downloadFile} from '@api/manage' // eslint-disable-next-line -// const Base64 = require('js-base64').Base64 +const Base64 = require('js-base64').Base64 export default { @@ -88,7 +88,7 @@ export default { handlePreview(file) { if (file && file.id) { const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.previewName}` - let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` + let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}` // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` window.open(url) } @@ -105,4 +105,4 @@ export default { .m-l-4 { margin-left: 4px; } - \ No newline at end of file + diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue index 8666bdc..ff59ed5 100644 --- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue +++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue @@ -106,6 +106,9 @@ const columns = [ } ] +// eslint-disable-next-line +const Base64 = require('js-base64').Base64 + export default { name: 'UploadMeetFileModal', components: { @@ -343,7 +346,7 @@ export default { const previewName = previewUrl.substring(previewUrl.lastIndexOf(fileNameNotType)) const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${previewName}` - let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` + let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}` window.open(url) } }, diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue index 86e9d5f..5483dae 100644 --- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue @@ -535,7 +535,7 @@ export default { if (file && file.url) { const fileFullUrl = `${ window._CONFIG['domianWebSocketURL'] }/sys/common/download/${ file.id }?token=${ Vue.ls.get(ACCESS_TOKEN) }&fullfilename=${ file.fileName }` // let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(Base64.encode(fileFullUrl)) }` - let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(fileFullUrl) }` + let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(Base64.encode(fileFullUrl)) }` window.open(url) } }, diff --git a/src/views/projectManagement/modules/CommitteeUnderStudyFilesModal.vue b/src/views/projectManagement/modules/CommitteeUnderStudyFilesModal.vue index 449d18c..3df190f 100644 --- a/src/views/projectManagement/modules/CommitteeUnderStudyFilesModal.vue +++ b/src/views/projectManagement/modules/CommitteeUnderStudyFilesModal.vue @@ -67,6 +67,9 @@ const columns = [ scopedSlots: { customRender: 'action' } } ] +// eslint-disable-next-line +const Base64 = require('js-base64').Base64 + export default { name: 'CommitteeUnderStudyFilesModal', data() { @@ -99,7 +102,7 @@ export default { handlePreview(record) { if (record && record.FILE_ID) { const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/payResearchProject/payResearchProject/download/?fileId=${record.FILE_ID}&token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.FILE_NAME}` - let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${encodeURIComponent(fileFullUrl)}` + let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${encodeURIComponent(Base64.encode(fileFullUrl))}` // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` window.open(url) } @@ -114,4 +117,4 @@ export default { \ No newline at end of file +