From e38ba60d88d93d345a79783868c0ed3f4fd2621a Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 28 Feb 2023 10:15:59 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectManage.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 0b3ac2f4..8cc62e43 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -1473,7 +1473,7 @@ export default { customRender: (value) => { return (
- {value.record.status === 3 + {value.record.status === 3 || value.record.status === 2 || value.record.status === -5 || value.record.status === 1 ? { 0: "草稿", 1: "提交待审核", @@ -1482,6 +1482,10 @@ export default { 4: "发布", "-1": "已结束", "-6": "撤回已结束", + "-2": "删除", + "-3": "撤回审核", + "-4": "撤回发布", + "-5": "拒绝", }[value.record.status + ""] || "" : "-"}
From 0df4af33d8cf49cee58e905b969abda762831302 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 28 Feb 2023 15:32:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=BF=85=E4=BF=AE=E9=80=89=E4=BF=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskAdd.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 49cbd17a..c6af2cac 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -235,7 +235,7 @@ v-model:checked="element.flag" size="small" active-color="red"/>
-
必修
+
必修
选修
@@ -1585,7 +1585,7 @@ const cancelStorage = async () => { background-color: #5dc988; line-height: 23px; position: absolute; - z-index: 998; + z-index: 888; color: #ffffff; border-radius: 4px; } @@ -1596,7 +1596,7 @@ const cancelStorage = async () => { background-color: #f2f6fc; line-height: 23px; position: absolute; - z-index: 998; + z-index: 888; color: #5dc988; border-radius: 4px; } From 6a03701af2452438e0ed533e7a0f16cd83e7f84d Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 28 Feb 2023 15:34:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?style:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BEc:\Users\86187\Desktop\testcode\fe-manage\src\views\le?= =?UTF-8?q?arningpath\LevelAddDetail.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAddDetail.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index f115279b..56d32975 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -261,7 +261,7 @@ size="small" active-color="red"/>
必修
@@ -1946,7 +1946,7 @@ const cancelStorage = async () => { background-color: #5dc988; line-height: 23px; position: absolute; - z-index: 998; + z-index: 888; color: #ffffff; border-radius: 4px; } @@ -1958,7 +1958,7 @@ const cancelStorage = async () => { line-height: 23px; // display: none; position: absolute; - z-index: 998; + z-index: 888; color: #5dc988; border-radius: 4px; } From 3d6b792caf65c1b3df8b0fd254b54a312ded5079 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 28 Feb 2023 16:10:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E8=8E=B7=E5=BE=97=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/TableCertificateStudent.vue | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/components/student/TableCertificateStudent.vue b/src/components/student/TableCertificateStudent.vue index 9ab54f8a..7a6a7bd6 100644 --- a/src/components/student/TableCertificateStudent.vue +++ b/src/components/student/TableCertificateStudent.vue @@ -160,17 +160,7 @@ export default { key: "createTime", width: 60, align: "center", - className: "h", - customRender: (record) => { - // console.log(text.record.checked1); - return ( -
- {record.record.createTime - ? toDate(record.record.createTime / 1000, "Y-M-D h:m") - : "-"} -
- ); - }, + className: "h" }, { title: "操作", From 5eb983f0f97753dbbc0e7ba87a9772bd0cd32a2d Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 28 Feb 2023 16:10:44 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E8=8E=B7=E5=BE=97=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/TableCertificateStudent.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/student/TableCertificateStudent.vue b/src/components/student/TableCertificateStudent.vue index 7a6a7bd6..680187d5 100644 --- a/src/components/student/TableCertificateStudent.vue +++ b/src/components/student/TableCertificateStudent.vue @@ -93,7 +93,6 @@ import { reactive, toRefs } from "vue"; import * as api from "@/api/index1"; import OrgClass from "@/components/project/OrgClass"; import { message } from "ant-design-vue"; -import { toDate } from "@/api/method"; import dayjs from "dayjs"; export default { name: "TableCertificateStudent",