From 29ea775da3cd84861b859fb9c0939c94c655ce72 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sat, 7 Jan 2023 13:05:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8A=A0=E6=A8=AA=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawers/project/ProjectExamManage.vue     |  2 +-
 .../router/RouterExaminationManage.vue        |  2 +-
 src/views/courselibrary/CoursewareManage.vue  | 64 +++++++++++++++++--
 3 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index 9151de8d..c7b10a0d 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -297,7 +297,7 @@ export default {
             console.log(text.record.status);
             return (
               <div class="racona">
-                <span> {text.record.status==0?"未开始":text.record.status==10?"未通过":"已通过"}</span>
+                <span> {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}</span>
               </div>
             );
           },
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index f62a5dc9..f6425cd5 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -316,7 +316,7 @@
               console.log(text.record.status);
               return (
                 <div class="racona">
-                  <span> {text.record.status==0?"未开始":text.record.status==10?"未通过":"已通过"}</span>
+                  <span> {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}</span>
                 </div>
               );
             },
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 48b4745f..5a4625af 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2538,6 +2538,13 @@ const columns2 = [
     key: "studentName",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.studentName?text.record.studentName:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "工号",
@@ -2545,13 +2552,27 @@ const columns2 = [
     key: "studentUserNo",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "开课名称",
-    dataIndex: "courseName",
-    key: "courseName",
+    dataIndex: "name",
+    key: "name",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.name?text.record.name:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "地点",
@@ -2559,6 +2580,13 @@ const columns2 = [
     key: "address",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.address?text.record.address:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "数据来源",
@@ -2566,13 +2594,27 @@ const columns2 = [
     key: "courseSource",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.courseSource?text.record.courseSource:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "学习时间",
-    dataIndex: "beginTime",
-    key: "beginTime",
+    dataIndex: "lastStudyTime",
+    key: "lastStudyTime",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.lastStudyTime?text.record.lastStudyTime:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "签到时间",
@@ -2580,6 +2622,13 @@ const columns2 = [
     key: "signTime",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.signTime?text.record.signTime:"-"}</span>
+        </div>
+      );
+    },
   },
   {
     title: "状态",
@@ -2587,6 +2636,13 @@ const columns2 = [
     key: "status",
     width: "12%",
     align: "center",
+    customRender: (text) => {
+      return (
+        <div class="racona">
+          <span> {text.record.finishStatus==0 || text.record.finishStatus == null ?"未开始":"已完成"}</span>
+        </div>
+      );
+    },
   },
   // {
   //   title: "操作",