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

# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue

src/components/drawers/CheckAnsware.vue

@@ -21,7 +21,7 @@
                 <iframe
                     id="iframe"
                     style="width: 100%; height: 100%;"
-                    :src="iframeUrl + '/exam/viewanswer?id=' + datasource.targetId "
+                    :src="iframeUrl + '/exam/viewanswer?id=' + datasource.answerId "
                     frameborder="0"
                     name="myframe"
                     security="restricted"

src/components/drawers/project/ProjectExamManage.vue

@@ -383,12 +383,11 @@ export default {
         currentStageId: props.datasource.stageId,
         type: 1,
         pid: props.datasource.projectId,
-        taskId: props.datasource.projectTaskId,
+        taskId: props.datasource.id,
         taskType: props.datasource.type,
         status: state.projectName,
         studentName: state.name,
       }).then(res=>{
-        console.log(res)
         state.tabledata = res.data.data.records;
         state.tableDataTotal = res.data.data.total;
         state.loadingData = false;

src/components/drawers/router/RouterExaminationManage.vue

@@ -401,7 +401,7 @@ export default {
         currentStageId: props.datasource.chapterId,
         type: 2,
         pid: props.datasource.routerId,
-        taskId: props.datasource.routerTaskId,
+        taskId: props.datasource.id,
         taskType: props.datasource.type,
         status: state.projectName,
         studentName: state.name,

src/views/courselibrary/CoursewareManage.vue

@@ -2146,8 +2146,7 @@ export default defineComponent({
 
     const state = reactive({
       tableLoading: false,
-      tableCoursePlanLoading: false,
+      //新加  
-      //新加
       stuColumns: [
         {
           title: "岗位",
@@ -3345,7 +3344,6 @@ export default defineComponent({
     // };
     // 渲染开课操作
     const getTableDate3 = async () => {
-      state.tableCoursePlanLoading = true
       // let datas = state.tableData6;
       let beginTime = "";
       let endTime = "";
@@ -3374,7 +3372,6 @@ export default defineComponent({
       };
       console.log("获取开obj", obj, state.selectTime);
       let res = await planList(obj);
-      state.tableCoursePlanLoading = false
       console.log("开课res", res);
       const {rows, total, pageNo} = res.data.data;
       state.tableDataTotal222 = total;
@@ -3946,31 +3943,48 @@ export default defineComponent({
       state.addLoading = true;
 
       if (state.del_hs) {
+        console.log(11111111);
         if (state.offcourseId && state.offcoursePlanId && state.studentId) {
-         await handleStudent({
+          console.log(111111);
+          handleStudent({
             offcoursePlanId: state.offcoursePlanId,
             score: "",
             studentIds: [state.studentId],
             type: 5,
-          })
+          }).then((res) => {
-          getTableDate2();
+            if (res.data.code === 200) {
-          delete_exit1();
+              getTableDate2();
+              delete_exit1();
+            }
+          });
         } else if (state.offcourseId && state.offcoursePlanId) {
-          state.tableCoursePlanLoading = true;
+          console.log(2222222);
-          delete_exit1();
+          deletePlan({
-          await deletePlan({offcoursePlanId: state.offcoursePlanId,})
+            offcoursePlanId: state.offcoursePlanId,
-          getTableDate3();
+          }).then((res) => {
+            if (res.data.code === 200) {
+              getTableDate3();
+              delete_exit1();
+            }
+          });
         } else if (state.offcourseId) {
-          state.tableLoading = true;
+          console.log(3333333);
-          delete_exit1();
+          handle({
-          message.success("删除成功");
+            offcourseId: state.offcourseId,
-          await handle({offcourseId: state.offcourseId, type: -1,})
+            type: -1,
-          getTableDate();
+          }).then((res) => {
+            if (res.data.code === 200) {
+              message.destroy();
+              message.success("删除成功");
+              getTableDate();
+              delete_exit1();
+            }
+          });
         }
       }
       if (state.copy_hs) {
         if (state.offcourseId && state.offcoursePlanId) {
-          state.tableCoursePlanLoading = true;
+          state.tableLoading = true;
           message.success("复制成功");
           delete_exit1();
           rest();
@@ -3986,15 +4000,20 @@ export default defineComponent({
         }
       }
       if (state.nouse_hs) {
+        console.log(3333333333);
         if (state.offcourseId) {
-          state.tableLoading = true;
+          console.log(87887);
-          message.success("操作成功");
+          handle({
-          delete_exit1();
-          await handle({
             offcourseId: state.offcourseId,
             type: -2,
-          })
+          }).then((res) => {
-          getTableDate();
+            if (res.data.code === 200) {
+              message.destroy();
+              message.success("操作成功");
+              getTableDate();
+              delete_exit1();
+            }
+          });
         }
       }
     };

src/views/examine/CourseReviewedN.vue

@@ -759,16 +759,17 @@ export default {
 			console.log('我是邀请审核得传递参数',{
 				"inviteContent": state.valueSuggInvitation,
 				"offcourseId": state.inviteReview.offcourseId,
-				"teacherId": state.inviteReview.teacherId,
+				"teacherId": state.memberValue.value,
-				"teacherName": state.inviteReview.teacherName
+				"teacherName": state.memberValue.label
 			})
 			inviteAudit({
 				"inviteContent": state.valueSuggInvitation,
 				"offcourseId": state.inviteReview.offcourseId,
-				"teacherId": state.inviteReview.teacherId,
+				"teacherId": state.memberValue.value,
-				"teacherName": state.inviteReview.teacherName
+				"teacherName": state.memberValue.label
 			}).then((res) => {
 				console.log(res)
+				getFaceList();
 				state.courInvitationAuditModal = false;
 			}).catch(err=>{
 				console.log(err)

src/views/learningpath/LevelAdd.vue

@@ -1920,7 +1920,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;

src/views/projectcenter/TaskPage.vue

@@ -3190,7 +3190,7 @@ export default {
     };
     //考试管理的抽屉
     const showTest = (name, id, data) => {
-      if (data.startTime == null && data.endTime == null) {
+      if (data.examType==2) {
         // 外部考试抽屉显示
         state.TMvisibleExternal = true;
         state.examData = data;