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

# Conflicts:
#	src/views/learningpath/LevelAdd.vue

src/components/drawers/TaskFaceIn.vue

@@ -190,14 +190,25 @@ export default {
       type: Boolean,
       default: false,
     },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    studentId: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
-    console.log(1222)
     const state = reactive({
       fileType: ["xls", "xlsx"],
       importLeader:
         process.env.VUE_APP_BASE_API +
-        `/admin/studentGroup/importGroup/${props.projectId}`,
+        `/admin/offcourse/importGroup/${props.routerId}`,
       uploadpercent: -1,
       uploadErr: false, //上传失败
       addLoading: false,

src/views/learningpath/LevelAdd.vue

@@ -1065,7 +1065,11 @@
         v-model:studentId="studentId"
       />
       <!-- 面授学员抽屉 -->
-      <RouterFaceStu v-model:FSvisible="FSvisible" :datasource="facestudent" />
+      <RouterFaceStu v-model:FSvisible="FSvisible"
+      :datasource="facestudent"
+      :type="2"
+      :routerId="routerId"
+      />
       <!-- 活动考勤抽屉 -->
       <active-attendance
         v-model:AAvisible="AAvisible"
@@ -1343,7 +1347,9 @@
     <!-- 项目管理抽屉 结束-->
 
     <!-- 批量面授报名 -->
-    <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
+    <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible"
+    :type="2"
+    :routerId="routerId" />
   </div>
 </template>
 <script>
@@ -2793,6 +2799,7 @@ export default {
 
     // 调整关卡
     function setLevels(record) {
+      console.log(record);
       state.curLevelName = record.currentStageName;
       state.curStuID = record.id;
       state.visiblene = true;
@@ -2805,19 +2812,33 @@ export default {
     }
 
     // 点击确定 调整关卡
-    async function changeLevel() {
+    function changeLevel() {
+      state.isreload = false;
       if (!state.curLevel) {
         message.error("请选择关卡");
         return;
       }
+      moveStudent({ targetId: state.curLevel, ids: [state.curStuID] })
+        .then((res) => {
+          console.log(res);
           state.visiblene = false;
+          message.destroy();
+          state.isreload = true;
           message.success("调整关卡成功");
-      stuRef.value.startLoading()
-      await moveStudent({targetId: state.curLevel, ids: [state.curStuID]})
           state.curLevel = undefined;
           state.curStuID = "";
           state.curLevelName = "";
-      stuRef.value.getStuList()
+          getStudent();
+        })
+        .catch((err) => {
+          console.log(err);
+          state.visiblene = false;
+          message.error("调整关卡失败");
+          state.isreload = true;
+          state.curLevel = undefined;
+          state.curStuID = "";
+          state.curLevelName = "";
+        });
     }
 
     // 面授课学员报名弹框
@@ -2829,7 +2850,6 @@ export default {
     return {
       ...toRefs(state),
       ...toRefs(levelList),
-      stuRef,
       clearChooseStu,
       showDeleteALLModal,
       closeDeleteALLModal,

src/views/projectcenter/TaskAdd.vue

@@ -659,8 +659,10 @@ const closeDeleteStage = () => {
 };
 //删除阶段
 const deleteStage = () => {
+  console.log(12345);
   if (projectInfo.value.stageList.length === 1) {
     projectInfo.value.stageList = [{id: '0', stageId: '0', name: '', remark: '', taskDraftDtoList: []}];
+    deleteStageModal.value = false;
     return
   }
   projectInfo.value.stageList.splice(activeIndex.value, 1)