Merge branch 'compulsory_professional_skills_copy' into test20250220

# Conflicts:
#	src/components/student/OnlineClassModelStudent.vue
#	src/utils/zipdownload.js
This commit is contained in:
gengxin
2025-03-03 19:26:55 +08:00
2 changed files with 7 additions and 4 deletions

View File

@@ -92,7 +92,8 @@
</a-button>
</a-col>
<a-col>
<a-button class="cus-btn" style="background: #4ea6ff; color: #fff; width: 150px" @click="exportStudy">
<a-button class="cus-btn" style="background: #4ea6ff; color: #fff; width: 150px"
@click="exportStudy">
导出详细学习记录
</a-button>
</a-col>
@@ -329,11 +330,13 @@ function reset() {
function exportStu() {
window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudent?type=3&&thirdType=8&pid=${searchParams.value.pid}`);
}
function exportStudy() {
const exportStudy = async () => {
if(studentList.value.length == 0){
return message.warning('暂无可导出的学习记录')
}
downLoadXlsx(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=4&&thirdType=8&pid=${searchParams.value.pid}`,'在线课学员学习记录')
console.log("开始执行 gx 刷新");
downLoadXlsx(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=4&&thirdType=8&pid=${searchParams.value.pid}`,'在线课学员学习记录');
}
defineExpose({
searchStu,

View File

@@ -6,7 +6,7 @@ const mimeMap = {
zip: 'application/zip'
}
export function downLoadXlsx(str, filename) {
axios({
await axios({
method: 'get',
url: str,
responseType: 'blob',