diff --git a/src/api/common/api.ts b/src/api/common/api.ts index 48f7ed2..3092c96 100644 --- a/src/api/common/api.ts +++ b/src/api/common/api.ts @@ -35,6 +35,7 @@ export const downloadFile = (url, fileName?, parameter?) => { } }); }; + export const downloadonlinePreview = async (url, fileName,parameter) =>{ //政务网访问地址 let originUrlWai="http://172.21.29.222:18084"+apiUrl + url+"?path="+parameter.path+"&fileName="+parameter.fileName @@ -42,14 +43,27 @@ export const downloadonlinePreview = async (url, fileName,parameter) =>{ // let uuid= buildUUID() let previewUrl = originUrlWai + "&fullfilename=" +parameter.path.substring(parameter.path.lastIndexOf("/")+1); //带上文件名(带后缀) console.log(previewUrl,'previewUrl') - window.open( 'http://localhost:8012' + "/onlinePreview?url=" + encodeURIComponent(Base64.encode(previewUrl))) //内网 - let originUrlNei="http://172.21.29.222:18012"+apiUrl + url+"?path="+parameter.path+"&fileName="+parameter.fileName + let originUrlNei="http://10.172.252.223:8080"+apiUrl + url+"?path="+parameter.path+"&fileName="+parameter.fileName // let fileType=parameter.fileName.substring(parameter.fileName.lastIndexOf(".")+1) // let uuid= buildUUID() let previewUrlNei = originUrlNei + "&fullfilename=" +parameter.path.substring(parameter.path.lastIndexOf("/")+1); //带上文件名(带后缀) console.log(previewUrlNei,'previewUrl') - window.open( 'http://10.172.252.223:8012' + "/onlinePreview?url=" + encodeURIComponent(Base64.encode(previewUrlNei))) + try { + const win1 = window.open('http://10.172.252.223:8012' + "/onlinePreview?url=" + encodeURIComponent(Base64.encode(previewUrlNei))); + if (!win1) { + console.warn('第一个窗口被阻止打开'); + } + + setTimeout(() => { + const win2 = window.open('http://172.21.29.222:18012' + "/onlinePreview?url=" + encodeURIComponent(Base64.encode(previewUrlNei))); + if (!win2) { + console.warn('第二个窗口被阻止打开'); + } + }, 4000); + } catch (error) { + console.error('打开窗口时发生错误:', error); + } } export const downloadResource = async (url, fileName,parameter) =>{