free-sun
/
HumanResource
18
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://gitea.anxinyun.cn/gao.zhiyuan/HumanResource

master
zmh 2 years ago
parent
b3f1e0a487 6ffa7d692c
commit
02e75b9e11
5 changed files with 48 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      web/client/index.ejs
  2. 2
      web/client/index.html
  3. 3
      web/client/src/sections/humanAffairs/containers/index.js
  4. 42
      web/client/src/sections/humanAffairs/containers/personalTrainRecord.jsx
  5. 2
      web/client/src/sections/humanAffairs/nav-item.jsx

2
web/client/index.ejs
View File

@ -9,7 +9,7 @@
<!-- <link rel="shortcut icon" href="/assets/images/favicon.ico"> --> <!-- <link rel="shortcut icon" href="/assets/images/favicon.ico"> -->
<script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_20231_13.3484caadabc6f822796451f94a83fc64.es5.js"></script> <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_20231_17.1b35f8b651eb2d07e0f77dc62cd2e4e4.es5.js"></script>
</head> </head>

2
web/client/index.html
View File

@ -7,7 +7,7 @@
<!-- <link rel="shortcut icon" href="/assets/images/favicon.ico"> --> <!-- <link rel="shortcut icon" href="/assets/images/favicon.ico"> -->
<script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_20231_13.3484caadabc6f822796451f94a83fc64.es5.js"></script> <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_20231_17.1b35f8b651eb2d07e0f77dc62cd2e4e4.es5.js"></script>
</head> </head>
<body> <body>

3
web/client/src/sections/humanAffairs/containers/index.js
View File

@ -28,6 +28,8 @@ import EmployeeAuth from './employeeAuth';
import FormMaintenance from './formMaintenance'; import FormMaintenance from './formMaintenance';
//其它 //其它
import PersonnelFilesDetail from './personnelFilesDetail'; import PersonnelFilesDetail from './personnelFilesDetail';
//培训管理
import PersonalTrainRecord from './personalTrainRecord';
@ -41,4 +43,5 @@ export {
MonthlyProcess, Quarter, HighMonthly, PenaltiesRecord, MonthlyProcess, Quarter, HighMonthly, PenaltiesRecord,
EmployeeAuth, FormMaintenance, EmployeeAuth, FormMaintenance,
PersonnelFilesDetail, PersonnelFilesDetail,
PersonalTrainRecord,
}; };

42
web/client/src/sections/humanAffairs/containers/personalTrainRecord.jsx
View File

@ -0,0 +1,42 @@
import React, { useEffect, useState } from 'react';
import { connect } from 'react-redux';
import Empty from '../components/empty';
import '../style.less'
const PersonalTrainRecord = (props) => {
const { dispatch, actions } = props
return (
<>
<div style={{ padding: '0px 12px' }}>
<div style={{ display: 'flex' }}>
<div style={{ color: 'rgba(0,0,0,0.45)', fontSize: 14 }}>培训</div>
<div style={{ color: 'rgba(0,0,0,0.45)', fontSize: 14, margin: '0px 8px' }}>/</div>
<div style={{ color: 'rgba(0,0,0,0.45)', fontSize: 14 }}>培训管理</div>
<div style={{ color: '#033C9A', fontSize: 14, margin: '0px 8px' }}>/</div>
<div style={{ color: '#033C9A', fontSize: 14 }}>个人培训记录</div>
</div>
<div style={{ background: '#FFFFFF', boxShadow: '0px 0px 12px 2px rgba(220,222,224,0.2)', borderRadius: 2, padding: '20px 0px 20px 19px ', marginTop: 12 }}>
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
<div style={{ display: 'flex', alignItems: 'baseline' }}>
<div style={{ width: 0, height: 20, borderLeft: '3px solid #0F7EFB', borderTop: '3px solid transparent', borderBottom: '3px solid transparent' }}></div>
<div style={{ fontFamily: "YouSheBiaoTiHei", fontSize: 24, color: '#033C9A', marginLeft: 8 }}>个人培训记录</div>
<div style={{ marginLeft: 6, fontSize: 12, color: '#969799', fontFamily: "DINExp", }}>PERSONAL TRAINING RECORD</div>
</div>
</div>
<Empty />
</div>
</div>
</>
)
}
function mapStateToProps(state) {
const { auth, global } = state;
return {
user: auth.user,
actions: global.actions,
};
}
export default connect(mapStateToProps)(PersonalTrainRecord);

2
web/client/src/sections/humanAffairs/nav-item.jsx
View File

@ -65,7 +65,7 @@ export function getNavItem(user, dispatch) {
}, { }, {
itemKey: 'trainingManagement', itemKey: 'trainingManagement',
text: '培训管理', text: '培训管理',
icon: <iconpark-icon style={{ width: 20, height: 20 }} name="iconcbpeixundangan"></iconpark-icon>, icon: <iconpark-icon style={{ width: 20, height: 20 }} name="peixgl"></iconpark-icon>,
to: '/humanAffairs/train/trainingManagement/personalTrainRecord', to: '/humanAffairs/train/trainingManagement/personalTrainRecord',
items: [{ items: [{
itemKey: 'personalTrainRecord', to: '/humanAffairs/train/trainingManagement/personalTrainRecord', text: '个人培训记录' itemKey: 'personalTrainRecord', to: '/humanAffairs/train/trainingManagement/personalTrainRecord', text: '个人培训记录'

Write Preview
Loading…
Cancel
Save