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

src/components/drawers/AddTest.vue

@@ -20,6 +20,7 @@
       <div style="display: flex; flex-direction: row; padding-top: 0px; margin-top: 20px; margin-left: 32px;">
         <div>
           <button
+                  :disabled="taskIndex >= 0"
               style="width: 100px; cursor: pointer;"
               @click="changeOuter(1)"
               :class="formData.examType === 1  ? 'outer' : 'notOuter'"
@@ -27,6 +28,7 @@
             系统考试
           </button>
           <button
+                  :disabled="taskIndex >= 0"
               style="width: 100px; cursor: pointer;"
               @click="changeOuter(2)"
               :class="formData.examType === 2  ? 'outer' : 'notOuter'"
@@ -54,6 +56,7 @@
                   style="width: 400px; height: 40px; border-radius: 8px"
                   placeholder="请输入考试名称"
                   :maxlength="20"
+                  :disabled="taskIndex >= 0"
               />
             </div>
           </div>
@@ -70,7 +73,7 @@
             </div>
             <s-test v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
               <div class="btnbox">
-                <button class="xkbtn" style="margin:0">
+                <button class="xkbtn" style="margin:0" :disabled="taskIndex >= 0">
                   {{ formData.examinationPaperId ? "重选" : "选择" }}试卷
                 </button>
               </div>
@@ -117,6 +120,7 @@
             </div>
             <div class="select">
               <a-input-number
+                      :disabled="taskIndex >= 0"
                   :min="0"
                   :max="300"
                   :precision="0"
@@ -138,6 +142,7 @@
             </div>
             <div class="btnbox">
               <a-input
+                      :disabled="taskIndex >= 0"
                   v-model:value="formData.passLine"
                   type="number"
                   style="width: 400px; height: 40px; border-radius: 8px"
@@ -152,6 +157,7 @@
             </div>
             <div class="textarea">
               <a-textarea
+                      :disabled="taskIndex >= 0"
                   v-model:value="formData.examinationExplain"
                   placeholder="请输入考试说明"
                   allow-clear
@@ -170,6 +176,7 @@
                 <div class="timerbox">
                   <span>允许重复考试：</span>
                   <a-input-number
+                          :disabled="taskIndex >= 0"
                       :min="-1"
                       :max="300"
                       :precision="0"
@@ -194,6 +201,7 @@
             </div>
             <div class="btnbox">
               <a-radio-group
+                      :disabled="taskIndex >= 0"
                   style="margin-right: 12px"
                   v-model:value="formData.showAnswers"
               >
@@ -208,6 +216,7 @@
             </div>
             <div class="btnbox">
               <a-radio-group
+                      :disabled="taskIndex >= 0"
                   style="margin-right: 12px"
                   v-model:value="formData.showAnalysis"
               >
@@ -222,6 +231,7 @@
             </div>
             <div class="btnbox">
               <a-radio-group
+                      :disabled="taskIndex >= 0"
                   style="margin-right: 12px"
                   v-model:value="formData.scoringModel"
               >
@@ -238,6 +248,7 @@
             </div>
             <div class="btnbox">
               <a-radio-group
+                      :disabled="taskIndex >= 0"
                   style="margin-right: 12px"
                   v-model:value="formData.questionArrangement"
               >

src/components/drawers/ExportScore.vue

@@ -225,6 +225,7 @@ export default {
     },
   },
   setup(props, ctx) {
+    debugger
     const state = reactive({
       fileType: ["xls", "xlsx"],
       importHomeWork:

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);
+            });
+  })
+
 };
 </script>
 
@@ -240,4 +245,4 @@ const changeGroup = (item) => {
     }
   }
 }
-</style>
+</style>

src/components/student/TableStudent.vue

@@ -255,8 +255,8 @@
   <!-- 换组弹窗 -->
   <ChangeGroupModal
     v-model:changegroupV="checkgroupParam.changegroupV"
-    :groupList="checkgroupParam.checkgroupList"
-    :checkgroupStuId="checkgroupParam.checkgroupStuId"
+    :groupList="groupList"
+    :checkgroupStuId="stuSelectKeys"
   />
   <!-- 批量调整关卡弹窗 -->
   <!-- 取消学员弹窗 -->
@@ -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("请先选中学员");

src/views/projectcenter/TaskPage.vue

@@ -712,6 +712,7 @@
                   :columns="stuColumns"
                   :stage="stage"
                   :visable="tabFlag"
+                  :groupList="groupList"
                 >
                   <template #extension="{ data: { record } }">
                     <a-button @click="showStudent(record)" type="link"