hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 19:36:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '250213-prod-master_1202-gx' into master_1202

Browse Source
This commit is contained in:
joshen
2025-03-11 18:29:44 +08:00
parent cae3240c80 473ea95364
commit 88cc6db4b0
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/zipdownload.js
View File

@@ -46,7 +46,11 @@ export function downLoadZipManage(str, filename,fun) {
return; return;
} }
resolveBlob(res, mimeMap.xlsx,filename) resolveBlob(res, mimeMap.xlsx,filename)
if(fun) fun() if(fun) {
console.log("有数据 执行 fun",fun)
fun(res.headers.ecode)
}
fun(res.headers.ecode)
}) })
} }
/** /**

7
src/views/report/TrainingNewManager.vue
View File

@@ -20,9 +20,13 @@ import { message } from "ant-design-vue";
spinning.value = true spinning.value = true
if(uploadAdmin('training-admin')){ if(uploadAdmin('training-admin')){
downLoadZipManage(`/admin/project/report/data`,'新任管理者培训数据',function(code){ downLoadZipManage(`/admin/project/report/data`,'新任管理者培训数据',function(code){
console.log("downLoadZipManage 导出成功 code",code)
if(code == 4){ if(code == 4){
spinning.value = false; spinning.value = false;
message.error("权限不足!"); message.error("权限不足!");
} else {
console.log("downLoadZipManage 导出成功 code",code)
spinning.value = false;
} }
}) })
@@ -30,7 +34,8 @@ import { message } from "ant-design-vue";
} }
if(adminType?.value.length>0){ if(adminType?.value.length>0){
let orgs = adminType.value.join(',') let orgs = adminType.value.join(',')
downLoadZipManage(`/admin/project/report/data?orgs=${orgs}`,'新任管理者培训数据',function(){ downLoadZipManage(`/admin/project/report/data?orgs=${orgs}`,'新任管理者培训数据',function(code){
console.log("downLoadZipManage 导出成功 code",code)
spinning.value = false spinning.value = false
}) })
} }