Merge branch 'dongwu_develop' into develop

src/App.vue

@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 
 const store = useStore();
 const isLogin = ref(false);
-console.log("版本2.2.0------------");
+console.log("版本2.2.1------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);

src/components/drawers/AddOpenCourse.vue

@@ -166,7 +166,7 @@
               </div>
               <span style="margin-right: 3px">授课教师</span>
             </div>
-            <div class="select" style="width: 88%">
+            <div class="select" style="width: 74.5%">
               <ProjectManager
                 v-model:value="formData.teacherId"
                 v-model:name="formData.teacher"
@@ -531,9 +531,9 @@ const createNewCourse = () => {
     offcourseId: params.value.offcourseId,
     draftTaskId: params.value.draftTaskId,
   });
-  onceName.value = "";
   dateTime.value = [];
   validated.value = 0;
+  onceName.value = "";
   offCourseNewVisiable.value = true;
 };
 const handleCancelStu = () => offCourseNewVisiable.value = false;
@@ -576,6 +576,7 @@ async function coursePlanConfirm() {
 }
 
 function planEdit(record) {
+  onceName.value = record.name;
   formData.value = { ...record };
   validated.value = 0;
   formData.value.homeWorkId && request(WORK_DETAIL(formData.value.homeWorkId), {}).then(res => formData.value.workInfo = res.data);
@@ -590,7 +591,6 @@ function openDrawer(row) {
   params.value.draftTaskId = row.id;
   formData.value.offcourseId = row.courseId;
   formData.value.draftTaskId = row.id;
-  onceName.value = row.name;
   courseName.value = row.name;
   nextTick(tableRef.value.fetch);
 }

src/components/drawers/project/ProjectFaceTaskManage.vue

@@ -242,7 +242,7 @@ const columns = ref([
     align: "center",
     ellipsis: true,
     className: "h",
-    customRender: ({ record: { workScore } }) => <span> {workScore || "-"}</span>
+    customRender: ({ record: { workScore } }) => <span> {workScore!==-2?workScore:"-" || "-"}</span>
   },
   {
     title: "考试成绩",

src/views/learningpath/LevelAdd.vue

@@ -2661,9 +2661,9 @@ export default {
           item.courseId;
       }
       if (item.type == 2) {
-        let date1 = new Date(item.endTime).getTime();
-        let date2 = new Date().getTime();
-        if (date1 < date2) return message.warning("当前面授课已结束");
+        // let date1 = new Date(item.endTime).getTime();
+        // let date2 = new Date().getTime();
+        // if (date1 < date2) return message.warning("当前面授课已结束");
         // if (item.taskStatus == 1 || item.taskStatus == 2)
         //   return message.error("该任务无法学习，请联系管理员进行替换。");
         codeUrl =
@@ -2672,7 +2672,7 @@ export default {
           "/faceteach?type=2&courseId=" +
           item.courseId +
           "&id=" +
-          item.projectTaskId;
+          item.id;
       }
       if (item.type == 3) return message.error("请在pc端完成");