diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue
index 95fa23be..eaf9dd6b 100644
--- a/src/components/drawers/CheckStu.vue
+++ b/src/components/drawers/CheckStu.vue
@@ -141,7 +141,7 @@
"
/>
-
{{ item.status === 0 ? "进行中" : item.status === 1 ? "已完成" : "未开始" }}
+ {{ item.status === 2 ? "进行中" : item.status === 1 ? "已完成" : "未开始" }}
diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index 3a13aa2e..fa64ae12 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -314,7 +314,7 @@ export default {
align: "center",
ellipsis: true,
className: "h",
- customRender: ({record:{status}}) => ({2:'进行中',1:'未开始',9:'已完成'}[status] || '未开始'),
+ customRender: ({record:{status}}) => ({1:'进行中',0:'未开始',9:'已完成'}[status] || '未开始'),
},
{
title: "操作",
diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue
index c055976d..33476e37 100644
--- a/src/components/drawers/project/ProjectExternalExamManage.vue
+++ b/src/components/drawers/project/ProjectExternalExamManage.vue
@@ -327,7 +327,7 @@
align: "center",
ellipsis: true,
className: "h",
- customRender: ({record:{status}}) => ({0:'未开始',1:'进行中',null:'进行中',2:'已完成'}[status] || '未开始'),
+ customRender: ({record:{status}}) => ({0:'未开始',1:'已完成',null:'未开始',2:'进行中'}[status] || '未开始'),
},
],
loadingData: true
diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue
index c1a8ba31..dde44b71 100644
--- a/src/components/drawers/project/ProjectVoteManage.vue
+++ b/src/components/drawers/project/ProjectVoteManage.vue
@@ -292,7 +292,7 @@
customRender: (text) => {
return (
- {text.record.finishStatus == 1 || text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 2 ?"进行中":text.record.finishStatus == 3 ? "已完成" :"未完成"}
+ { text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 2 ?"进行中":text.record.finishStatus == 1 ? "已完成" :"未完成"}
);
},
diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue
index 0452428f..61053706 100644
--- a/src/components/drawers/router/RouterExaminationExternalManage.vue
+++ b/src/components/drawers/router/RouterExaminationExternalManage.vue
@@ -340,7 +340,7 @@
align: "center",
ellipsis: true,
className: "h",
- customRender: ({record:{status}}) => ({0:'未开始',1:'进行中',null:'进行中',2:'已完成'}[status] || '未开始'),
+ customRender: ({record:{status}}) => ({0:'未开始',1:'已完成',null:'未开始',2:'进行中'}[status] || '未开始'),
},
],
loadingData: true
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index fef8420f..8f3fc07d 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -295,7 +295,7 @@ export default {
align: "center",
ellipsis: true,
className: "h",
- customRender: ({record:{status}}) => ({1:'已完成',0:'未开始',9:'已完成'}[status] || '未开始'),
+ customRender: ({record:{status}}) => ({9:'已完成',0:'未开始',1:'进行中'}[status] || '未开始'),
},
{
title: "操作",
diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue
index 69b07273..f3c60456 100644
--- a/src/components/drawers/router/RouterVoteManage.vue
+++ b/src/components/drawers/router/RouterVoteManage.vue
@@ -312,7 +312,7 @@
customRender: (text) => {
return (
- {text.record.finishStatus == 1 || text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 2 ?"进行中":text.record.finishStatus == 3 ? "已完成" :"未完成"}
+ { text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 2 ?"进行中":text.record.finishStatus == 1 ? "已完成" :"未完成"}
);
},
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 40f1e64b..b1cfe0e7 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -103,7 +103,7 @@
{
- treeNode.dataRef.treeChildList = r.data;
+ treeNode.dataRef.directChildList = r.data;
treeOrgData.value = [...treeOrgData.value];
}
);
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index f43b2915..cac253e2 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1909,8 +1909,8 @@ const columns2 = [
{" "}
{text.record.finishStatus == 0 || text.record.finishStatus == null
- ? "未开始"
- : "已完成"}
+ ? "未开始" :text.record.finishStatus == 1?"已完成"
+ : '进行中'}
);
diff --git a/src/views/gratefulteacher/InstructorCertification.vue b/src/views/gratefulteacher/InstructorCertification.vue
index ba9592d3..5a532ca8 100644
--- a/src/views/gratefulteacher/InstructorCertification.vue
+++ b/src/views/gratefulteacher/InstructorCertification.vue
@@ -539,7 +539,7 @@ function handleOper(record, type, status = "") {