diff --git a/src/main.js b/src/main.js index 9868b05..e0a7a23 100644 --- a/src/main.js +++ b/src/main.js @@ -30,6 +30,7 @@ app.config.globalProperties.parseTime = parseTime; for(const name in ArcoIconModules){ app.component(name,ArcoIconModules[name]) } +export const globals = app.config.globalProperties pinia.use(piniaPluginPersistedstate); app.use(Loading) app.use(ArcoVue); @@ -37,3 +38,5 @@ app.use(router); app.use(pinia); app.mount('#app'); + + diff --git a/src/utils/downloadFile.js b/src/utils/downloadFile.js index 75a1e73..43846ec 100644 --- a/src/utils/downloadFile.js +++ b/src/utils/downloadFile.js @@ -1,7 +1,7 @@ export const downloadFile=(fileUrl,name='')=>{ - let startIndex=fileUrl.indexOf("output"); + let startIndex=fileUrl.lastIndexOf("/"); let endIndex=fileUrl.lastIndexOf("."); - let originName=fileUrl.substring(startIndex,endIndex); + let originName=fileUrl.substring(startIndex+1,endIndex); const request = new XMLHttpRequest() request.open('GET', fileUrl) request.responseType = 'blob' diff --git a/src/utils/request.js b/src/utils/request.js index 66674a8..4ab76d0 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,6 +1,8 @@ import axios from 'axios'; import { Message } from '@arco-design/web-vue'; import { useUserStore } from '../store/userInfo' +import {globals} from '../main.js' + // create an axios instance console.log("________"+import.meta.env.VITE_BASE_URL) @@ -111,6 +113,7 @@ service.interceptors.response.use( duration: 3000 }) } + globals?.$loading.hide(); return Promise.reject(message); } );