From 2b8883ead65c64ae580e90fd7f1fe0ce894ab196 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 29 Mar 2022 15:54:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E4=B8=AD?=
=?UTF-8?q?=E5=BF=83=E5=8A=A0=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=92=8C?=
=?UTF-8?q?=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/DocumentLibrary.vue | 17 +++++++----
.../searchCenter/components/whole.vue | 28 +++++++++++++++++--
2 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index e42fa0880..741d87f48 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -145,6 +145,12 @@
+
+
+
+
+
+
@@ -343,6 +349,7 @@
},
selectListModel(val) {
+ this.pageNo = 1
this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne }
this.isTrue = val == 'list' ? true : false
if (this.isTrue) {
@@ -607,20 +614,20 @@
}
},
fileClick(fileQuery) {
- let fileName = fileQuery.fileName
+ let fileName = fileQuery.fileName || fileQuery.file_name
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))
+ window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.file_id || fileQuery.id))
} else if (fileSuffix == '.docx') {
- let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.file_id || 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)
+ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.file_id || fileQuery.id + fileSuffix)
window.open(url, '_blank')
} else {
- downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+ downloadFile('/sys/common/downLoadFile', fileQuery.fileName || fileQuery.file_name, { id: fileQuery.id })
}
},
titleClick(item) {
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index 993aa0663..4901f6440 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -30,7 +30,12 @@
-
+
+
+
+
+
+
@@ -84,6 +89,7 @@