Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-01-11 18:21:53 +08:00
9 changed files with 353 additions and 118 deletions

View File

@@ -89,7 +89,7 @@
</a-col>
<!-- 新加导入学员 批量换组 导出学习信息 -->
<a-col :span="1.5" v-if="type === 1 || type === 2">
<a-button class="cus-btn white">
<a-button class="cus-btn white" @click="showImpStu">
<template #icon
><img
style="margin-right: 10px"
@@ -351,6 +351,16 @@
v-model:exportHomeWorkV="exportHomeWorkV"
:downloadUrl="downloadUrl"
/>
<!-- 导入学员抽屉 -->
<!-- :courseId="projectTaskInfo.courseId"
:courseType="2" -->
<imp-stu
v-model:AddImpStuvisible="AddImpStuvisible"
@AddImpStuvisibleClose="AddImpStuvisibleClose"
:courseId="id"
:courseType="type === 1 ? 3 : 4"
/>
</template>
<script setup>
import { computed, defineProps, onMounted, ref, watch } from "vue";
@@ -364,6 +374,7 @@ import EScore from "../drawers/ExportScore.vue";
import OrgClass from "@/components/project/OrgClass";
import ExportHomeWork from "../Modals/ExportHomeWork.vue";
import * as api from "../../api/index1";
import ImpStu from "../drawers/AddLevelImportStu";
const props = defineProps({
type: Number,
id: String,
@@ -726,6 +737,21 @@ const updateStatus = (status, id) => {
console.log("批量更新学员状态失败", err);
});
};
//导入学员
const AddImpStuvisible = ref(false); //导入学员抽屉
const showImpStu = () => {
AddImpStuvisible.value = true;
};
const AddImpStuvisibleClose = (isget) => {
console.log("关闭了导入学员弹框", isget);
{
/* 此处操作重新获取学员列表数据 */
}
if (isget) {
getStuList();
}
};
</script>
<style lang="scss">
.TableStudent {