diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 1bd779cc5..fab54f96b 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -191,17 +191,18 @@ 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 { - downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) - } + downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id }) + // 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/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 9fa9c6282..e5ee987c5 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -128,10 +128,6 @@ {{ $t('BatchDelete') }} -
- - {{ $t('bringInRelevantPersonnel') }} -
{{ $t('ExportReport') }} @@ -149,6 +145,10 @@ ...{{ $t('more') }}
+
+ + {{ $t('bringInRelevantPersonnel') }} +
{{ $t('Transfer') }}