From ee4bdbcdb9b3fffaabc6582250aff6c75459d966 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 11 Jul 2022 18:17:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/OcrUpload/index.vue | 2 +- jero-web/src/components/SplitImport/index.vue | 2 +- jero-web/src/components/SplitUpload/index.vue | 2 +- .../components/importSplitUpload/index.vue | 2 +- .../src/components/uploadFileChange/file.vue | 22 +++++++++---------- .../components/uploadFileChangeDown/file.vue | 22 +++++++++---------- .../searchCenter/components/whole.vue | 1 + 7 files changed, 27 insertions(+), 26 deletions(-) diff --git a/jero-web/src/components/OcrUpload/index.vue b/jero-web/src/components/OcrUpload/index.vue index 67ba5063f..4dec33c23 100644 --- a/jero-web/src/components/OcrUpload/index.vue +++ b/jero-web/src/components/OcrUpload/index.vue @@ -32,7 +32,7 @@ return{ visible:false, uploadAction:window._CONFIG['domianURL']+"/sys/common/upload", - downLoadFileUrl:window._CONFIG['domianURL']+'/sys/common/static', + downLoadFileUrl:window._CONFIG['domianPreviewURL']+'/sys/common/static', myfileList:[], fileList:[], fileTypeSatus:false, diff --git a/jero-web/src/components/SplitImport/index.vue b/jero-web/src/components/SplitImport/index.vue index f616626eb..85a0fe05f 100644 --- a/jero-web/src/components/SplitImport/index.vue +++ b/jero-web/src/components/SplitImport/index.vue @@ -50,7 +50,7 @@ visible:false, // uploadAction:"http://10.0.1.25:8080/split/sarFileSplitItems/importSplitItems", uploadAction:window._CONFIG['domianURL']+"/split/sarFileSplitItems/importSplitItems", - downLoadFileUrl:window._CONFIG['domianURL']+'/sys/common/static', + downLoadFileUrl:window._CONFIG['domianPreviewURL']+'/sys/common/static', myfileList:[], fileList:[], fileTypeSatus:false, diff --git a/jero-web/src/components/SplitUpload/index.vue b/jero-web/src/components/SplitUpload/index.vue index 6c7a80208..15c818409 100644 --- a/jero-web/src/components/SplitUpload/index.vue +++ b/jero-web/src/components/SplitUpload/index.vue @@ -37,7 +37,7 @@ visible: false, uploadAction: window._CONFIG['domianURL'] + '/split/sarFileSplitItems/upload', upDataList: [], - downLoadFileUrl: window._CONFIG['domianURL'] + '/sys/common/static', + downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/static', fileList: [], myfileList: [], isLoding: false, diff --git a/jero-web/src/components/importSplitUpload/index.vue b/jero-web/src/components/importSplitUpload/index.vue index 8b17e8f92..1225b1edc 100644 --- a/jero-web/src/components/importSplitUpload/index.vue +++ b/jero-web/src/components/importSplitUpload/index.vue @@ -34,7 +34,7 @@ return { visible: false, uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload', - downLoadFileUrl: window._CONFIG['domianURL'] + '/sys/common/static', + downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/static', myfileList: [], fileList: [], fileTypeSatus: false, diff --git a/jero-web/src/components/uploadFileChange/file.vue b/jero-web/src/components/uploadFileChange/file.vue index 5b7c3c846..60d65ec72 100644 --- a/jero-web/src/components/uploadFileChange/file.vue +++ b/jero-web/src/components/uploadFileChange/file.vue @@ -106,7 +106,7 @@ export default { this.fileTypeSatus = true }, mypreview(item) { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1) + let url = window._CONFIG['domianPreviewURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1) window.open(url, '_blank') }, handleChange(info) { @@ -188,17 +188,17 @@ export default { 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+'&userName='+this.userInfo().username)) - } else if (fileSuffix === '.docx') { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) - window.open(url, '_blank') - } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) - window.open(url, '_blank') - } else { + // if (fileSuffix === '.pdf') { + // window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) + // } else if (fileSuffix === '.docx') { + // let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + // window.open(url, '_blank') + // } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { + // let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + // window.open(url, '_blank') + // } else { downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) - } + // } } } } diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue index 09ba46494..df598bc41 100644 --- a/jero-web/src/components/uploadFileChangeDown/file.vue +++ b/jero-web/src/components/uploadFileChangeDown/file.vue @@ -129,7 +129,7 @@ import { mapGetters } from 'vuex' this.fileTypeSatus = true }, mypreview(item) { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1) + let url = window._CONFIG['domianPreviewURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1) window.open(url, '_blank') }, handleChange(info) { @@ -211,17 +211,17 @@ import { mapGetters } from 'vuex' 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=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) - window.open(url, '_blank') - } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) - window.open(url, '_blank') - } else { + // 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=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + // window.open(url, '_blank') + // } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') { + // let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + // window.open(url, '_blank') + // } else { downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) - } + // } } } } diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index 43aaff7fb..e74325c77 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -107,6 +107,7 @@ conList: [], total: 0, pageSize: 10, + downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', pageNo: 1, queryParam: {} }