feat:合并

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: "操作",