diff --git a/src/api/growthpath.js b/src/api/growthpath.js index 9a44c166..58c80026 100644 --- a/src/api/growthpath.js +++ b/src/api/growthpath.js @@ -78,6 +78,8 @@ export const exportStudentTaskPage = (obj) => http.post('/professional/studentTa // 任务管理概览 export const taskInformation = (growthId) => http.get('/professional/managementOverview/taskInformation/' + growthId) +// 任务管理完成统计概览 +export const taskCompletionRate = (growthId) => http.get('/professional/managementOverview/taskCompletionRate/' + growthId) diff --git a/src/components/growthpath/StudentManage.vue b/src/components/growthpath/StudentManage.vue index 741d8b4a..330e6e40 100644 --- a/src/components/growthpath/StudentManage.vue +++ b/src/components/growthpath/StudentManage.vue @@ -437,19 +437,19 @@ const tablecolumns = ref([ }, { title: "完成状态", - dataIndex: "finishStatus", - key: "finishStatus", + dataIndex: "completionStatus", + key: "completionStatus", width: 100, align: "center", className: "h", ellipsis: true, - customRender: ({ record: { finishStatus } }) => + customRender: ({ record: { completionStatus } }) => ({ null: "未开始", 0: "未开始", 1: "已完成", 2: "进行中", - }[finishStatus] || "未开始"), + }[completionStatus] || "未开始"), }, { title: "操作", @@ -632,6 +632,8 @@ function submitCall(selectList) { tableData.value.loading = false; message.success("添加成功"); getStuList(); + }).catch(err =>{ + tableData.value.loading = false; }); } diff --git a/src/views/growthpath/PathManage.vue b/src/views/growthpath/PathManage.vue index a365672b..33fe15ff 100644 --- a/src/views/growthpath/PathManage.vue +++ b/src/views/growthpath/PathManage.vue @@ -95,7 +95,7 @@
{{ overviewData?.learnNum || 0 }}
-
学习人数
+
未完成人数
@@ -126,90 +126,75 @@
任务信息
-
+ +
-
课程完成率
-
-
- -
考试通过率
-
-
- -
作业完成率
+
+ {{ TASK_TYPE[item.taskType].name }}完成率 +
+
- 任务总完成率{{ overviewData?.completeTaskCnt }} + 任务总完成率 +
-
- 必修任务完成率{{ overviewData?.completeTaskCnt }} + 必修任务完成率 +
-
- 选修任务完成率{{ overviewData?.completeTaskCnt }} + 选修任务完成率 +
-
@@ -340,31 +325,19 @@
- {{ element.finishTaskStudentNum || 0 }}/{{ - element.taskStudentNum || 0 + {{ element.completeNum || 0 }}/{{ + element.totalNum || 0 }}人
{{ - parseInt( - (element.finishTaskStudentNum / - element.taskStudentNum) * - 100 - ) || 0 - }}%{{ parseInt(element.progress * 100) || 0 }}%
@@ -574,6 +547,7 @@ import { saveSuperiorTask, delSuperiorTask, taskInformation, + taskCompletionRate, } from "@/api/growthpath"; export default { name: "pathManage", @@ -619,6 +593,7 @@ export default { listTaskData: [], overviewData: {}, overviewData2: {}, + overviewData3: {}, TASK_TYPE: TASK_TYPE, // 课程类型 1必修 2选修 courseType: "1", @@ -698,9 +673,16 @@ export default { }; const changeTabs = (e) => { if (e == 3) { + // 学员 state.tabFlag = true; - } else { + } else if (e == 1) { + // 概览 state.tabFlag = false; + getOverviewList(); + } else { + // 任务 + state.tabFlag = false; + getListTask(); } }; const showStudent = (record) => { @@ -842,6 +824,13 @@ export default { message.error(res.msg); } }); + taskCompletionRate(state.routerId).then((res) => { + if (res.data.code == 200) { + state.overviewData3 = res.data.data; + } else { + message.error(res.msg); + } + }); }; const totasks = () => { router.push({