feat:合并

src/components/common/CommonAlert.vue

@@ -2,8 +2,9 @@
   <a-modal
       :visible="true"
       :footer="null"
+      :title="null"
+      :centere="true"
       :closable="false"
-      wrapClassName="DelModal"
       style="margin-top: 400px"
       :zIndex="9999"
       @cancel="close"
@@ -66,5 +67,118 @@ function handleConfirm() {
   props.ok()
   props.close()
 }
-
 </script>
+<style lang="scss" scoped>
+.delete {
+  min-width: 424px;
+  background: #ffffff;
+  box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+  border-radius: 4px;
+  position: absolute;
+  left: 50%;
+  top: 10%;
+  transform: translate(-50%, -50%);
+
+  .del_header {
+    position: absolute;
+    width: calc(100%);
+    height: 40px;
+    background: linear-gradient(
+            rgba(78, 166, 255, 0.2) 0%,
+            rgba(78, 166, 255, 0) 100%
+    );
+  }
+
+  .del_main {
+    width: 100%;
+    position: relative;
+
+    .header {
+      display: flex;
+      align-items: center;
+      padding-top: 20px;
+      padding-left: 26px;
+      font-size: 16px;
+
+      .del-icons {
+        width: 16px;
+        height: 16px;
+        position: relative;
+        margin-right: 10px;
+
+        img {
+          width: 100%;
+          height: 100%;
+          position: absolute;
+          top: 0px;
+          left: 0px;
+          background-size: 100% 100%;
+        }
+
+      }
+
+      .close_exit {
+        position: absolute;
+        right: 42px;
+        cursor: pointer;
+        width: 20px;
+        height: 20px;
+        background-image: url(@/assets/images/coursewareManage/close.png);
+        background-size: 100% 100%;
+      }
+
+    }
+
+    .body {
+      width: 100%;
+      padding: 0 30px;
+      margin: 34px auto 56px auto;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+    .del_btnbox {
+      display: flex;
+      margin: 30px auto;
+      justify-content: center;
+
+      .del_btn {
+        width: 100px;
+        height: 40px;
+        background: rgba(64, 158, 255, 0);
+        border-radius: 8px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
+        cursor: pointer;
+
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          line-height: 40px;
+        }
+
+      }
+
+      .btn1 {
+        border: 1px solid rgba(64, 158, 255, 1);
+        color: #4ea6ff;
+      }
+
+      .btn2 {
+        background-color: #4ea6ff;
+        color: #ffffff;
+      }
+
+    }
+  }
+}
+</style>
+<style lang="scss">
+.ant-modal-body {
+  padding: 0 !important;
+}
+</style>

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

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;
 }
 
 // 导出数据