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 (
- {text.record.status==0?"未开始":text.record.status==10?"未通过":"已通过"}
+ {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}
);
},
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 (
- {text.record.status==0?"未开始":text.record.status==10?"未通过":"已通过"}
+ {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}
);
},
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 (
+
+ {text.record.studentName?text.record.studentName:"-"}
+
+ );
+ },
},
{
title: "工号",
@@ -2545,13 +2552,27 @@ const columns2 = [
key: "studentUserNo",
width: "12%",
align: "center",
+ customRender: (text) => {
+ return (
+
+ {text.record.studentUserNo?text.record.studentUserNo:"-"}
+
+ );
+ },
},
{
title: "开课名称",
- dataIndex: "courseName",
- key: "courseName",
+ dataIndex: "name",
+ key: "name",
width: "12%",
align: "center",
+ customRender: (text) => {
+ return (
+
+ {text.record.name?text.record.name:"-"}
+
+ );
+ },
},
{
title: "地点",
@@ -2559,6 +2580,13 @@ const columns2 = [
key: "address",
width: "12%",
align: "center",
+ customRender: (text) => {
+ return (
+
+ {text.record.address?text.record.address:"-"}
+
+ );
+ },
},
{
title: "数据来源",
@@ -2566,13 +2594,27 @@ const columns2 = [
key: "courseSource",
width: "12%",
align: "center",
+ customRender: (text) => {
+ return (
+
+ {text.record.courseSource?text.record.courseSource:"-"}
+
+ );
+ },
},
{
title: "学习时间",
- dataIndex: "beginTime",
- key: "beginTime",
+ dataIndex: "lastStudyTime",
+ key: "lastStudyTime",
width: "12%",
align: "center",
+ customRender: (text) => {
+ return (
+
+ {text.record.lastStudyTime?text.record.lastStudyTime:"-"}
+
+ );
+ },
},
{
title: "签到时间",
@@ -2580,6 +2622,13 @@ const columns2 = [
key: "signTime",
width: "12%",
align: "center",
+ customRender: (text) => {
+ return (
+
+ {text.record.signTime?text.record.signTime:"-"}
+
+ );
+ },
},
{
title: "状态",
@@ -2587,6 +2636,13 @@ const columns2 = [
key: "status",
width: "12%",
align: "center",
+ customRender: (text) => {
+ return (
+
+ {text.record.finishStatus==0 || text.record.finishStatus == null ?"未开始":"已完成"}
+
+ );
+ },
},
// {
// title: "操作",