feat:合并

src/views/learningpath/LevelAdd.vue

@@ -574,24 +574,7 @@
         <a-tab-pane key="3" tab="学员管理" force-render>
           <TableStudent
             :permissions="permissions"
-            v-if="isreload"
-            :type="2"
-            :id="routerId"
-            :stage="stage"
-            :columns="tableDataFunc()"
-          >
-            <template #extension="{ data: { record } }">
-              <a-button type="link" @click="showStudent(record)">查看</a-button>
-              <a-button
-                type="link"
-                @click="setLevels(record)"
-                v-if="checkPer(permissions)"
-                >调整</a-button
-              >
-            </template>
-          </TableStudent>
-          <TableStudent
-            v-else
+            ref="stuRef"
             :type="2"
             :id="routerId"
             :stage="stage"
@@ -1090,7 +1073,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"
@@ -1368,7 +1355,9 @@
     <!-- 项目管理抽屉 结束-->
 
     <!-- 批量面授报名 -->
-    <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
+    <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible"
+    :type="2"
+    :routerId="routerId" />
   </div>
 </template>
 <script>
@@ -1436,7 +1425,7 @@ export default {
   setup() {
     const router = useRouter();
     const route = useRoute();
-
+    const stuRef = ref()
     // const store = useStore();
     const state = reactive({
       permissions: "",
@@ -1864,6 +1853,8 @@ export default {
     };
     //考勤的抽屉
     const showAA = (course, a, data) => {
+      debugger
+      console.log("直播管理", data);
       state.AAvisible = true;
       state.liveData = data;
       state.showKaoqinText = "直播";
@@ -1930,7 +1921,7 @@ export default {
     // 考试点击管理弹框
     const examinationModel = (data, levelname, outchapterid) => {
       console.log(data);
-      if (data.startTime == null && data.endTime == null) {
+      if (data.examType==2) {
         // 外部考试
         state.examinationExaminaModelVisible = true;
         state.outchapter = outchapterid;
@@ -2837,33 +2828,19 @@ export default {
     }
 
     // 点击确定 调整关卡
-    function changeLevel() {
-      state.isreload = false;
+    async function changeLevel() {
       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("调整关卡成功");
-          state.curLevel = undefined;
-          state.curStuID = "";
-          state.curLevelName = "";
-          getStudent();
-        })
-        .catch((err) => {
-          console.log(err);
-          state.visiblene = false;
-          message.error("调整关卡失败");
-          state.isreload = true;
-          state.curLevel = undefined;
-          state.curStuID = "";
-          state.curLevelName = "";
-        });
+      state.visiblene = false;
+      message.success("调整关卡成功");
+      stuRef.value.startLoading()
+      await moveStudent({targetId: state.curLevel, ids: [state.curStuID]})
+      state.curLevel = undefined;
+      state.curStuID = "";
+      state.curLevelName = "";
+      stuRef.value.getStuList()
     }
 
     // 面授课学员报名弹框
@@ -2875,6 +2852,7 @@ export default {
     return {
       ...toRefs(state),
       ...toRefs(levelList),
+      stuRef,
       clearChooseStu,
       showDeleteALLModal,
       closeDeleteALLModal,