diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 20860282..b87240c8 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -91,25 +91,25 @@ @@ -359,6 +359,7 @@ export default { align: "center", colSortNo: 6, visible: true, + customRender: (text) => {return !text.value?'0':text.value;} }, { title: "项目完成率", @@ -370,7 +371,7 @@ export default { sorter: true, colSortNo: 7, visible: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";}, + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";}, }, { title: "学习路径完成关卡数", @@ -381,6 +382,7 @@ export default { align: "center", colSortNo: 8, visible: true, + customRender: (text) => {return !text.value?'0':text.value;} }, { title: "学习路径完成率", @@ -391,7 +393,7 @@ export default { align: "center", colSortNo: 9, visible: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, { title: "面授完成数", @@ -402,6 +404,7 @@ export default { align: "center", colSortNo: 10, visible: true, + customRender: (text) => {return !text.value?'0':text.value;} }, { title: "面授完成率", @@ -412,7 +415,7 @@ export default { align: "center", colSortNo: 11, visible: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, { title: "在线课完成数", @@ -423,6 +426,7 @@ export default { align: "center", colSortNo: 12, visible: true, + customRender: (text) => {return !text.value?'0':text.value;} }, { title: "在线课学习总时长", @@ -433,6 +437,7 @@ export default { align: "center", colSortNo: 13, visible: true, + customRender: (text) => {return !text.value?'0':text.value;} }, { title: "考试完成数", @@ -443,6 +448,7 @@ export default { align: "center", colSortNo: 14, visible: true, + customRender: (text) => {return !text.value?'0':text.value;} }, { title: "考试及格数", @@ -453,6 +459,7 @@ export default { align: "center", colSortNo: 15, visible: true, + customRender: (text) => {return !text.value?'0':text.value;} }, { title: "考试及格率", @@ -463,7 +470,7 @@ export default { align: "center", colSortNo: 16, visible: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, { title: "案例贡献数", @@ -474,6 +481,7 @@ export default { align: "center", colSortNo: 17, visible: true, + customRender: (text) => {return !text.value?'0':text.value;} }, { title: "案例浏览数", @@ -484,6 +492,7 @@ export default { align: "center", colSortNo: 18, visible: true, + customRender: (text) => {return !text.value?'0':text.value;} }, { title: "专业力必修完成数", @@ -494,6 +503,7 @@ export default { align: "center", colSortNo: 19, visible: true, + customRender: (text) => {return !text.value?'0':text.value;} }, { title: "专业力必修完成率", @@ -504,7 +514,7 @@ export default { align: "center", colSortNo: 20, visible: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, // { // title: "操作", diff --git a/src/views/report/EmployeelearningModal.vue b/src/views/report/EmployeelearningModal.vue index ad2d1839..be078bc5 100644 --- a/src/views/report/EmployeelearningModal.vue +++ b/src/views/report/EmployeelearningModal.vue @@ -89,14 +89,20 @@ const getModelColumns = ()=>{ modelColumns.value = [ {title: "项目名称", dataIndex: "projectName", key: "projectName", ellipsis: true, align: "center",}, {title: "归属组织", dataIndex: "sourceBelongFullName", key: "sourceBelongFullName", ellipsis: true, align: "center",}, - {title: "总任务数", dataIndex: "taskCount", key: "taskCount", ellipsis: true, align: "center",}, - {title: "完成任务数", dataIndex: "taskCompletedNum", key: "taskCompletedNum", ellipsis: true, align: "center",}, - {title: "总任务数完成率", dataIndex: "taskCompletedRate", key: "taskCompletedRate", ellipsis: true, align: "center", - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + {title: "总任务数", dataIndex: "taskCount", key: "taskCount", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "完成任务数", dataIndex: "taskCompletedNum", key: "taskCompletedNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "总任务数完成率", dataIndex: "taskCompletedRate", key: "taskCompletedRate", ellipsis: true, align: "center", + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} + }, + {title: "必修项目数", dataIndex: "bxCount", key: "bxCount", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} }, - {title: "必修项目数", dataIndex: "bxCount", key: "bxCount", ellipsis: true, align: "center",}, {title: "必修项目完成率", dataIndex: "bxCompletedRate", key: "bxCompletedRate", ellipsis: true, align: "center", - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, ] }else if(props.modalType==2){ @@ -104,15 +110,23 @@ const getModelColumns = ()=>{ modelColumns.value = [ {title: "路径名称", dataIndex: "routerName", key: "routerName", ellipsis: true, align: "center",}, {title: "归属组织", dataIndex: "orgFullName", key: "orgFullName", ellipsis: true, align: "center",}, - {title: "关卡数", dataIndex: "chapterNum", key: "chapterNum", ellipsis: true, align: "center",}, - {title: "任务数", dataIndex: "taskCount", key: "taskCount", ellipsis: true, align: "center",}, - {title: "任务完成数", dataIndex: "taskCompletedNum", key: "taskCompletedNum", ellipsis: true, align: "center",}, - {title: "任务完成率", dataIndex: "taskCompletedRate", key: "taskCompletedRate", ellipsis: true, align: "center", - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + {title: "关卡数", dataIndex: "chapterNum", key: "chapterNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "任务数", dataIndex: "taskCount", key: "taskCount", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "任务完成数", dataIndex: "taskCompletedNum", key: "taskCompletedNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "任务完成率", dataIndex: "taskCompletedRate", key: "taskCompletedRate", ellipsis: true, align: "center", + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} + }, + {title: "必修任务数", dataIndex: "taskRequiredNum", key: "taskRequiredNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} }, - {title: "必修任务数", dataIndex: "taskRequiredNum", key: "taskRequiredNum", ellipsis: true, align: "center",}, {title: "必修任务完成率", dataIndex: "taskRequiredCompletedRate", key: "taskRequiredCompletedRate", ellipsis: true, align: "center", - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, ] }else if(props.modalType==3){ @@ -131,8 +145,12 @@ const getModelColumns = ()=>{ {title: "在线课名称", dataIndex: "courseName", key: "courseName", ellipsis: true, align: "center",}, {title: "归属组织", dataIndex: "sourceBelongFullName", key: "sourceBelongFullName", ellipsis: true, align: "center",}, {title: "学习时间", dataIndex: "studyTime", key: "studyTime", ellipsis: true, align: "center",}, - {title: "学习时长", dataIndex: "studyDuration", key: "studyDuration", ellipsis: true, align: "center",}, - {title: "累计学习课件数", dataIndex: "coursewareCount", key: "coursewareCount", ellipsis: true, align: "center",}, + {title: "学习时长", dataIndex: "studyDuration", key: "studyDuration", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "累计学习课件数", dataIndex: "coursewareCount", key: "coursewareCount", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, {title: "完成状态", dataIndex: "completedStatus", key: "completedStatus", ellipsis: true, align: "center", customRender: (text) => {return text.value && text.value == 1?'已完成':"未完成";} }, @@ -142,11 +160,15 @@ const getModelColumns = ()=>{ modelColumns.value = [ {title: "考试名称", dataIndex: "testName", key: "testName", ellipsis: true, align: "center",}, {title: "考试时间", dataIndex: "examTime", key: "examTime", ellipsis: true, align: "center",}, - {title: "题量", dataIndex: "questionCount", key: "questionCount", ellipsis: true, align: "center",}, + {title: "题量", dataIndex: "questionCount", key: "questionCount", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, {title: "满分", dataIndex: "totalScore", key: "totalScore", ellipsis: true, align: "center",}, {title: "及格分", dataIndex: "passLine", key: "passLine", ellipsis: true, align: "center",}, {title: "参考时间", dataIndex: "takeExamTime", key: "takeExamTime", ellipsis: true, align: "center",}, - {title: "成绩", dataIndex: "score", key: "score", ellipsis: true, align: "center",}, + {title: "成绩", dataIndex: "score", key: "score", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, {title: "部门排名", dataIndex: "deptSortNum", key: "deptSortNum", ellipsis: true, align: "center",}, ] }else if(props.modalType==6){ @@ -172,15 +194,23 @@ const getModelColumns = ()=>{ {title: "岗位名称", dataIndex: "stdPositionName", key: "stdPositionName", ellipsis: true, align: "center",}, {title: "资格等级", dataIndex: "qualsLevelName", key: "qualsLevelName", ellipsis: true, align: "center",}, {title: "band", dataIndex: "bandInfo", key: "bandInfo", ellipsis: true, align: "center",}, - {title: "任务总数", dataIndex: "totalTaskNum", key: "totalTaskNum", ellipsis: true, align: "center",}, - {title: "必修总数", dataIndex: "requiredTaskNum", key: "requiredTaskNum", ellipsis: true, align: "center",}, - {title: "完成总任务数", dataIndex: "completedTaskNum", key: "completedTaskNum", ellipsis: true, align: "center",}, - {title: "总任务完成率", dataIndex: "learnCompletedRate", key: "learnCompletedRate", ellipsis: true, align: "center", - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + {title: "任务总数", dataIndex: "totalTaskNum", key: "totalTaskNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "必修总数", dataIndex: "requiredTaskNum", key: "requiredTaskNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "完成总任务数", dataIndex: "completedTaskNum", key: "completedTaskNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "总任务完成率", dataIndex: "learnCompletedRate", key: "learnCompletedRate", ellipsis: true, align: "center", + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} + }, + {title: "完成必修任务数", dataIndex: "requiredTaskCompletedNum", key: "requiredTaskCompletedNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} }, - {title: "完成必修任务数", dataIndex: "requiredTaskCompletedNum", key: "requiredTaskCompletedNum", ellipsis: true, align: "center",}, {title: "必修任务完成率", dataIndex: "requiredTaskCompletedRate", key: "requiredTaskCompletedRate", ellipsis: true, align: "center", - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "总完成状态", dataIndex: "completedStatus", key: "completedStatus", ellipsis: true, align: "center", customRender: (text) => {return text.value && text.value == 1?'已完成':"未完成";} diff --git a/src/views/report/Overvoewnew.vue b/src/views/report/Overvoewnew.vue index 5a204993..d9207fb6 100644 --- a/src/views/report/Overvoewnew.vue +++ b/src/views/report/Overvoewnew.vue @@ -172,38 +172,38 @@ @@ -956,9 +956,9 @@ export default { key: "totalStudentNum", width: 120, align: "center", - scopedSlots: { customRender: "action" }, colSortNo: 9, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "学习人数", @@ -969,6 +969,7 @@ export default { align: "center", colSortNo: 10, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "参与率", @@ -992,6 +993,7 @@ export default { align: "center", colSortNo: 12, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { @@ -1016,6 +1018,7 @@ export default { align: "center", colSortNo: 14, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "任务总数", @@ -1026,6 +1029,7 @@ export default { align: "center", colSortNo: 15, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "必修任务数", @@ -1036,6 +1040,7 @@ export default { align: "center", colSortNo: 16, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "必修任务完成人数", @@ -1046,6 +1051,7 @@ export default { align: "center", colSortNo: 17, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "必修任务完成人率", @@ -1123,7 +1129,7 @@ export default { visible: true, }, { - title: "所属模式", + title: "所在模块", dataIndex: "testType", ellipsis: true, width: 120, @@ -1134,6 +1140,18 @@ export default { colSortNo: 3, visible: true, }, + { + title: "状态", + dataIndex: "published", + ellipsis: true, + width: 120, + align: "center", + customRender: (text) => { + return text.value && text.value == 1?'已发布':"未发布";; + }, + colSortNo: 4, + visible: true, + }, { title: "题目数量", dataIndex: "questionCount", @@ -1142,8 +1160,9 @@ export default { align: "center", colSortNo: 1, visible: true, - colSortNo: 4, + colSortNo: 5, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { title: "总分", @@ -1151,8 +1170,9 @@ export default { ellipsis: true, width: 120, align: "center", - colSortNo: 5, + colSortNo: 6, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { title: "及格线", @@ -1160,8 +1180,9 @@ export default { ellipsis: true, width: 120, align: "center", - colSortNo: 6, + colSortNo: 7, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { @@ -1170,8 +1191,9 @@ export default { ellipsis: true, width: 120, align: "center", - colSortNo: 7, + colSortNo: 8, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { title: "应考人数", @@ -1183,7 +1205,7 @@ export default { customRender: (text) => { return formatValNull(text.value); }, - colSortNo: 8, + colSortNo: 9, visible: true, }, { @@ -1195,7 +1217,7 @@ export default { customRender: (text) => { return formatValNull(text.value); }, - colSortNo: 9, + colSortNo: 10, visible: true, }, { @@ -1207,7 +1229,7 @@ export default { customRender: (text) => { return formatTextRate(text.value); }, - colSortNo: 10, + colSortNo: 11, visible: true, }, { @@ -1220,7 +1242,7 @@ export default { customRender: (text) => { return formatValNull(text.value); }, - colSortNo: 11, + colSortNo: 12, visible: true, }, { @@ -1234,7 +1256,7 @@ export default { customRender: (text) => { return formatTextRate(text.value); }, - colSortNo: 12, + colSortNo: 13, visible: true, }, { @@ -1247,7 +1269,7 @@ export default { customRender: (text) => { return formatValNull(text.value); }, - colSortNo: 13, + colSortNo: 14, visible: true, }, { @@ -1257,10 +1279,8 @@ export default { key: "medianScore", width: 120, align: "center", - customRender: (text) => { - return formatValNull(text.value); - }, - colSortNo: 14, + customRender: (text) => {return formatValNull(text.value);}, + colSortNo: 15, visible: true, }, { @@ -1273,7 +1293,7 @@ export default { customRender: (text) => { return formatValNull(text.value); }, - colSortNo: 15, + colSortNo: 16, visible: true, }, { @@ -1286,7 +1306,7 @@ export default { customRender: (text) => { return formatDate(text.value); }, - colSortNo: 16, + colSortNo: 17, visible: true, }, @@ -1301,7 +1321,7 @@ export default { customRender: (text) => { return formatDate(text.value); }, - colSortNo: 17, + colSortNo: 18, visible: true, }, { @@ -1310,7 +1330,7 @@ export default { ellipsis: true, width: 120, align: "center", - colSortNo: 18, + colSortNo: 19, visible: true, }, ]; @@ -1356,6 +1376,7 @@ export default { sorter: true, colSortNo: 4, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { title: "必修任务数", @@ -1365,6 +1386,7 @@ export default { width: 120, colSortNo: 5, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { title: "选修任务数", @@ -1374,9 +1396,10 @@ export default { width: 120, colSortNo: 6, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { - title: "学习总人数", + title: "报名人数", dataIndex: "totalLearnNum", key:'totalLearnNum', ellipsis: true, @@ -1385,6 +1408,7 @@ export default { sorter: true, colSortNo: 7, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { title: "完成人数", @@ -1394,6 +1418,7 @@ export default { width: 120, colSortNo: 8, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { title: "任务总数完成率", @@ -1546,6 +1571,7 @@ export default { sorter: true, colSortNo: 7, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { title: "收藏数", @@ -1556,6 +1582,7 @@ export default { sorter: true, colSortNo: 8, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { title: "点赞数", @@ -1566,6 +1593,7 @@ export default { sorter: true, colSortNo: 9, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { @@ -1577,6 +1605,7 @@ export default { sorter: true, colSortNo: 10, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { title: "是否推荐", @@ -1598,6 +1627,7 @@ export default { align: "center", colSortNo: 12, visible: true, + customRender: (text) => {return formatValNull(text.value);}, }, { @@ -1619,6 +1649,9 @@ export default { width: 120, colSortNo: 14, visible: true, + customRender: (text) => { + return formatTextRate(text.value); + }, }, ]; } else if (index === 3) { @@ -1687,6 +1720,7 @@ export default { align: "center", colSortNo: 6, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "总浏览人数", @@ -1697,9 +1731,10 @@ export default { align: "center", colSortNo: 7, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { - title: "学习人数", + title: "报名人数", dataIndex: "studyCount", ellipsis: true, key: "studyCount", @@ -1707,6 +1742,7 @@ export default { align: "center", colSortNo: 8, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "总学习时长", @@ -1717,6 +1753,7 @@ export default { align: "center", colSortNo: 9, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "整体完成人数", @@ -1727,6 +1764,7 @@ export default { align: "center", colSortNo: 10, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "整体完成率", @@ -1763,6 +1801,7 @@ export default { align: "center", colSortNo: 13, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "平均成绩", @@ -1773,6 +1812,7 @@ export default { align: "center", colSortNo: 14, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "评论数", @@ -1783,6 +1823,7 @@ export default { align: "center", colSortNo: 15, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "创建时间", @@ -1878,6 +1919,7 @@ export default { align: "center", colSortNo: 6, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "面授地点", @@ -1941,6 +1983,7 @@ export default { sorter: true, colSortNo: 11, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "参评人数", @@ -2115,6 +2158,7 @@ export default { align: "center", colSortNo: 6, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "关卡完成率", @@ -2130,7 +2174,7 @@ export default { visible: true, }, { - title: "总人数", + title: "报名人数", dataIndex: "studentNum", ellipsis: true, key: "studentNum", @@ -2138,6 +2182,7 @@ export default { align: "center", colSortNo: 8, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "学习人数", @@ -2148,6 +2193,7 @@ export default { align: "center", colSortNo: 9, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "学习参与率", @@ -2171,6 +2217,7 @@ export default { align: "center", colSortNo: 11, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "完成人员率", @@ -2194,6 +2241,7 @@ export default { align: "center", colSortNo: 13, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "总任务完成率", @@ -2217,6 +2265,7 @@ export default { align: "center", colSortNo: 15, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "在线课程完成率", @@ -2240,6 +2289,7 @@ export default { align: "center", colSortNo: 17, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "面授完成率", @@ -2263,6 +2313,7 @@ export default { width: 120, colSortNo: 19, visible: true, + customRender: (text) => {return !text.value?'0':text.value;}, }, { title: "考试及格率", @@ -2363,14 +2414,14 @@ export default { //后续抽到 工具类中 function formatTextRate(value) { if (!value && value != 0) { - return "-"; + return "0%"; } return value + "%"; } function formatValNull(val) { if (!val && val !== 0) { - return "-"; + return "0"; } return val; } diff --git a/src/views/report/OvervoewnewModal.vue b/src/views/report/OvervoewnewModal.vue index 43bb2abb..e94456c3 100644 --- a/src/views/report/OvervoewnewModal.vue +++ b/src/views/report/OvervoewnewModal.vue @@ -95,24 +95,24 @@ modelColumns.value = [ {title: "工号", dataIndex: "studentUserNo",key: "studentUserNo",width: 120,ellipsis: true,}, {title: "姓名",dataIndex: "studentName",key: "studentName",width: 120,ellipsis: true,}, - {title: "率属组织",dataIndex: "studentOrgName",key: "studentOrgName",width: 120,ellipsis: true,}, + {title: "所属组织",dataIndex: "studentOrgName",key: "studentOrgName",width: 120,ellipsis: true,}, {title: "所在岗位",dataIndex: "studentJobName",key: "studentJobName",width: 120,ellipsis: true,}, {title: "所在band",dataIndex: "bandInfo",key: "bandInfo",width: 120,ellipsis: true,}, {title: "完成进度",dataIndex: "completionProgress",key: "completionProgress",width: 120,ellipsis: true,}, {title: "总任务完成率",dataIndex: "taskCompletedRate",key: "taskCompletedRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "必修完成率",dataIndex: "requiredTaskCompletedRate",key: "requiredTaskCompletedRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "课程完成率",dataIndex: "courseCompletedRate",key: "courseCompletedRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "考试通过率",dataIndex: "examPassRate",key: "examPassRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "作业完成率",dataIndex: "homeworkCompletedRate",key: "homeworkCompletedRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "最近学习时间",dataIndex: "latestStudyTime",key: "latestStudyTime",width: 120,ellipsis: true,}, ] @@ -121,14 +121,16 @@ modelColumns.value = [ {title: "阶段名称",dataIndex: "stageName",key: "stageName",width: 120,ellipsis: true,}, {title: "任务名称",dataIndex: "taskName",key: "taskName",width: 120,ellipsis: true,}, - {title: "是否必须",dataIndex: "isRequestTask",key: "isRequestTask",width: 120,ellipsis: true,}, + {title: "是否必修",dataIndex: "isRequestTask",key: "isRequestTask",width: 120,ellipsis: true, + customRender: (text) => {return text.value && text.value == 1?'是':"否";} + }, {title: "开始时间",dataIndex: "startTime",key: "startTime",width: 120,ellipsis: true,sorter: true,}, {title: "学习人数",dataIndex: "totalParticipantNum",key: "totalParticipantNum",width: 120,ellipsis: true, sorter: true,}, {title: "完成人数",dataIndex: "completedParticipantNum",key: "completedParticipantNum",width: 120,ellipsis: true,sorter: true,}, {title: "进行中人数",dataIndex: "inProgressParticipantNum",key: "inProgressParticipantNum",width: 120,ellipsis: true,sorter: true,}, {title: "未开始人数",dataIndex: "notStartedParticipantNum",key: "notStartedParticipantNum",width: 120,ellipsis: true,sorter: true,}, {title: "任务完成率",dataIndex: "taskCompletedRate",key: "taskCompletedRate",width: 120,ellipsis: true,sorter: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} } ] } @@ -137,17 +139,23 @@ modelTitle.value = '关卡' modelColumns.value = [ {title: "关卡名称", dataIndex: "chapterName",key: "chapterName",width: 120,ellipsis: true,}, - {title: "关卡任务总数",dataIndex: "chapterTaskNum",key: "chapterTaskNum",width: 120,ellipsis: true,}, - {title: "必修任务数",dataIndex: "requireTaskNum",key: "requireTaskNum",width: 120,ellipsis: true,}, - {title: "选修任务数",dataIndex: "electiveTaskNum",key: "electiveTaskNum",width: 120,ellipsis: true,}, + {title: "关卡任务总数",dataIndex: "chapterTaskNum",key: "chapterTaskNum",width: 120,ellipsis: true, + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "必修任务数",dataIndex: "requireTaskNum",key: "requireTaskNum",width: 120,ellipsis: true, + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "选修任务数",dataIndex: "electiveTaskNum",key: "electiveTaskNum",width: 120,ellipsis: true, + customRender: (text) => {return !text.value?'0':text.value;} + }, {title: "课程完成率",dataIndex: "courseCompletedRate",key: "courseCompletedRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "考试通过率",dataIndex: "examPassRate",key: "examPassRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "作业完成率",dataIndex: "homeworkCompletedRate",key: "homeworkCompletedRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, ] }else if(props.secondReportType=='task'){ @@ -159,17 +167,25 @@ customRender: (text) => {return text.value && text.value == 1?'是':"否";} }, {title: "开始时间",dataIndex: "startTime",key: "startTime",width: 120,ellipsis: true, sorter: true,}, - {title: "学习人数",dataIndex: "totalParticipantNum",key: "totalParticipantNum",width: 120,ellipsis: true,sorter: true,}, - {title: "完成人数",dataIndex: "completedParticipantNum",key: "completedParticipantNum",width: 120,ellipsis: true,sorter: true,}, - {title: "进行中人数",dataIndex: "inProgressParticipantNum",key: "inProgressParticipantNum",width: 120,ellipsis: true,sorter: true,}, - {title: "未开始人数",dataIndex: "notStartedParticipantNum",key: "notStartedParticipantNum",width: 120,ellipsis: true,sorter: true,} + {title: "学习人数",dataIndex: "totalParticipantNum",key: "totalParticipantNum",width: 120,ellipsis: true,sorter: true, + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "完成人数",dataIndex: "completedParticipantNum",key: "completedParticipantNum",width: 120,ellipsis: true,sorter: true, + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "进行中人数",dataIndex: "inProgressParticipantNum",key: "inProgressParticipantNum",width: 120,ellipsis: true,sorter: true, + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "未开始人数",dataIndex: "notStartedParticipantNum",key: "notStartedParticipantNum",width: 120,ellipsis: true,sorter: true, + customRender: (text) => {return !text.value?'0':text.value;} + } ] }else if(props.secondReportType=='student'){ modelTitle.value = '人员' modelColumns.value = [ {title: "工号", dataIndex: "studentUserNo",key: "studentUserNo",width: 120,ellipsis: true,}, {title: "姓名",dataIndex: "studentName",key: "studentName",width: 120,ellipsis: true,}, - {title: "率属组织",dataIndex: "studentOrgName",key: "studentOrgName",width: 120,ellipsis: true,}, + {title: "所属组织",dataIndex: "studentOrgName",key: "studentOrgName",width: 120,ellipsis: true,}, {title: "所在岗位",dataIndex: "studentJobName",key: "studentJobName",width: 120,ellipsis: true,}, {title: "所在band",dataIndex: "bandInfo",key: "bandInfo",width: 120,ellipsis: true,}, {title: "报名方式",dataIndex: "signUpType",key: "signUpType",width: 120,ellipsis: true, @@ -190,20 +206,23 @@ } }, {title: "当前关卡",dataIndex: "currentChapter",key: "currentChapter",width: 120,ellipsis: true,}, + {title: "关卡进度",dataIndex: "chapterProgress",key: "chapterProgress",width: 120,ellipsis: true, + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} + }, {title: "总任务完成率",dataIndex: "taskCompletedRate",key: "taskCompletedRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "必修任务完成率",dataIndex: "requiredTaskCompletedRate",key: "requiredTaskCompletedRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "课程完成率",dataIndex: "courseCompletedRate",key: "courseCompletedRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "考试通过率",dataIndex: "examPassRate",key: "examPassRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "作业完成率",dataIndex: "homeworkCompletedRate",key: "homeworkCompletedRate",width: 120,ellipsis: true, - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "最近学习时间",dataIndex: "latestStudyTime",key: "latestStudyTime",width: 120,ellipsis: true,}, ] @@ -212,18 +231,26 @@ if(props.secondReportType=='teacher'){ modelTitle.value = '讲师' modelColumns.value = [ - {title: "开课次数", dataIndex: "totalCourseNum", key: "totalCourseNum", ellipsis: true, align: "center",}, + {title: "开课次数", dataIndex: "totalCourseNum", key: "totalCourseNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, {title: "开课总时长", dataIndex: "totalDuration", key: "totalDuration", ellipsis: true, align: "center",}, - {title: "授课总人数", dataIndex: "studentNum", key: "studentNum", ellipsis: true, align: "center",}, - {title: "场均人数", dataIndex: "avgStudentNum", key: "avgStudentNum", ellipsis: true, align: "center",}, - {title: "平均评分", dataIndex: "avgScore", key: "avgScore", ellipsis: true, align: "center",}, + {title: "授课总人数", dataIndex: "studentNum", key: "studentNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "场均人数", dataIndex: "avgStudentNum", key: "avgStudentNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "平均评分", dataIndex: "avgScore", key: "avgScore", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, ] }else if(props.secondReportType=='student'){ modelTitle.value = '人员' modelColumns.value = [ {title: "工号", dataIndex: "studentUserNo",key: "studentUserNo",width: 120,ellipsis: true,}, {title: "姓名",dataIndex: "studentName",key: "studentName",width: 120,ellipsis: true,}, - {title: "率属组织",dataIndex: "studentOrgName",key: "studentOrgName",width: 120,ellipsis: true,}, + {title: "所属组织",dataIndex: "studentOrgName",key: "studentOrgName",width: 120,ellipsis: true,}, {title: "所在岗位",dataIndex: "studentJobName",key: "studentJobName",width: 120,ellipsis: true,}, {title: "所在band",dataIndex: "bandInfo",key: "bandInfo",width: 120,ellipsis: true,}, {title: "报名时间",dataIndex: "signUpTime",key: "signUpTime",width: 120,ellipsis: true,}, @@ -260,13 +287,21 @@ {title: "课件名称", dataIndex: "contentName", key: "contentName", ellipsis: true, align: "center",}, {title: "归属组织", dataIndex: "sourceBelongFullName", key: "sourceBelongFullName", ellipsis: true, align: "center",}, {title: "课件时长", dataIndex: "duration", key: "duration", ellipsis: true, align: "center",}, - {title: "学习人数", dataIndex: "studyNum", key: "studyNum", ellipsis: true, align: "center",}, - {title: "完成人数", dataIndex: "completedNum", key: "completedNum", ellipsis: true, align: "center",}, - {title: "整体完成率", dataIndex: "completedRate", key: "completedRate", ellipsis: true, align: "center", - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + {title: "学习人数", dataIndex: "studyNum", key: "studyNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "完成人数", dataIndex: "completedNum", key: "completedNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "整体完成率", dataIndex: "completedRate", key: "completedRate", ellipsis: true, align: "center", + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} + }, + {title: "学习总时长", dataIndex: "studyDuration", key: "studyDuration", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "人均学习时长", dataIndex: "studyDurationAvg", key: "studyDurationAvg", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} }, - {title: "学习总时长", dataIndex: "studyDuration", key: "studyDuration", ellipsis: true, align: "center",}, - {title: "人均学习时长", dataIndex: "studyDurationAvg", key: "studyDurationAvg", ellipsis: true, align: "center",}, {title: "创建时间", dataIndex: "createTime", key: "createTime", ellipsis: true, align: "center",}, {title: "上传人", dataIndex: "uploadUserName", key: "uploadUserName", ellipsis: true, align: "center",}, ] @@ -275,7 +310,7 @@ modelColumns.value = [ {title: "工号", dataIndex: "studentUserNo",key: "studentUserNo",width: 120,ellipsis: true,}, {title: "姓名",dataIndex: "studentName",key: "studentName",width: 120,ellipsis: true,}, - {title: "率属组织",dataIndex: "studentOrgName",key: "studentOrgName",width: 120,ellipsis: true,}, + {title: "所属组织",dataIndex: "studentOrgName",key: "studentOrgName",width: 120,ellipsis: true,}, {title: "所在岗位",dataIndex: "studentJobName",key: "studentJobName",width: 120,ellipsis: true,}, {title: "所在band",dataIndex: "bandInfo",key: "bandInfo",width: 120,ellipsis: true,}, {title: "学习时长",dataIndex: "studyDuration",key: "studyDuration",width: 120,ellipsis: true,}, @@ -310,7 +345,7 @@ modelColumns.value = [ {title: "工号", dataIndex: "studentUserNo",key: "studentUserNo",width: 120,ellipsis: true,}, {title: "姓名",dataIndex: "studentName",key: "studentName",width: 120,ellipsis: true,}, - {title: "率属组织",dataIndex: "studentOrgName",key: "studentOrgName",width: 120,ellipsis: true,}, + {title: "所属组织",dataIndex: "studentOrgName",key: "studentOrgName",width: 120,ellipsis: true,}, {title: "所在岗位",dataIndex: "studentJobName",key: "studentJobName",width: 120,ellipsis: true,}, {title: "所在band",dataIndex: "bandInfo",key: "bandInfo",width: 120,ellipsis: true,}, {title: "考试状态",dataIndex: "status",key: "status",width: 120,ellipsis: true, @@ -332,8 +367,12 @@ }, {title: "开考时间",dataIndex: "startTime",key: "startTime",width: 120,ellipsis: true,}, {title: "交卷时间",dataIndex: "endTime",key: "endTime",width: 120,ellipsis: true,}, - {title: "答题时长",dataIndex: "duration",key: "duration",width: 120,ellipsis: true,}, - {title: "成绩",dataIndex: "score",key: "score",width: 120,ellipsis: true,}, + {title: "答题时长",dataIndex: "duration",key: "duration",width: 120,ellipsis: true, + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "成绩",dataIndex: "score",key: "score",width: 120,ellipsis: true, + customRender: (text) => {return !text.value?'0':text.value;} + }, ] } }else if(props.reportType=='case'){ @@ -344,11 +383,21 @@ {title: "归属组织", dataIndex: "orgName", key: "orgName", ellipsis: true, align: "center",}, {title: "专业分类", dataIndex: "caseSpecialtySequence", key: "caseSpecialtySequence", ellipsis: true, align: "center",}, {title: "密级", dataIndex: "confidentialityLevel", key: "confidentialityLevel", ellipsis: true, align: "center",}, - {title: "浏览量", dataIndex: "viewNum", key: "viewNum", ellipsis: true, align: "center",}, - {title: "收藏数", dataIndex: "favoriteNum", key: "favoriteNum", ellipsis: true, align: "center",}, - {title: "点赞数", dataIndex: "likeNum", key: "likeNum", ellipsis: true, align: "center",}, - {title: "评论数", dataIndex: "commentNum", key: "commentNum", ellipsis: true, align: "center",}, - {title: "推荐数", dataIndex: "recommendNum", key: "recommendNum", ellipsis: true, align: "center",}, + {title: "浏览量", dataIndex: "viewNum", key: "viewNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "收藏数", dataIndex: "favoriteNum", key: "favoriteNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "点赞数", dataIndex: "likeNum", key: "likeNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "评论数", dataIndex: "commentNum", key: "commentNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, + {title: "推荐数", dataIndex: "recommendNum", key: "recommendNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, ] } }else if(props.reportType=='professional'){ @@ -358,12 +407,14 @@ {title: "任务名称", dataIndex: "taskName", key: "taskName", ellipsis: true, align: "center",}, {title: "任务类型", dataIndex: "taskType", key: "taskType", ellipsis: true, align: "center",}, {title: "必修/选修", dataIndex: "bxxx", key: "bxxx", ellipsis: true, align: "center",}, - {title: "学习人数", dataIndex: "studyNum", key: "studyNum", ellipsis: true, align: "center",}, + {title: "学习人数", dataIndex: "studyNum", key: "studyNum", ellipsis: true, align: "center", + customRender: (text) => {return !text.value?'0':text.value;} + }, {title: "学习完成率", dataIndex: "studyCompletedRate", key: "studyCompletedRate", ellipsis: true, align: "center", - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "考试完成率", dataIndex: "examCompletedRate", key: "examCompletedRate", ellipsis: true, align: "center", - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, ] }else if(props.secondReportType=='student'){ @@ -371,17 +422,17 @@ modelColumns.value = [ {title: "工号", dataIndex: "studentUserNo",key: "studentUserNo",width: 120,ellipsis: true,}, {title: "姓名",dataIndex: "studentName",key: "studentName",width: 120,ellipsis: true,}, - {title: "率属组织",dataIndex: "studentOrgName",key: "studentOrgName",width: 120,ellipsis: true,}, + {title: "所属组织",dataIndex: "studentOrgName",key: "studentOrgName",width: 120,ellipsis: true,}, {title: "所在岗位",dataIndex: "studentJobName",key: "studentJobName",width: 120,ellipsis: true,}, {title: "所在band",dataIndex: "bandInfo",key: "bandInfo",width: 120,ellipsis: true,}, {title: "整体进度", dataIndex: "totalTaskProgress", key: "totalTaskProgress", ellipsis: true, align: "center", - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "必修进度", dataIndex: "requireTaskProgress", key: "requireTaskProgress", ellipsis: true, align: "center", - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "选修进度", dataIndex: "electiveTaskProgress", key: "electiveTaskProgress", ellipsis: true, align: "center", - customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} + customRender: (text) => {return !text.value && text.value != 0?'0%':text.value + "%";} }, {title: "完成状态", dataIndex: "completedStatus", key: "completedStatus", ellipsis: true, align: "center", customRender: (text) => {return text.value && text.value == 1?'已完成':"未完成";}