diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 05890dc5..b9ceb354 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -607,7 +607,7 @@ export default { size: state.pageSize, userNo: state.userNo, name: state.name, - orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, + //orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, bandCode: state.valueBand, jobName: state.studentJobName, tableSorted: state.tableSorts @@ -644,15 +644,18 @@ export default { if(!fields?.length){ return message.warning("请至少选择一个字段进行导出"); } + let studentReportReq = { + userNo: state.userNo, + name: state.name, + orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, + bandCode: state.valueBand, + jobName: state.studentJobName, + } axios({ method: "post", url: "/reportsnake/export/report", data: { - userNo: state.userNo, - name: state.name, - orgId: state.orgId, - bandCode: state.valueBand, - jobName: state.studentJobName, + studentReportReq: studentReportReq, fields: fields, type: 20 }, diff --git a/src/views/report/Overvoewnew.vue b/src/views/report/Overvoewnew.vue index e9974192..34b38765 100644 --- a/src/views/report/Overvoewnew.vue +++ b/src/views/report/Overvoewnew.vue @@ -713,7 +713,22 @@ export default { if(!fields?.length){ return message.warning("请至少选择一个字段进行导出"); } - fetchExportReport({type: state.currentTab,fields:fields}); + let query = getQueryParams(); + if (state.currentTab === 0) { + fetchExportReport({type: state.currentTab,fields:fields,projectReportReq:query}); + }else if(state.currentTab === 1){ + fetchExportReport({type: state.currentTab,fields:fields,routerReportReq:query}); + }else if(state.currentTab === 2){ + fetchExportReport({type: state.currentTab,fields:fields,faceReportReq:query}); + }else if(state.currentTab === 3){ + fetchExportReport({type: state.currentTab,fields:fields,courseReportReq:query}); + }else if(state.currentTab === 4){ + fetchExportReport({type: state.currentTab,fields:fields,examReportReq:query}); + }else if(state.currentTab === 5){ + fetchExportReport({type: state.currentTab,fields:fields,caseReportReq:query}); + }else if(state.currentTab === 6){ + fetchExportReport({type: state.currentTab,fields:fields,professionalReportReq:query}); + } }; // table选中 const onSelectChange = (selectedRowKeys) => { @@ -2449,6 +2464,102 @@ export default { return recursiveSearch(data, value, ''); } + function getQueryParams(){ + if (state.currentTab === 4) { + //考试列表 + return { + createName: state.creator, + startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null, + endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null, + orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, + testName: state.name, + page: state.pageNo, + size: state.pageSize, + orgPath: state.orgPath, + tableSorts: state.tableSorts, + }; + } else if (state.currentTab === 5) { + //案例列表 + return { + createName: state.creator, + startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null, + endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null, + orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, + caseName: state.name, + page: state.pageNo, + size: state.pageSize, + orgPath: state.orgPath, + tableSorted: state.tableSorts + }; + } else if (state.currentTab === 6) { + //专业力 + return { + startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null, + endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null, + orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, + page: state.pageNo, + size: state.pageSize, + orgPath: state.orgPath, + stdPosition: state.stdPosition, + qualsLevelCode: state.qualsLevelCode, + tableSorts: state.tableSorts + }; + } else if (state.currentTab === 3) { + return { + page: state.pageNo, + size: state.pageSize, + name: state.name, + orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, + createName: state.creator, + startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null, + endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null, + orgPath: state.orgPath, + category: findPathByValue(sysTypeOptions, state.categoryTypeId), + tableSorts: state.tableSorts + }; + } else if (state.currentTab === 2) { + return { + page: state.pageNo, + size: state.pageSize, + offcourseName: state.name, + teacher: state.teacherName, + orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, + createName: state.creator, + startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null, + endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null, + orgPath: state.orgPath, + tableSorts: state.tableSorts + }; + } else if (state.currentTab === 1) { + return { + page: state.pageNo, + size: state.pageSize, + routerName: state.name, + orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, + createName: state.creator, + startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null, + endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null, + orgPath: state.orgPath, + status: state.status, + tableSorts: state.tableSorts + }; + } else if (state.currentTab === 0) { + return { + page: state.pageNo, + size: state.pageSize, + orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, + createName: state.creator, + projectName: state.name, + mangerName: state.mangerName, + startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null, + endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null, + orgPath: state.orgPath, + status: state.status && (state.status == 1 ? "进行中" : "已结束"), + tableSorts: state.tableSorts + }; + } + } + const loadEcharts = ()=>{ // 初始化漏斗图 myFunnelChart = echarts.init(funnelChart.value);