From b6b09f75235ee53801dd055c48d4c1b8b2bdc07f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 10 Apr 2023 17:25:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9pdf=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/phone/domesticDetails.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue index aa56b0568..66ecbc63a 100644 --- a/src/pages/phone/domesticDetails.vue +++ b/src/pages/phone/domesticDetails.vue @@ -2801,7 +2801,7 @@ if (res) { const editFileInfo = res const nowTime = new Date().getTime() - this.loadingText = true + // this.loadingText = true if (editFileInfo.fileSuffix.toLowerCase() === 'pdf') { // if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) { // //alert(navigator.userAgent); @@ -2811,15 +2811,15 @@ // this.loadingText = false // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) // } else { - this.loadingText = false - window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) + // this.loadingText = false + window.open(kkFileViewUrl + '/onlinePreview?url=' + encodeURIComponent(Base64.encode('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))); + // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) // } // window.open('/#/phonePDF?fileId='+editFileInfo.id) } else { const nowTime = new Date().getTime() // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) window.open(kkFileViewUrl + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); - } } }).catch(e => { From cec80c710beef7ca9307c40039919abf3b189433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 10 Apr 2023 17:38:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9pdf=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/phone/domesticDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue index 66ecbc63a..8ebd458a7 100644 --- a/src/pages/phone/domesticDetails.vue +++ b/src/pages/phone/domesticDetails.vue @@ -2812,7 +2812,7 @@ // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) // } else { // this.loadingText = false - window.open(kkFileViewUrl + '/onlinePreview?url=' + encodeURIComponent(Base64.encode('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))); + window.open(kkFileViewUrl + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) // } // window.open('/#/phonePDF?fileId='+editFileInfo.id)