Merge branch 'zcwy-teacher-manage' into master_1202

src/components/project/BatchLecturer.vue

@@ -371,6 +371,11 @@ const queryDrawer = () => {
             margin-right: 20px;
           }
         }
+        .table{
+          ::v-deep .ant-table-cell-fix-right {
+            width: 160px !important;
+          }
+        }
       }
     }
 

src/components/project/ConfirmLecturer.vue

@@ -618,6 +618,11 @@ const config = () => {
             margin-right: 20px;
           }
         }
+        .table{
+          ::v-deep .ant-table-cell-fix-right {
+            width: 160px !important;
+          }
+        }
       }
     }
 

src/views/courselibrary/CoursewareManage.vue

@@ -2757,6 +2757,7 @@ export default defineComponent({
       completeType: "",
       xjkkinputV1: "",
       onceName: "",
+      scoreParams:'',
       changeName:false,
       xjkkinputV2: "",
       duration: "",
@@ -3952,6 +3953,7 @@ function onFocusEnd(){
       state.completeType = "";
       // state.xjkkinputV1 = "";
       state.onceName = "";
+      state.scoreParams = '';
       state.xjkkinputV2 = "";
       state.duration = "";
       // state.xjkkinputV3 = [];
@@ -4025,6 +4027,7 @@ function onFocusEnd(){
         examInfo: state.examInfo, //提交的考试信息
         beforeStart: state.beforeValue, //考勤 开始前
         afterStart: state.afterStartValue, //考勤 开始后
+        score: state.scoreParams,
       };
       console.log(postData);
       if(!postData.name){
@@ -4143,6 +4146,7 @@ function onFocusEnd(){
       state.EditWorkId = String(item.homeWorkId);
       state.xjkkinputV1 = item.name;
       state.onceName = item.name;
+      state.scoreParams = item.score;
       state.beforeValue = item.beforeStart; //考勤 开始前
       state.afterStartValue = item.afterStart; //考勤 开始后
       state.xjkkradioVEndTime = item.autoGraduateDays;
@@ -5277,7 +5281,7 @@ function onFocusEnd(){
     const qrcodeVisible = (record, type) => {
       // `${location.protocol}//${location.host}${import.meta.env.VUE_APP_BASE_API}/stu/project/redirectDetail?courseId=${record.id}`
       state.codevisible = true;
-      let teacherNames = record.offteachers?.filter(teacher => teacher.name !== null).map(teacher => teacher.name);
+      let teacherNames = record.offteachers?.filter(teacher => teacher.teacherName !== null).map(teacher => teacher.teacherName);
       state.codeInfo = {
         title: type == 1 ? "【课程】二维码" : type == 2 ? "【签到】二维码" : "【评估】二维码",
         name: record.name,

src/views/lecturer/ExternalTeaching.vue

@@ -620,7 +620,7 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm")}
+              {value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
             </div>
           );
         },

src/views/lecturer/InsideTeaching.vue

@@ -688,11 +688,15 @@ export default {
     ])
     const scoreList = ref([
       { value: '', label: "全部" },
-      { value: '9-10', label: "9~10" },
+      { value: '90-100', label: "90-100" },
-      { value: '8-9', label: "8~9" },
+      { value: '80-90', label: "80-90" },
-      { value: '7-8', label: "7~8" },
+      { value: '70-80', label: "70-80" },
-      { value: '6-7', label: "6~7" },
+      { value: '60-70', label: "60-70" },
-      { value: '1-5', label: "1~5" },
+      { value: '50-60', label: "50-60" },
+      { value: '40-50', label: "40-50" },
+      { value: '30-40', label: "30-40" },
+      { value: '20-30', label: "20-30" },
+      { value: '10~20', label: "10~20" },
     ])
     const studysList = ref([
       { value: '0-30', label: "0~30" },

src/views/lecturer/LecturerAPPEdit.vue

@@ -954,6 +954,9 @@ export default {
         ellipsis: true,
         align: "center",
         width: 160,
+        customRender: ({text}) => {
+          return text || "0";
+        }
       },
       {
         title: '评分 ',
@@ -962,6 +965,9 @@ export default {
         ellipsis: true,
         align: "center",
         width: 160,
+        customRender: ({text}) => {
+          return text || "-";
+        }
       },
       {
         title: '课程基准 ',
@@ -1244,6 +1250,9 @@ export default {
       }
       .table{
         padding-bottom: 70px;
+        ::v-deep .ant-table-cell-fix-right {
+          width: 160px !important;
+        }
       }
     }
   }

src/views/lecturer/LecturerApproval.vue

@@ -983,6 +983,9 @@
           ellipsis: true,
           align: "center",
           width: 120,
+          customRender: ({text}) => {
+            return text || "0";
+          }
         },
         {
           title: '评分 ',
@@ -991,6 +994,9 @@
           ellipsis: true,
           align: "center",
           width: 120,
+          customRender: ({text}) => {
+            return text || "-";
+          }
         },
         {
           title: '课程类型 ',