diff --git a/jero-web/public/api_address_config.js b/jero-web/public/api_address_config.js index 74ec003e0..3e2c8ee9a 100644 --- a/jero-web/public/api_address_config.js +++ b/jero-web/public/api_address_config.js @@ -9,4 +9,4 @@ 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://127.0.0.1:8012/onlinePreview' +window._CONFIG['onlinePreviewDomainURL'] = 'http://cas.example.org:8443/onlinePreview' diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue index 7971bb87e..1cdb85ea2 100644 --- a/jero-web/src/components/dict/JDictSelectTag.vue +++ b/jero-web/src/components/dict/JDictSelectTag.vue @@ -8,7 +8,7 @@ - {{$t('pleaseSelect')}} + {{$t('pleaseSelect')}} {{ item.text || item.label }} diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 57f86bb91..cb2e895d0 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -196,10 +196,22 @@ this.fileList = [] }, preview(file) { - if (file.response) { - downloadFile('/sys/common/download', file.response.result.fileName, { id: file.response.result.id }) + console.log(file) + let fileQuery = file.response ? file.response.result : file + let fileName = fileQuery.fileName + let index1 = fileName.lastIndexOf('.') + let index2 = fileName.length + let fileSuffix = fileName.substring(index1, index2) + if (fileSuffix == '.pdf') { + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id)) + } else if (fileSuffix == '.docx') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + fileQuery.id) + window.open(url, '_blank') + } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + fileQuery.id) + window.open(url, '_blank') } else { - downloadFile('/sys/common/download', file.fileName, { id: file.id }) + downloadFile('/sys/common/download', fileQuery.fileName, { id: fileQuery.id }) } } }