diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 31050983..24f1692e 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -20,6 +20,7 @@
@@ -70,7 +73,7 @@
-
@@ -117,6 +120,7 @@
允许重复考试:
@@ -208,6 +216,7 @@
@@ -222,6 +231,7 @@
@@ -238,6 +248,7 @@
diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue index c89e0734..61b7d792 100644 --- a/src/components/drawers/ExportScore.vue +++ b/src/components/drawers/ExportScore.vue @@ -225,6 +225,7 @@ export default { }, }, setup(props, ctx) { + debugger const state = reactive({ fileType: ["xls", "xlsx"], importHomeWork: diff --git a/src/components/student/ChangeGroupModal.vue b/src/components/student/ChangeGroupModal.vue index 47374414..69975dba 100644 --- a/src/components/student/ChangeGroupModal.vue +++ b/src/components/student/ChangeGroupModal.vue @@ -100,24 +100,29 @@ const selectGroup = (e, v) => { }; //确认换组 const changeGroup = (item) => { + debugger console.log("换组", selectGroupId.value, item); - let obj = { - groupId: selectGroupId.value, - groupName: selectGroupName.value, - studentId: props.checkgroupStuId, - }; - console.log("换组obj", obj); - api - .changeGroupByStudentId(obj) - .then((res) => { - console.log("换组成功", res); - if (res.data.code === 200) { - message.success("换组成功"); - } - }) - .catch((err) => { - console.log("换组失败", err); - }); + props.checkgroupStuId.forEach(stu => { + let obj = { + groupId: selectGroupId.value, + groupName: selectGroupName.value, + studentId: stu, + }; + console.log("换组obj", obj); + api + .changeGroupByStudentId(obj) + .then((res) => { + console.log("换组成功", res); + if (res.data.code === 200) { + message.success("换组成功"); + closeChangeModal(); + } + }) + .catch((err) => { + console.log("换组失败", err); + }); + }) + }; @@ -240,4 +245,4 @@ const changeGroup = (item) => { } } } - \ No newline at end of file + diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 779e9448..5c9bb36e 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -255,8 +255,8 @@ @@ -394,6 +394,10 @@ const props = defineProps({ type: Boolean, default: null, }, + groupList: { + type: Array, + default: () => [], + } }); const topFlagList = ref([ { @@ -533,6 +537,7 @@ const tableData = ref({ loading: false, }); + const stuRowSelection = computed(() => ({ columnWidth: 20, selectedRowKeys: stuSelectKeys.value, @@ -542,6 +547,8 @@ const stuRowSelection = computed(() => ({ //显示学员换组弹窗 function showChangeGroupModal() { + const d = props.groupList + console.log("d"+d) // debugger checkgroupParam.value.changegroupV = true; } @@ -609,6 +616,8 @@ function getStuList() { }); } + + function reset() { tableParam.value.studentName = ""; tableParam.value.groupName = ""; //学员小组 @@ -619,7 +628,6 @@ function reset() { } function bathDel() { - debugger if (stuSelectKeys.value && stuSelectKeys.value.length === 0) { message.destroy(); return message.warning("请先选中学员"); diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index cba63e38..e027a29a 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -712,6 +712,7 @@ :columns="stuColumns" :stage="stage" :visable="tabFlag" + :groupList="groupList" >