Merge remote-tracking branch 'yx/compulsory_professional_skills' into master_1202

This commit is contained in:
joshen
2025-02-27 02:06:19 +08:00
2 changed files with 28 additions and 14 deletions

View File

@@ -103,7 +103,6 @@
> >
</DropDown> --> </DropDown> -->
<a-dropdown <a-dropdown
:getPopupContainer="(triggerNode) => triggerNode.parentNode"
:trigger="['click']" :trigger="['click']"
v-if=" v-if="
(record.isPublished && checkMenu('growthRevoke')) || (record.isPublished && checkMenu('growthRevoke')) ||
@@ -577,6 +576,14 @@ export default {
width: 120, width: 120,
ellipsis: true, ellipsis: true,
}, },
{
title: "band",
dataIndex: "band",
key: "band",
align: "center",
width: 200,
ellipsis: true,
},
{ {
title: "完成人数/总人数", title: "完成人数/总人数",
align: "center", align: "center",

View File

@@ -91,7 +91,6 @@
> >
</DropDown> --> </DropDown> -->
<a-dropdown <a-dropdown
:getPopupContainer="(triggerNode) => triggerNode.parentNode"
:trigger="['click']" :trigger="['click']"
v-if=" v-if="
(record.isPublished && checkMenu('growthRevoke')) || (record.isPublished && checkMenu('growthRevoke')) ||
@@ -565,30 +564,38 @@ export default {
width: 120, width: 120,
ellipsis: true, ellipsis: true,
}, },
{
title: "band",
dataIndex: "band",
key: "band",
align: "center",
width: 200,
ellipsis: true,
},
{ {
title: "完成人数/总人数", title: "完成人数/总人数",
align: "center", align: "center",
width: 140,
ellipsis: true, ellipsis: true,
width: 140,
customRender: ({ record }) => { customRender: ({ record }) => {
return `${record.comLearnNum}/${record.learnNum}`; return `${record.comLearnNum}/${record.learnNum}`;
}, },
}, },
{ {
title: "必修|选修", title: "必修选修",
align: "center", align: "center",
width: 110,
ellipsis: true, ellipsis: true,
width: 110,
customRender: ({ record }) => { customRender: ({ record }) => {
return `${record.requiredTaskNum}|${record.elePublishedNum}`; return `${record.requiredTaskNum}${record.elePublishedNum}`;
}, },
}, },
{ {
title: "完成比例", title: "完成比例",
dataIndex: "ratio", dataIndex: "ratio",
key: "ratio", key: "ratio",
width:100,
align: "center", align: "center",
width: 100,
ellipsis: true, ellipsis: true,
customRender: ({ record }) => { customRender: ({ record }) => {
return `${record.ratio * 100}%`; return `${record.ratio * 100}%`;
@@ -610,8 +617,8 @@ export default {
dataIndex: "updateTime", dataIndex: "updateTime",
key: "updateTime", key: "updateTime",
align: "center", align: "center",
width: 200,
ellipsis: true, ellipsis: true,
width: 200,
}, },
{ {
title: "操作", title: "操作",