diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index cf346c6fd..c2ea1df03 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -30,6 +30,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types' import { getAction, postAction, downFile, downloadFile } from '@/api/manage' import { Base64 } from 'js-base64' + import { mapGetters } from 'vuex' export default { name: 'file', @@ -65,6 +66,7 @@ // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl); }, methods: { + ...mapGetters(['userInfo']), perentHandleFunc(data) { this.myfileList = data if (data && data.length > 0) { @@ -182,7 +184,7 @@ 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)) + 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') diff --git a/jero-web/src/components/uploadFileChange/file.vue b/jero-web/src/components/uploadFileChange/file.vue index 58e6ef07f..1a29bf328 100644 --- a/jero-web/src/components/uploadFileChange/file.vue +++ b/jero-web/src/components/uploadFileChange/file.vue @@ -30,6 +30,7 @@ import Vue from 'vue' import { ACCESS_TOKEN } from '@/store/mutation-types' import { getAction, postAction, downFile, downloadFile } from '@/api/manage' import { Base64 } from 'js-base64' +import { mapGetters } from 'vuex' export default { name: 'file', @@ -66,6 +67,7 @@ export default { // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl); }, methods: { + ...mapGetters(['userInfo']), perentHandleFunc(data) { this.myfileList = data if (data && data.length > 0) { @@ -187,7 +189,7 @@ export default { 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)) + 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') diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue index 5a930d60f..17e836819 100644 --- a/jero-web/src/components/uploadFileChangeDown/file.vue +++ b/jero-web/src/components/uploadFileChangeDown/file.vue @@ -38,6 +38,7 @@ import Vue from 'vue' import { ACCESS_TOKEN } from '@/store/mutation-types' import { getAction, postAction, downFile, downloadFile } from '@/api/manage' import { Base64 } from 'js-base64' +import { mapGetters } from 'vuex' export default { name: 'file', @@ -87,6 +88,7 @@ export default { // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl); }, methods: { + ...mapGetters(['userInfo']), download() { downloadFile('/sys/common/downLoadFile', this.template.templateName, { id: this.template.templateId }) }, @@ -209,7 +211,7 @@ export default { 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)) + 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') diff --git a/jero-web/src/components/viewFileModel/index.vue b/jero-web/src/components/viewFileModel/index.vue index 7fd43152b..945838eee 100644 --- a/jero-web/src/components/viewFileModel/index.vue +++ b/jero-web/src/components/viewFileModel/index.vue @@ -36,6 +36,7 @@