diff --git a/src/api/growthpath.js b/src/api/growthpath.js index f8cf1079..c98ba051 100644 --- a/src/api/growthpath.js +++ b/src/api/growthpath.js @@ -92,3 +92,6 @@ export const openOrCloseSortSwitch = (growthId) => http.get('/professional/task/ // 新建专业力必修 export const saveGrowth = (data) => http.post('/professional/compulsory/saveGrowth', data) + +// 催促学习 +export const batchSendMessage = (data) => http.post('/professional/urgeLearning/batchSendMessage', data) diff --git a/src/components/growthpath/GrowthOnlineManage.vue b/src/components/growthpath/GrowthOnlineManage.vue index 63c798ad..072b8d61 100644 --- a/src/components/growthpath/GrowthOnlineManage.vue +++ b/src/components/growthpath/GrowthOnlineManage.vue @@ -298,8 +298,8 @@ export default { }, { title: "Band职级", - dataIndex: "stdPositionName", - key: "stdPositionName", + dataIndex: "bandCode", + key: "bandCode", width: 60, align: "center", ellipsis: true, @@ -307,7 +307,10 @@ export default { customRender: (text) => { return (
- - + + {" "} + {text.record.bandCode ? text.record.bandCode : "-"} +
); }, @@ -433,13 +436,13 @@ export default { //催促 const godie = () => { var obj = { - courseId: props.datasource.courseId, //任务的Id + courseId: props.datasource.taskId + ? props.datasource.taskId + : props.datasource.info.id, //任务的Id courseName: props.datasource.taskName, //任务的名称 - logo: "14", //项目或径的标识 1-项目 2-路径图 3面授课 - routerTaskId: props.datasource.id, //任务的routerTaskld或projectTaskld - targetId: props.datasource.targetId, //路径图的就是routerId,项目的是projectId;根据这张图来看的话 + taskId: props.datasource.id, //项目或径的标识 1-项目 2-路径图 3面授课 taskType: props.datasource.taskType, //催促的任务的类型 - chapterId: null, //阶段或关卡Id + growthId: props.datasource.growthId, }; batchSendMessage(obj) .then((res) => { diff --git a/src/components/growthpath/StudentManage.vue b/src/components/growthpath/StudentManage.vue index 7509f960..f7e53ae1 100644 --- a/src/components/growthpath/StudentManage.vue +++ b/src/components/growthpath/StudentManage.vue @@ -46,6 +46,22 @@ + + +
+ +
+
+
-
{{ info.username }}
+
{{ info.userNickName }}
{{ info.stdPositionName }}
diff --git a/src/views/growthpath/PathManage.vue b/src/views/growthpath/PathManage.vue index 3638a362..81110587 100644 --- a/src/views/growthpath/PathManage.vue +++ b/src/views/growthpath/PathManage.vue @@ -124,7 +124,7 @@ :width="140" />
- {{ TASK_TYPE[item.taskType].name }}完成率 + {{ TASK_TYPE[item.taskType].name }}课程完成率