diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue index 34b6c72c..a9c7bbec 100644 --- a/src/components/student/OnlineClassModelStudent.vue +++ b/src/components/student/OnlineClassModelStudent.vue @@ -93,7 +93,7 @@ 导出详细学习记录 @@ -332,14 +332,15 @@ function exportStu() { window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudent?type=3&&thirdType=8&pid=${searchParams.value.pid}`); } -const exportLoading = ref(false) +const exportDisabled = ref(false) const exportStudy = async () => { if(studentList.value.length == 0){ return message.warning('暂无可导出的学习记录') } - exportLoading.value = true; - downLoadXlsx(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=4&&thirdType=8&pid=${searchParams.value.pid}`,'在线课学员学习记录',exportLoading); + exportDisabled.value = true; + await downLoadXlsx(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=4&&thirdType=8&pid=${searchParams.value.pid}`,'在线课学员学习记录',exportLoading); + exportDisabled.value = false; } defineExpose({ searchStu, diff --git a/src/utils/zipdownload.js b/src/utils/zipdownload.js index 539ccbd9..5196632c 100644 --- a/src/utils/zipdownload.js +++ b/src/utils/zipdownload.js @@ -1,12 +1,12 @@ import axios from 'axios' import {getCookieForName} from "@/api/method"; -import { ref } from 'vue'; + const mimeMap = { xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', zip: 'application/zip' } -export const downLoadXlsx = async (str, filename,exportLoading) => { +export const downLoadXlsx = async (str, filename) => { const res = await axios({ method: 'get', url: str, @@ -14,8 +14,6 @@ export const downLoadXlsx = async (str, filename,exportLoading) => { headers: { 'Authorization': 'Bearer ' + getCookieForName("token") } }); resolveBlob(res, mimeMap.xlsx,filename) - exportLoading.value = false; - return { exportLoading }; } const baseUrl = process.env.VUE_APP_ACT_API export function downLoadZip(str, filename) {