diff --git a/src/api/growthpath.js b/src/api/growthpath.js index c6abd278..919b6d77 100644 --- a/src/api/growthpath.js +++ b/src/api/growthpath.js @@ -80,4 +80,8 @@ export const taskInformation = (growthId) => http.get('/professional/managementO // 任务管理完成统计概览 export const taskCompletionRate = (growthId) => http.get('/professional/managementOverview/taskCompletionRate/' + growthId) +// 运营数据概览 +export const getStudyStatisticsList = (data) => http.post('/professional/statics/getStudyStatisticsList',) +// 专业力列表 +export const boeuGrowthPlatePageList = (obj) => http.post('/boeu/growth/pageList', obj) \ No newline at end of file diff --git a/src/api/indexOvervoew.js b/src/api/indexOvervoew.js index 8eafa8a5..4230c132 100644 --- a/src/api/indexOvervoew.js +++ b/src/api/indexOvervoew.js @@ -29,3 +29,7 @@ export const boeuAllTotal = (obj) => http.get('/boeu/all/total', obj) export const boeuRouterPlatePageList = (obj) => http.post('/boeu/routerPlate/pageList', obj) // 案例列表 export const boeuCasePlatePageList = (obj) => http.post('/boeu/case/pageList', obj) + + +// 专业力列表 +export const boeuGrowthPlatePageList = (obj) => http.post('/boeu/growth/pageList', obj) \ No newline at end of file diff --git a/src/views/growthpath/EditingTasks.vue b/src/views/growthpath/EditingTasks.vue index fda099bf..73cf452d 100644 --- a/src/views/growthpath/EditingTasks.vue +++ b/src/views/growthpath/EditingTasks.vue @@ -366,10 +366,10 @@ const getBasicInfoData = () => { // 发布 const published = (element) => { - if(basicData.value.isPublished){ - message.warning('该专业力必修已发布，不可发布学习任务') - return - } + // if(basicData.value.isPublished){ + // message.warning('该专业力必修已发布，不可发布学习任务') + // return + // } dialog({ content: "确定要发布该任务吗?", ok: () => { @@ -382,10 +382,10 @@ const published = (element) => { }; // 撤回 const withdraw = (element) => { - if(basicData.value.isPublished){ - message.warning('该专业力必修已发布，不可撤回学习任务') - return - } + // if(basicData.value.isPublished){ + // message.warning('该专业力必修已发布，不可撤回学习任务') + // return + // } dialog({ content: "确定要撤回该任务吗?", ok: () => { diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 9ed6d86d..63d25a5e 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -363,6 +363,14 @@ export default { width: 120, align: "center", }, + { + title: "专业力学习", + dataIndex: "growthStudy", + ellipsis: true, + key: "growthStudy", + width: 120, + align: "center", + }, { title: "学习时长", dataIndex: "learningDuration", diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue index 30ab9171..aedf7211 100644 --- a/src/views/report/Operational.vue +++ b/src/views/report/Operational.vue @@ -106,6 +106,10 @@ label: '学习路径图', value: 6, }, + { + label: '专业力必修', + value: 7, + }, ]" > @@ -322,6 +326,7 @@ import * as api from "../../api/indexProject"; import dayjs from "dayjs"; import axios from "axios"; import Cookies from "vue-cookies"; +import { getStudyStatisticsList } from "@/api/growthpath.js" import downLoad from "../../utils/downLoad"; import { message } from "ant-design-vue"; export default { @@ -770,12 +775,24 @@ export default { const monthEnd = dayjs(state.towParmasn.time[1]) .endOf("month") .format("YYYY-MM-DD 23:59:59"); - const res = await api.boeuStudyDataGetStudyStaisticsList({ - beginTime: dayjs(state.towParmasn.time[0]).format("YYYY-MM-01 00:00:01"), - endTime: monthEnd, - dateType: state.towParmasn.dateType, - type: state.towParmasn.type, - }); + let res = null + if(state.towParmasn.type == 7){ + // 专业力必修数据 + res = await getStudyStatisticsList({ + beginTime: dayjs(state.towParmasn.time[0]).format("YYYY-MM-01 00:00:01"), + endTime: monthEnd, + dateType: state.towParmasn.dateType, + type: state.towParmasn.type, + }); + }else{ + res = await api.boeuStudyDataGetStudyStaisticsList({ + beginTime: dayjs(state.towParmasn.time[0]).format("YYYY-MM-01 00:00:01"), + endTime: monthEnd, + dateType: state.towParmasn.dateType, + type: state.towParmasn.type, + }); + } + if (res) { state.topChartData = res?.data?.result; if ( @@ -872,12 +889,23 @@ export default { .startOf("day") .format("YYYY-MM-DD 00:00:01"); const dayEnd = dayjs(e[1]).endOf("day").format("YYYY-MM-DD 23:59:59"); - const res = await api.boeuStudyDataGetStudyStaisticsList({ - beginTime: dayStart, - endTime: dayEnd, - dateType: state.towParmasn.dateType, - type: state.towParmasn.type, - }); + let res = null + if(state.towParmasn.type == 7){ + // 专业力必修数据 + res = await getStudyStatisticsList({ + beginTime: dayStart, + endTime: dayEnd, + dateType: state.towParmasn.dateType, + type: state.towParmasn.type, + }); + }else{ + res = await api.boeuStudyDataGetStudyStaisticsList({ + beginTime: dayStart, + endTime: dayEnd, + dateType: state.towParmasn.dateType, + type: state.towParmasn.type, + }); + } if (res) { state.topChartData = res?.data?.result; if ( diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index ca05f7d0..7f9e1cb1 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -361,6 +361,7 @@ export default { { text: "课程", num: res.data.result?.courseTotal }, { text: "考试", num: res.data.result?.examTotal }, { text: "案例", num: res.data.result?.caseTotal }, + { text: "专业力", num: 10 }, ]; tabData.value = list; }); @@ -627,6 +628,27 @@ export default { let tableData = ref([]); const getTableData = async () => { state.tableLoading = true; + if (state.currentTab === 6) { + //专业力列表 + const res = await api.boeuGrowthPlatePageList({ + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", + growthName: state.name, + page: state.pageNo, + size: state.pageSize, + }); + 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.tableLoading = false; + } + } if (state.currentTab === 4) { //考试列表 const res = await api.boeuExamPageList({ @@ -877,6 +899,7 @@ export default { { text: "课程", num: "11" }, { text: "考试", num: "10" }, { text: "案例", num: "10" }, + { text: "专业力必修", num: "10" }, ]); const tabClick = (index) => { state.selectedRowKeys = []; @@ -1535,6 +1558,102 @@ export default { align: "center", }, ]; + } else if (index === 6) { + columns.value = [ + { + title: "专业力必修名称", + dataIndex: "growthName", + key: "growthName", + width: 120, + ellipsis: true, + align: "left", + fixed: "left", + }, + { + title: "标准岗位名称", + dataIndex: "stdPositionDesr", + ellipsis: true, + key: "stdPositionDesr", + width: 120, + align: "center", + fixed: "left", + }, + { + title: "任职资格等级名称", + dataIndex: "qualsLevelDesr", + ellipsis: true, + key: "qualsLevelDesr", + width: 120, + align: "center", + fixed: "left", + }, + { + title: "任务数量", + dataIndex: "taskNum", + ellipsis: true, + key: "taskNum", + width: 120, + align: "center", + fixed: "left", + }, + { + title: "必修数", + dataIndex: "requiredNum", + ellipsis: true, + key: "requiredNum", + width: 120, + align: "center", + fixed: "left", + }, + { + title: "选修数", + dataIndex: "electivesNum", + ellipsis: true, + key: "electivesNum", + width: 120, + align: "center", + }, + { + title: "学习人数", + dataIndex: "learnerNum", + ellipsis: true, + key: "learnerNum", + width: 120, + align: "center", + }, + { + title: "完成人数", + dataIndex: "completedNum", + ellipsis: true, + key: "completedNum", + width: 120, + align: "center", + }, + { + title: "发布时间", + dataIndex: "publishedTime", + ellipsis: true, + key: "publishedTime", + width: 120, + align: "center", + }, + { + title: "归属人名称", + dataIndex: "attrPersonName", + ellipsis: true, + key: "attrPersonName", + width: 120, + align: "center", + }, + { + title: "状态", + dataIndex: "publishedStatus", + ellipsis: true, + key: "publishedStatus", + width: 120, + align: "center", + }, + ]; } getTableData(); };