FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
zyn
2023-04-10 18:03:02 +08:00
parent 92b9455742 cec80c710b
commit 3a29ecb9bb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/phone/domesticDetails.vue
+4 -4
View File
@@ -2801,7 +2801,7 @@
if (res) { if (res) {
const editFileInfo = res const editFileInfo = res
const nowTime = new Date().getTime() const nowTime = new Date().getTime()
this.loadingText = true // this.loadingText = true
if (editFileInfo.fileSuffix.toLowerCase() === 'pdf') { if (editFileInfo.fileSuffix.toLowerCase() === 'pdf') {
// if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) { // if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
// //alert(navigator.userAgent); // //alert(navigator.userAgent);
@@ -2811,15 +2811,15 @@
// this.loadingText = false // this.loadingText = false
// window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
// } else { // } else {
this.loadingText = false // this.loadingText = false
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/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) // window.open('/#/phonePDF?fileId='+editFileInfo.id)
} else { } else {
const nowTime = new Date().getTime() 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(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))); window.open(kkFileViewUrl + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
} }
} }
}).catch(e => { }).catch(e => {