From a663f4711d17db61440d8dff6c79b5843abdb846 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Fri, 24 Feb 2023 22:39:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E7=BB=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/ChangeGroupModal.vue | 10 +++++++---
 src/components/student/TableStudent.vue     |  6 +++++-
 src/views/projectcenter/TaskPage.vue        |  9 ++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/components/student/ChangeGroupModal.vue b/src/components/student/ChangeGroupModal.vue
index 4d5f770d..ab4fa38f 100644
--- a/src/components/student/ChangeGroupModal.vue
+++ b/src/components/student/ChangeGroupModal.vue
@@ -48,6 +48,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  checkBatch: {
+    type: Boolean,
+    default: false,
+  },
   groupList: {
     type: Array,
     default: () => [],
@@ -56,10 +60,10 @@ const props = defineProps({
     type: Number,
     default: null,
   },
+
 });
 
 const option = computed(() => {
-  debugger
   console.log("props.groupList", props.groupList);
   return props.groupList.map((e) => ({
     label: e.groupName,
@@ -81,13 +85,13 @@ const selectGroup = (e, v) => {
 };
 //确认换组
 const changeGroup = (item) => {
-  // debugger
+  debugger
   console.log("换组", selectGroupId.value, item);
   props.checkgroupStuId.forEach(stu => {
     let obj = {
       groupId: selectGroupId.value,
       groupName: selectGroupName.value,
-      studentId: stu,
+      id: stu,
     };
     console.log("换组obj", obj);
     api
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index da45de94..e6ce26d4 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -164,7 +164,7 @@
   <ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys" @finash="submitCall" />
 
   <!-- 换组弹窗 -->
-  <ChangeGroupModal v-model:changegroupV="checkgroupParam.changegroupV" :groupList="groupList"
+  <ChangeGroupModal v-model:changegroupV="checkgroupParam.changegroupV" :groupList="groupList" :checkBatch="checkgroupParam.checkBatch"
     :checkgroupStuId="stuSelectKeys" />
   <!-- 批量调整关卡弹窗 -->
   <!-- 取消学员弹窗 -->
@@ -407,6 +407,7 @@ const checkgroupParam = ref({
   changegroupV: false, //学员名称
   checkgroupList: "", //学员小组
   checkgroupStuId: null,
+  checkBatch: true
 });
 
 const stuSelectKeys = ref([]);
@@ -426,10 +427,13 @@ const stuRowSelection = computed(() => ({
 
 //显示学员换组弹窗
 function showChangeGroupModal() {
+  debugger
+  console.log("批量")
   const d = props.groupList
   console.log("d" + d)
   // debugger
   checkgroupParam.value.changegroupV = true;
+  checkgroupParam.value.checkBatch = true;
 }
 
 // 导出数据
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 7ad64ebf..d0d28411 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -2356,6 +2356,7 @@ export default {
       ],
       //小组信息列表
       groupList: [],
+       isBatch: false, // 批量
       // stuName: "", //搜索的学员姓名
       // stuGroup: "", //搜索的学员小组名称
       // stuBum: "", //搜索的学员小组部门
@@ -3068,9 +3069,12 @@ export default {
     };
     //显示学员换组弹窗
     const showChangeGroupModal = (record) => {
+      debugger
+      console.log("单个")
       state.changegroupV = true;
-      console.log("点击换组", record.studentId);
-      state.checkgroupStuId = record.studentId;
+      console.log("点击换组", record.id);
+      state.checkgroupStuId = [];
+      state.checkgroupStuId.push(record.id) ;
     };
     const showModal2 = (item, isEdit) => {
       state.isEdit = isEdit;
@@ -3147,7 +3151,6 @@ export default {
     }
     //考勤的抽屉
     const showAA = (course, a, data) => {
-      // debugger;
       state.AAvisible = true;
       state.liveData = data;
       state.showKaoqinText = "直播";