Merge branch 'compulsory_professional_skills' into compulsory_professional_skills_copy

This commit is contained in:
gengxin
2025-02-26 21:02:45 +08:00
2 changed files with 10 additions and 2 deletions

View File

@@ -562,7 +562,6 @@ export default {
key: "stdPositionName", key: "stdPositionName",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
width: 300,
customRender: ({ record }) => { customRender: ({ record }) => {
return record.stdPosition return record.stdPosition
? `${record.stdPositionName}${record.stdPosition}` ? `${record.stdPositionName}${record.stdPosition}`
@@ -574,12 +573,14 @@ export default {
dataIndex: "qualsLevelDesr", dataIndex: "qualsLevelDesr",
key: "qualsLevelDesr", key: "qualsLevelDesr",
align: "center", align: "center",
width:120,
ellipsis: true, ellipsis: true,
}, },
{ {
title: "完成人数/总人数", title: "完成人数/总人数",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
width:140,
customRender: ({ record }) => { customRender: ({ record }) => {
return `${record.comLearnNum}/${record.learnNum}`; return `${record.comLearnNum}/${record.learnNum}`;
}, },
@@ -588,6 +589,7 @@ export default {
title: "必修丨选修", title: "必修丨选修",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
width:110,
customRender: ({ record }) => { customRender: ({ record }) => {
return `${record.requiredTaskNum}丨${record.elePublishedNum}`; return `${record.requiredTaskNum}丨${record.elePublishedNum}`;
}, },
@@ -597,6 +599,7 @@ export default {
dataIndex: "ratio", dataIndex: "ratio",
key: "ratio", key: "ratio",
align: "center", align: "center",
width:90,
ellipsis: true, ellipsis: true,
customRender: ({ record }) => { customRender: ({ record }) => {
return `${record.ratio * 100}%`; return `${record.ratio * 100}%`;
@@ -607,6 +610,7 @@ export default {
dataIndex: "isPublished", dataIndex: "isPublished",
key: "isPublished", key: "isPublished",
align: "center", align: "center",
width:80,
ellipsis: true, ellipsis: true,
customRender: ({ record }) => { customRender: ({ record }) => {
return record.isPublished ? "已发布" : "未发布"; return record.isPublished ? "已发布" : "未发布";

View File

@@ -550,7 +550,6 @@ export default {
key: "stdPositionName", key: "stdPositionName",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
width: 400,
customRender: ({ record }) => { customRender: ({ record }) => {
return record.stdPosition return record.stdPosition
? `${record.stdPositionName}${record.stdPosition}` ? `${record.stdPositionName}${record.stdPosition}`
@@ -562,11 +561,13 @@ export default {
dataIndex: "qualsLevelDesr", dataIndex: "qualsLevelDesr",
key: "qualsLevelDesr", key: "qualsLevelDesr",
align: "center", align: "center",
width:120,
ellipsis: true, ellipsis: true,
}, },
{ {
title: "完成人数/总人数", title: "完成人数/总人数",
align: "center", align: "center",
width:140,
ellipsis: true, ellipsis: true,
customRender: ({ record }) => { customRender: ({ record }) => {
return `${record.comLearnNum}/${record.learnNum}`; return `${record.comLearnNum}/${record.learnNum}`;
@@ -575,6 +576,7 @@ export default {
{ {
title: "必修|选修", title: "必修|选修",
align: "center", align: "center",
width:110,
ellipsis: true, ellipsis: true,
customRender: ({ record }) => { customRender: ({ record }) => {
return `${record.requiredTaskNum}|${record.elePublishedNum}`; return `${record.requiredTaskNum}|${record.elePublishedNum}`;
@@ -584,6 +586,7 @@ export default {
title: "完成比例", title: "完成比例",
dataIndex: "ratio", dataIndex: "ratio",
key: "ratio", key: "ratio",
width:90,
align: "center", align: "center",
ellipsis: true, ellipsis: true,
customRender: ({ record }) => { customRender: ({ record }) => {
@@ -595,6 +598,7 @@ export default {
dataIndex: "isPublished", dataIndex: "isPublished",
key: "isPublished", key: "isPublished",
align: "center", align: "center",
width:80,
ellipsis: true, ellipsis: true,
customRender: ({ record }) => { customRender: ({ record }) => {
return record.isPublished ? "已发布" : "未发布"; return record.isPublished ? "已发布" : "未发布";