diff --git a/src/components/student/TableCertificateStudent.vue b/src/components/student/TableCertificateStudent.vue index 9ab54f8a..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", @@ -160,17 +159,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: "操作", 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; } 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 + ""] || "" : "-"}
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; }