diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index bda745f..3a4a4a3 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -42,9 +42,9 @@ // 测试 "--clickHouseUrl http://10.8.30.161", - "--clickHousePepEmis pg_pepca", - "--clickHouseCamworkflow pg_camworkflow", - "--clickHouseHr pg_hrm", + "--clickHousePepEmis pepca8", + "--clickHouseCamworkflow camworkflow", + "--clickHouseHr hrm", ] }, { diff --git a/web/client/src/layout/components/header/contant.js b/web/client/src/layout/components/header/contant.js index b58ed2d..4aa17a0 100644 --- a/web/client/src/layout/components/header/contant.js +++ b/web/client/src/layout/components/header/contant.js @@ -60,6 +60,11 @@ const headerItems = [{ itemKey: "recruitRecord", text: "招聘记录", to: "/humanAffairs/recruit/recruitRecord/appointmentRecords" + }, { + fatherKey: "recruit", + itemKey: "salesStatistics", + text: "销售统计", + to: "/humanAffairs/recruit/salesStatistics/personnelDistribution" }] }, { itemKey: "employeeRelationship", diff --git a/web/client/src/sections/humanAffairs/containers/index.js b/web/client/src/sections/humanAffairs/containers/index.js index 58f7233..b9ddae3 100644 --- a/web/client/src/sections/humanAffairs/containers/index.js +++ b/web/client/src/sections/humanAffairs/containers/index.js @@ -9,6 +9,7 @@ import LeaveStatistics from './leaveStatistics'; import OvertimeStatistics from './overtimeStatistics'; //招聘 import AppointmentRecords from './appointmentRecords'; +import PersonnelDistribution from './personnelDistribution'; //培训 import ResourceRepository from './resourceRepository'; //绩效考核 @@ -32,7 +33,7 @@ import PersonnelFilesDetail from './personnelFilesDetail'; export { PersonnelFiles, EmployeeInformation, DeptArchives, AttendanceStatistics, LeaveStatistics, OvertimeStatistics, - AppointmentRecords, + AppointmentRecords, PersonnelDistribution, ResourceRepository, WeeklyManagement, SaleLog, PMLog, ProbationerKPI, RegularKPI, diff --git a/web/client/src/sections/humanAffairs/containers/personnelDistribution.jsx b/web/client/src/sections/humanAffairs/containers/personnelDistribution.jsx new file mode 100644 index 0000000..7072e89 --- /dev/null +++ b/web/client/src/sections/humanAffairs/containers/personnelDistribution.jsx @@ -0,0 +1,42 @@ +import React, { useEffect, useState } from 'react'; +import { connect } from 'react-redux'; +import Empty from '../components/empty'; +import '../style.less' + +const PersonnelDistribution = (props) => { + const { dispatch, actions } = props + + return ( + <> +