diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj index 6f229a46..a166b72c 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj @@ -38,4 +38,8 @@ + + + + diff --git a/Yi.RuoYi.Vue3/src/api/system/user.js b/Yi.RuoYi.Vue3/src/api/system/user.js index a28a182c..37bfc3be 100644 --- a/Yi.RuoYi.Vue3/src/api/system/user.js +++ b/Yi.RuoYi.Vue3/src/api/system/user.js @@ -1,6 +1,12 @@ -import request from '@/utils/request.js' +import request,{download} from '@/utils/request.js' import { parseStrEmpty } from "@/utils/ruoyi"; +// 导出角色 +export function getExportExcel(query) { + + return download('/user/export-excel',query,'导出数据.xlsx') +} + // 查询用户列表 export function listUser(query) { return request({ @@ -141,3 +147,4 @@ export function updateAuthRole(data) { // method: 'get' // }) // } + diff --git a/Yi.RuoYi.Vue3/src/utils/request.js b/Yi.RuoYi.Vue3/src/utils/request.js index f64a7288..2dbf706c 100644 --- a/Yi.RuoYi.Vue3/src/utils/request.js +++ b/Yi.RuoYi.Vue3/src/utils/request.js @@ -23,7 +23,7 @@ const service = axios.create({ //处理批零参数 paramsSerializer:params => { // return qs.stringify(params,{indices:false}) - console.log(params,"params") + // console.log(params,"params") // if(params.id!=undefined) // { // if(Array.isArray(params.id) ) @@ -134,23 +134,18 @@ service.interceptors.response.use(res => { ) // 通用下载方法 -export function download(url, params, filename) { +export function download(url, query, filename) { downloadLoadingInstance = ElLoading.service({ text: "正在下载数据,请稍候", background: "rgba(0, 0, 0, 0.7)", }) - return service.post(url, params, { - transformRequest: [(params) => { return tansParams(params) }], + return service({ + url: url, + method: 'get', + params: query, headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' }).then(async (data) => { - const isLogin = await blobValidate(data); - if (isLogin) { - const blob = new Blob([data]) + debugger; + const blob = new Blob([data.data]) saveAs(blob, filename) - } else { - const resText = await data.text(); - const rspObj = JSON.parse(resText); - const errMsg = errorCode[rspObj.code] || rspObj.message || errorCode['default'] - ElMessage.error(errMsg); - } downloadLoadingInstance.close(); }).catch((r) => { console.error(r) diff --git a/Yi.RuoYi.Vue3/src/views/system/user/index.vue b/Yi.RuoYi.Vue3/src/views/system/user/index.vue index 7866d73a..2816513d 100644 --- a/Yi.RuoYi.Vue3/src/views/system/user/index.vue +++ b/Yi.RuoYi.Vue3/src/views/system/user/index.vue @@ -236,7 +236,7 @@