From 4be9af686d315f5da0aa736a89fbd9c4f8e79622 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 14 Jun 2024 13:42:29 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectExamManage.vue | 2 +- src/components/drawers/router/RouterExaminationManage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 3a13aa2e..ab11d980 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}}) => ({2:'进行中',0:'未开始',1:'已完成'}[status] || '未开始'), }, { title: "操作", diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index fef8420f..bc55d11e 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}}) => ({1:'已完成',0:'未开始',2:'进行中'}[status] || '未开始'), }, { title: "操作", From d9a2e43f222e6487afb9b2bff1fa91caa27aa121 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Mon, 17 Jun 2024 17:42:24 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=9A1=E5=B7=B2=E5=AE=8C=E6=88=90?= =?UTF-8?q?=EF=BC=8C2=E8=BF=9B=E8=A1=8C=E4=B8=AD=EF=BC=8C0=E6=9C=AA?= =?UTF-8?q?=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectExamManage.vue | 2 +- src/components/drawers/project/ProjectExternalExamManage.vue | 2 +- src/components/drawers/project/ProjectVoteManage.vue | 2 +- .../drawers/router/RouterExaminationExternalManage.vue | 2 +- src/components/drawers/router/RouterExaminationManage.vue | 2 +- src/components/drawers/router/RouterVoteManage.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 8b7255a0..920aab4b 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}}) => ({1:'已完成',0:'未开始',9:'已完成'}[status] || '未开始'), + customRender: ({record:{status}}) => ({1:'已完成',0:'未开始',2:'进行中'}[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..bc55d11e 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}}) => ({1:'已完成',0:'未开始',2:'进行中'}[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 ? "已完成" :"未完成"}
); }, From efaf5490c85f1c7e5bccf0dc6b9baedd2ad6430c Mon Sep 17 00:00:00 2001 From: zhangsir Date: Mon, 17 Jun 2024 18:11:58 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/CheckStu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ? "已完成" : "未开始" }}
From 919784ddc0a64f99902946db4dc2f54ef4f7759d Mon Sep 17 00:00:00 2001 From: zhangsir Date: Mon, 17 Jun 2024 18:26:27 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectExamManage.vue | 2 +- src/components/drawers/router/RouterExaminationManage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index ab11d980..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:'进行中',0:'未开始',1:'已完成'}[status] || '未开始'), + customRender: ({record:{status}}) => ({1:'进行中',0:'未开始',9:'已完成'}[status] || '未开始'), }, { title: "操作", diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index bc55d11e..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:'未开始',2:'进行中'}[status] || '未开始'), + customRender: ({record:{status}}) => ({9:'已完成',0:'未开始',1:'进行中'}[status] || '未开始'), }, { title: "操作", From 2043d10ead7b7e0ad334625e337cf7ae27174595 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 19 Jun 2024 16:20:22 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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?"已完成" + : '进行中'} ); From 99fe22a8de586f4541f6e8dad2a67212d5948a83 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 5 Jul 2024 17:22:29 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=A6=E5=91=98=E7=BB=84=E7=BB=87=EF=BC=8C=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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]; } ); From 6c49a8c27675cf20ad12a1bc534319dd5cc142e7 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 12 Jul 2024 10:34:59 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/gratefulteacher/InstructorCertification.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = "") {
- +
From b54dd88c1cf3ff4805ed0a05068622097f645e2f Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 12 Jul 2024 13:46:01 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=9B=9E=E9=80=80=E5=AD=A6=E5=91=98?= =?UTF-8?q?=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index b1cfe0e7..40f1e64b 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -103,7 +103,7 @@ { - treeNode.dataRef.directChildList = r.data; + treeNode.dataRef.treeChildList = r.data; treeOrgData.value = [...treeOrgData.value]; } ); From 78dc7ecb5f8bc7f4d040945ec35a8f74b81fd0a7 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 12 Jul 2024 17:41:11 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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]; } );