diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue index 027e2f02..89168346 100644 --- a/src/components/project/ProjectManagerNew.vue +++ b/src/components/project/ProjectManagerNew.vue @@ -62,9 +62,9 @@ const {data: userList, loading} = useThrottlePage(USER_LIST, memberParam.value, const options = computed(() => userList.value.filter(e => !(props.value + '').includes(e.id)).map(e => ({ label: e.realName + e.userNo, - value: e.id, - ...e, - audienceList: null + value: e.id //, + // ...e, + // audienceList: null }))) watch(props, init) diff --git a/src/components/project/ProjectManagerNewTeacher.vue b/src/components/project/ProjectManagerNewTeacher.vue index 70e0393f..d2736958 100644 --- a/src/components/project/ProjectManagerNewTeacher.vue +++ b/src/components/project/ProjectManagerNewTeacher.vue @@ -62,9 +62,9 @@ const {data: userList, loading} = useThrottlePage(USER_LIST, memberParam.value, const options = computed(() => userList.value.filter(e => !(props.value + '').includes(e.id)).map(e => ({ label: e.realName + e.userNo, - value: e.id, - ...e, - audienceList: null + value: e.id // , + // ...e, + // audienceList: null }))) watch(props, init) diff --git a/src/utils/zipdownload.js b/src/utils/zipdownload.js index 710a8c3d..af64a373 100644 --- a/src/utils/zipdownload.js +++ b/src/utils/zipdownload.js @@ -19,7 +19,7 @@ export function downLoadZip(str, filename) { }) } const baseUrlManage = process.env.VUE_APP_BASE_API -export function downLoadZipManage(str, filename) { +export function downLoadZipManage(str, filename,fun) { var url = baseUrlManage + str axios({ method: 'get', @@ -28,6 +28,7 @@ export function downLoadZipManage(str, filename) { headers: { 'Authorization': 'Bearer ' + getCookieForName("token") } }).then(res => { resolveBlob(res, mimeMap.xlsx,filename) + if(fun) fun() }) } /** diff --git a/src/views/report/TrainingNewManager.vue b/src/views/report/TrainingNewManager.vue index db40fcb8..7aa79012 100644 --- a/src/views/report/TrainingNewManager.vue +++ b/src/views/report/TrainingNewManager.vue @@ -1,11 +1,13 @@