diff --git a/src/api/indexOvervoew.js b/src/api/indexOvervoew.js index 4deedda9..6cb70f7a 100644 --- a/src/api/indexOvervoew.js +++ b/src/api/indexOvervoew.js @@ -84,3 +84,20 @@ export const caseAuthorReportList = (obj) => http.post('/reportsnake/report/case export const professionalTaskReportList = (obj) => http.post('/reportsnake/report/professionalTaskReportList', obj) //专业力学员报告列表 export const professionalStudentReportList = (obj) => http.post('/reportsnake/report/professionalStudentReportList', obj) + +//学员报告列表 +export const studentReportList = (obj) => http.post('/reportsnake/report/studentReportList', obj) +//学员项目报告列表 +export const studentProjectReportList = (obj) => http.post('/reportsnake/report/studentProjectReportList', obj) +//学员学习路径报告列表 +export const studentRouterReportList = (obj) => http.post('/reportsnake/report/studentRouterReportList', obj) +//学员面授课报告列表 +export const studentOffCourseReportList = (obj) => http.post('/reportsnake/report/studentOffCourseReportList', obj) +//学员在线课报告列表 +export const studentOnlineReportList = (obj) => http.post('/reportsnake/report/studentOnlineReportList', obj) +//学员考试报告列表 +export const studentExamReportList = (obj) => http.post('/reportsnake/report/studentExamReportList', obj) +//学员案例报告列表 +export const studentCaseReportList = (obj) => http.post('/reportsnake/report/studentCaseReportList', obj) +//学员专业力报告列表 +export const studentProfessionalReportList = (obj) => http.post('/reportsnake/report/studentProfessionalReportList', obj) diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 4644f07b..f666a5d5 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -599,14 +599,8 @@ export default { tableSorts: state.tableSorts }); if (res) { - state.tableDataTotal = res.data.result.total; - const list = res.data.result.rows?.map((item) => { - return { - key: item.id, - ...item, - }; - }); - tableData.value = list; + state.tableDataTotal = res.data.total; + tableData.value = res.data.records || []; state.tableLoading = false; } }; @@ -666,31 +660,7 @@ export default { onMounted(() => { //getOrgList(); //state.tableLoading = true; - - tableData.value = [{ - id: '1', - studentId:'111111111', - studentUserNo: '123344', - studentName: '姓名', - studentOrgName: '机构', - studentJobName: '岗位', - bandInfo:'band', - projectCompletedNum:12, - projectCompletedRate:50, - routerCompletedNum:20, - routerCompletedRate:12, - offCourseCompletedNum:12, - offCourseCompletedRate:12, - onlineCompletedNum:12, - onlineCompletedDuration:12, - examCompletedNum:8, - examPassNum:22, - examPassRate:90, - caseNum:2, - caseViewsNum:22, - professionalCompeletedNum:22, - professionalCompletedRate:22, - }] + getTableData(); }); return { focusBand, diff --git a/src/views/report/EmployeelearningModal.vue b/src/views/report/EmployeelearningModal.vue index e0f287ea..a95a0d36 100644 --- a/src/views/report/EmployeelearningModal.vue +++ b/src/views/report/EmployeelearningModal.vue @@ -97,16 +97,6 @@ const getModelColumns = ()=>{ customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} }, ] - data.dataSource = [{ - id:'2222', - projectName:'项目名称', - sourceBelongFullName:'归属组织', - taskCount: 12, - taskCompletedNum: 10, - taskCompletedRate: 70, - bxCount: 8, - bxCompletedRate: 80, - }] }else if(props.modalType==2){ modelTitle.value = '学习路径' modelColumns.value = [ @@ -123,17 +113,6 @@ const getModelColumns = ()=>{ customRender: (text) => {return !text.value && text.value != 0?'-':text.value + "%";} }, ] - data.dataSource = [{ - id:'2222', - routerName:'路径名称', - orgFullName:'归属组织', - chapterNum: 30, - taskCount: 12, - taskCompletedNum: 10, - taskCompletedRate: 70, - taskRequiredNum: 8, - taskRequiredCompletedRate: 80, - }] }else if(props.modalType==3){ modelTitle.value = '面授' modelColumns.value = [ @@ -144,13 +123,6 @@ const getModelColumns = ()=>{ customRender: (text) => {return text.value && text.value == 1?'已结业':"未结业";} }, ] - data.dataSource = [{ - id:'2222', - offcourseName:'面授名称', - sourceBelongFullName:'归属组织', - signUpTime: '2025-03-10 10:00:00', - completedStatus: 1, - }] }else if(props.modalType==4){ modelTitle.value = '在线课程' modelColumns.value = [ @@ -163,15 +135,6 @@ const getModelColumns = ()=>{ customRender: (text) => {return text.value && text.value == 1?'已完成':"未完成";} }, ] - data.dataSource = [{ - id:'2222', - courseName:'课程名称', - sourceBelongFullName:'归属组织', - studyTime: '2025-03-10 10:00:00', - studyDuration: 30, - coursewareCount: 12, - completedStatus: 0, - }] }else if(props.modalType==5){ modelTitle.value = '考试' modelColumns.value = [ @@ -184,17 +147,6 @@ const getModelColumns = ()=>{ {title: "成绩", dataIndex: "score", key: "score", ellipsis: true, align: "center",}, {title: "部门排名", dataIndex: "deptSortNum", key: "deptSortNum", ellipsis: true, align: "center",}, ] - data.dataSource = [{ - id:'2222', - testName:'考试名称', - examTime: '2025-03-10 10:00:00', - questionCount: 100, - totalScore: 100, - passLine: 60, - takeExamTime: '2025-03-10 10:00:00', - score: 80, - deptSortNum: 20 - }] }else if(props.modalType==6){ modelTitle.value = '案例' modelColumns.value = [ @@ -212,16 +164,6 @@ const getModelColumns = ()=>{ customRender: (text) => {return text.value && text.value == 1?'是':"否";} }, ] - data.dataSource = [{ - id:'2222', - caseName:'案例名称', - authorName:'作者', - caseCreateTime: '2025-03-10 10:00:00', - viewTime: '2025-03-16 10:00:00', - isPraises: 1, - isComments: 0, - isFavorites: 1, - }] }else if(props.modalType==7){ modelTitle.value = '专业力' modelColumns.value = [ @@ -242,31 +184,42 @@ const getModelColumns = ()=>{ customRender: (text) => {return text.value && text.value == 1?'已完成':"未完成";} }, ] - data.dataSource = [{ - id:'2222', - stdPositionName:'岗位名称', - qualsLevelName:'资格等级', - bandInfo:'band', - totalTaskNum: 20, - requiredTaskNum: 16, - completedTaskNum: 12, - learnCompletedRate: 70, - requiredTaskCompletedNum: 10, - requiredTaskCompletedRate: 70, - completedStatus: 0, - }] } + getTableData() } const getTableData = async () => { data.tableLoading = true; - const res = await api.boeuStudyDataPageList({ - page: data.pageNo, - size: data.pageSize, - studentId: studentId - }); - data.dataSource = res.data.result.rows || []; - state.tableLoading = false; + if(props.modalType==1){ + const res = await api.studentProjectReportList({page: data.pageNo,size: data.pageSize,studentId: props.studentId}); + data.dataSource = res.data.records || []; + data.total = res.data.total; + }else if(props.modalType==2){ + const res = await api.studentRouterReportList({page: data.pageNo,size: data.pageSize,studentId: props.studentId}); + data.dataSource = res.data.records || []; + data.total = res.data.total; + }else if(props.modalType==3){ + const res = await api.studentOffCourseReportList({page: data.pageNo,size: data.pageSize,studentId: props.studentId}); + data.dataSource = res.data.records || []; + data.total = res.data.total; + }else if(props.modalType==4){ + const res = await api.studentOnlineReportList({page: data.pageNo,size: data.pageSize,studentId: props.studentId}); + data.dataSource = res.data.records || []; + data.total = res.data.total; + }else if(props.modalType==5){ + const res = await api.studentExamReportList({page: data.pageNo,size: data.pageSize,studentId: props.studentId}); + data.dataSource = res.data.records || []; + data.total = res.data.total; + }else if(props.modalType==6){ + const res = await api.studentCaseReportList({page: data.pageNo,size: data.pageSize,studentId: props.studentId}); + data.dataSource = res.data.records || []; + data.total = res.data.total; + }else if(props.modalType==7){ + const res = await api.studentProfessionalReportList({page: data.pageNo,size: data.pageSize,studentId: props.studentId}); + data.dataSource = res.data.records || []; + data.total = res.data.total; + } + data.tableLoading = false; }; const emit = defineEmits({})