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

(*)相关故障修改

master
zmh 2 years ago
parent
b96ff858ef
commit
eb632e5dcc
3 changed files with 336 additions and 318 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. 637
      web/client/src/layout/containers/layout/index.jsx
  2. 4
      web/client/src/sections/humanAffairs/containers/employeeAuth.jsx
  3. 13
      web/client/src/utils/func.js

637
web/client/src/layout/containers/layout/index.jsx
View File

@ -2,7 +2,7 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { Layout, Notification } from '@douyinfe/semi-ui'; import { Layout, Notification, Spin, Toast } from '@douyinfe/semi-ui';
import Sider from '../../components/sider'; import Sider from '../../components/sider';
import Header from '../../components/header'; import Header from '../../components/header';
import Footer from '../../components/footer'; import Footer from '../../components/footer';
@ -20,7 +20,7 @@ import actions from '../../../sections/humanAffairs/actions'
NProgress.configure({ NProgress.configure({
template: ` template: `
<div class="bar" style="height:2px" role="bar"> <div class="bar" style="height:2px" role="bar">
<div class="peg"></div> <div class="peg"></div>
</div> </div>
@ -35,336 +35,355 @@ let requestUser = true
let requestlogout = false; let requestlogout = false;
// const location111 = useLocation(); // const location111 = useLocation();
const LayoutContainer = props => { const LayoutContainer = props => {
const { const {
dispatch, actions, msg, user, copyright, children, sections, clientWidth, clientHeight, dispatch, actions, msg, user, copyright, children, sections, clientWidth, clientHeight,
location, match, routes, history, socket, apiRoot, webPepUrl location, match, routes, history, socket, apiRoot, webPepUrl
} = props } = props
const [collapsed, setCollapsed] = useState(false) const [collapsed, setCollapsed] = useState(false)
NProgress.start(); NProgress.start();
const resize_ = () => { const resize_ = () => {
dispatch(resize( dispatch(resize(
document.getElementById('HrApp').clientHeight, document.getElementById('HrApp').clientHeight,
document.getElementById('HrApp').clientWidth - (collapsed ? 120 : 240) document.getElementById('HrApp').clientWidth - (collapsed ? 120 : 240)
)); ));
} }
function deepCopy(data) {//深拷贝 function deepCopy(data) {//深拷贝
//string,number,bool,null,undefined,symbol //string,number,bool,null,undefined,symbol
//object,array,date //object,array,date
if (data && typeof data === "object") { if (data && typeof data === "object") {
//针对函数的拷贝 //针对函数的拷贝
if (typeof data === "function") { if (typeof data === "function") {
let tempFunc = data.bind(null); let tempFunc = data.bind(null);
tempFunc.prototype = deepCopy(data.prototype); tempFunc.prototype = deepCopy(data.prototype);
return tempFunc; return tempFunc;
} }
switch (Object.prototype.toString.call(data)) { switch (Object.prototype.toString.call(data)) {
case "[object String]": case "[object String]":
return data.toString(); return data.toString();
case "[object Number]": case "[object Number]":
return Number(data.toString()); return Number(data.toString());
case "[object Boolean]": case "[object Boolean]":
return new Boolean(data.toString()); return new Boolean(data.toString());
case "[object Date]": case "[object Date]":
return new Date(data.getTime()); return new Date(data.getTime());
case "[object Array]": case "[object Array]":
var arr = []; var arr = [];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
arr[i] = deepCopy(data[i]); arr[i] = deepCopy(data[i]);
} }
return arr; return arr;
//js自带对象或用户自定义类实例 //js自带对象或用户自定义类实例
case "[object Object]": case "[object Object]":
var obj = {}; var obj = {};
for (let key in data) { for (let key in data) {
//会遍历原型链上的属性方法，可以用hasOwnProperty来控制 （obj.hasOwnProperty(prop) //会遍历原型链上的属性方法，可以用hasOwnProperty来控制 （obj.hasOwnProperty(prop)
obj[key] = deepCopy(data[key]); obj[key] = deepCopy(data[key]);
} }
return obj; return obj;
} }
} else { } else {
//string,number,bool,null,undefined,symbol //string,number,bool,null,undefined,symbol
return data; return data;
} }
} }
const [allItems, setAllItems] = useState([]) const [allItems, setAllItems] = useState([])
// const [headerItems, setHeaderItems] = useState([]) // const [headerItems, setHeaderItems] = useState([])
const [leftItems, setLeftItems] = useState([]) const [leftItems, setLeftItems] = useState([])
const [leftChange, setLeftChange] = useState(true) const [leftChange, setLeftChange] = useState(true)
const [leftShow, setLeftShow] = useState(false) const [leftShow, setLeftShow] = useState(false)
useEffect(() => { const [loading, setLoading] = useState(false)
let topItems = []//头部导航 useEffect(() => {
const lastSelectedKeys = localStorage.getItem('poms_selected_sider') let topItems = []//头部导航
let nextItems = []//所有导航 const lastSelectedKeys = localStorage.getItem('poms_selected_sider')
for (let c of sections) { let nextItems = []//所有导航
if (typeof c.getNavItem == 'function') { for (let c of sections) {
let item = c.getNavItem(user, dispatch); if (typeof c.getNavItem == 'function') {
if (item) { let item = c.getNavItem(user, dispatch);
nextItems.push.apply(nextItems, item) if (item) {
if (item.length > 0) { nextItems.push.apply(nextItems, item)
for (let j = 0; j < item.length; j++) { if (item.length > 0) {
let itm = deepCopy(item[j]); for (let j = 0; j < item.length; j++) {
if (itm.hasOwnProperty('items')) { let itm = deepCopy(item[j]);
for (let i = 0; i < itm.items.length; i++) { if (itm.hasOwnProperty('items')) {
itm.items[i].fatherKey = itm.itemKey for (let i = 0; i < itm.items.length; i++) {
delete itm.items[i].items itm.items[i].fatherKey = itm.itemKey
delete itm.items[i].items
}
// topItems.push(itm)
// }
// else {
// topItems.push.apply(topItems, item)
}
} }
// topItems.push(itm) }
// } }
// else {
// topItems.push.apply(topItems, item)
}
}
}
} }
} }
} setAllItems(nextItems)
setAllItems(nextItems) // setHeaderItems(topItems)
// setHeaderItems(topItems) if (lastSelectedKeys) {//如果有缓存
if (lastSelectedKeys) {//如果有缓存 for (let i = 0; i < nextItems.length; i++) {
for (let i = 0; i < nextItems.length; i++) { if (JSON.parse(lastSelectedKeys)[0] == nextItems[i].itemKey) {
if (JSON.parse(lastSelectedKeys)[0] == nextItems[i].itemKey) {
// let openArr = [] // let openArr = []
// for (let j = 0; j < nextItems[i].items.length; j++) { // for (let j = 0; j < nextItems[i].items.length; j++) {
// openArr.push(nextItems[i].items[j].itemKey) // openArr.push(nextItems[i].items[j].itemKey)
// } // }
// localStorage.setItem('poms_open_sider', JSON.stringify(openArr)) // localStorage.setItem('poms_open_sider', JSON.stringify(openArr))
setLeftItems(nextItems[i].items) setLeftItems(nextItems[i].items)
}
} }
} setLeftShow(true)
setLeftShow(true) }
} else {
else { setLeftShow(false)
setLeftShow(false) }
}
window.addEventListener('resize', resize_); window.addEventListener('resize', resize_);
return () => { return () => {
window.removeEventListener('resize', resize_); window.removeEventListener('resize', resize_);
} }
}, []) }, [user.authorized])
useEffect(() => { useEffect(() => {
let pathnameArr = location.pathname.split('/') let pathnameArr = location.pathname.split('/')
let openArr = [] let openArr = []
for (let i = 0; i < allItems.length; i++) { for (let i = 0; i < allItems.length; i++) {
if (allItems[i].items) { if (allItems[i].items) {
for (let j = 0; j < allItems[i].items.length; j++) { for (let j = 0; j < allItems[i].items.length; j++) {
if (allItems[i].items[j].items) { if (allItems[i].items[j].items) {
for (let k = 0; k < allItems[i].items[j].items.length; k++) { for (let k = 0; k < allItems[i].items[j].items.length; k++) {
if (allItems[i].items[j].items[k].to == location.pathname) { if (allItems[i].items[j].items[k].to == location.pathname) {
for (let o = 0; o < allItems[i].items.length; o++) { for (let o = 0; o < allItems[i].items.length; o++) {
openArr.push(allItems[i].items[o].itemKey) openArr.push(allItems[i].items[o].itemKey)
}
localStorage.setItem('poms_selected_sider', JSON.stringify([pathnameArr[1]]))
// localStorage.setItem('poms_open_sider', JSON.stringify(openArr))
setLeftItems(allItems[i].items)
setLeftShow(true)
}
} }
localStorage.setItem('poms_selected_sider', JSON.stringify([pathnameArr[1]])) }
// localStorage.setItem('poms_open_sider', JSON.stringify(openArr)) }
setLeftItems(allItems[i].items)
setLeftShow(true)
}
}
}
} }
} }
} }, [location])
}, [location])
useEffect(() => { useEffect(() => {
NProgress.done(); NProgress.done();
if ((!user || !user.authorized)) { if ((!user || !user.authorized)) {
// history.push('/signin'); // history.push('/signin');
getUserInfoByToken() setLoading(true);
} getUserInfoByToken()
if (msg) { }
if (msg.done) { if (msg) {
Notification.success({ if (msg.done) {
// title: msg.done, Notification.success({
content: msg.done, // title: msg.done,
duration: 2, content: msg.done,
}) duration: 2,
} })
if (msg.error) { }
Notification.error({ if (msg.error) {
// title: msg.error, Notification.error({
content: msg.error, // title: msg.error,
duration: 2, content: msg.error,
}) duration: 2,
} })
} }
const dom = document.getElementById('page-content'); }
if (dom) { const dom = document.getElementById('page-content');
if (!scrollbar) { if (dom) {
scrollbar = new PerfectScrollbar('#page-content', { suppressScrollX: true }); if (!scrollbar) {
scrollbar.update(); scrollbar = new PerfectScrollbar('#page-content', { suppressScrollX: true });
} else { scrollbar.update();
scrollbar.update(); } else {
dom.scrollTop = 0; scrollbar.update();
} dom.scrollTop = 0;
} }
}) }
})
const getUserInfoByToken = () => { const getUserInfoByToken = () => {
if (requestUser) { if (requestUser) {
requestUser = false; requestUser = false;
RouteRequest.get(RouteTable.getDomain).then(res => { RouteRequest.get(RouteTable.getDomain).then(res => {
let token = Cookie.get('pepToken', { domain: res.root }); let token = Cookie.get('pepToken', { domain: res.root });
dispatch(login({ token })).then(res => { dispatch(login({ token })).then(res => {
if (res.type == 'LOGIN_SUCCESS') { if (res.type == 'LOGIN_SUCCESS') {
const data = res.payload?.user || {} const data = res.payload?.user || {}
localStorage.setItem('poms_open_sider', JSON.stringify(["archivesCenter"])) if (data.codes && data.codes.length) {
localStorage.setItem('poms_selected_sider', JSON.stringify(["humanAffairs"])) dispatch(actions.layout.initWebSocket({ ioUrl: apiRoot, token: data.token, hrUserId: data.hrUserInfo && hrUserInfo.id }))
dispatch(actions.layout.initWebSocket({ ioUrl: apiRoot, token: data.token, hrUserId: data.hrUserInfo && hrUserInfo.id })) history.push('/humanAffairs/archivesCenter/personnelArchives/personnelFiles')
dispatch(actions.humanAffairs.getUserResource(res.payload.user.id)).then(res => { localStorage.setItem('poms_open_sider', JSON.stringify(["archivesCenter"]))
if (res.success) { localStorage.setItem('poms_selected_sider', JSON.stringify(["humanAffairs"]))
sessionStorage.setItem('userResource', JSON.stringify(res.payload.data)) setLoading(false);
history.push('/humanAffairs/archivesCenter/personnelArchives/personnelFiles') } else {
window.location.reload() setLoading(false);
} Toast.warning({
}) content: '用户无模块权限', duration: 2, onClose: () => {
} else { window.location.href = `${webPepUrl}/signin`
window.location.href = `${webPepUrl}/signin` },
} })
}
} else {
setLoading(false);
Toast.warning({
content: '鉴权失败', duration: 2, onClose: () => {
window.location.href = `${webPepUrl}/signin`
},
})
}
}, error => {
setLoading(false);
Toast.warning({
content: '鉴权失败', duration: 2, onClose: () => {
window.location.href = `${webPepUrl}/signin`
},
})
})
}, error => { }, error => {
window.location.href = `${webPepUrl}/signin` setLoading(false);
Toast.warning({
content: '鉴权失败', duration: 2, onClose: () => {
window.location.href = `${webPepUrl}/signin`
},
})
}) })
}, error => { }
message.error('鉴权失败', 5); }
window.location.href = `${webPepUrl}/signin`
})
}
}
// websocket 使用测试 // websocket 使用测试
useEffect(() => { useEffect(() => {
// console.log(socket) // console.log(socket)
if (socket) { if (socket) {
socket.on('CAMERA_ONLINE', function (msg) { socket.on('CAMERA_ONLINE', function (msg) {
console.info(msg); console.info(msg);
if (msg.online == 'ON') { if (msg.online == 'ON') {
Notification.success({ Notification.success({
title: 'Hi', title: 'Hi',
content: (<div><div>{msg.name}</div><div style={{ marginTop: 5 }}>已上线。</div></div>), content: (<div><div>{msg.name}</div><div style={{ marginTop: 5 }}>已上线。</div></div>),
duration: 2, duration: 2,
}) })
} }
if (msg.online == 'OFF') { if (msg.online == 'OFF') {
Notification.error({ Notification.error({
title: 'Hi', title: 'Hi',
content: (<div><div>{msg.name}</div><div style={{ marginTop: 5 }}>发生离线。</div></div>), content: (<div><div>{msg.name}</div><div style={{ marginTop: 5 }}>发生离线。</div></div>),
duration: 2, duration: 2,
}) })
}
});
return () => {
socket.off("CAMERA_ONLINE");
} }
}); }
return () => { }, [socket])
socket.off("CAMERA_ONLINE");
}
}
}, [socket])
return ( return (
<Layout id="layout" style={{ height: '100%' }}> <Layout id="layout" style={{ height: '100%' }}>
{ {
<> <Spin spinning={loading}>
<Layout.Header> <Layout.Header>
<Header <Header
// headerItems={headerItems} //菜单重新分类规整 // headerItems={headerItems} //菜单重新分类规整
user={user} user={user}
pathname={location.pathname} pathname={location.pathname}
toggleCollapsed={() => { toggleCollapsed={() => {
setCollapsed(!collapsed); setCollapsed(!collapsed);
}} }}
collapsed={collapsed} collapsed={collapsed}
history={history} history={history}
tochange={(val) => { tochange={(val) => {
// setLeftChange(!leftChange) //会导致顶部右上角转小圈 // setLeftChange(!leftChange) //会导致顶部右上角转小圈
if (val.fatherKey) { if (val.fatherKey) {
localStorage.setItem('poms_selected_sider', JSON.stringify([val.itemKey])); localStorage.setItem('poms_selected_sider', JSON.stringify([val.itemKey]));
const historyOpenKeys = localStorage.getItem('poms_open_sider'); const historyOpenKeys = localStorage.getItem('poms_open_sider');
const openKeys = historyOpenKeys && JSON.parse(historyOpenKeys).concat(val.openKey || val.itemKey) || [val.openKey || val.itemKey] const openKeys = historyOpenKeys && JSON.parse(historyOpenKeys).concat(val.openKey || val.itemKey) || [val.openKey || val.itemKey]
localStorage.setItem('poms_open_sider', JSON.stringify(openKeys)); localStorage.setItem('poms_open_sider', JSON.stringify(openKeys));
// for (let i = 0; i < allItems.length; i++) { // for (let i = 0; i < allItems.length; i++) {
// if (val.fatherKey == allItems[i].itemKey) { // if (val.fatherKey == allItems[i].itemKey) {
// let openArr = [] // let openArr = []
// for (let j = 0; j < allItems[i].items.length; j++) { // for (let j = 0; j < allItems[i].items.length; j++) {
// openArr.push(allItems[i].items[j].itemKey) // openArr.push(allItems[i].items[j].itemKey)
// } // }
// localStorage.setItem('poms_selected_sider', JSON.stringify([val.fatherKey])) // localStorage.setItem('poms_selected_sider', JSON.stringify([val.fatherKey]))
// localStorage.setItem('poms_open_sider', JSON.stringify(openArr)) // localStorage.setItem('poms_open_sider', JSON.stringify(openArr))
// setLeftItems(allItems[i].items) // setLeftItems(allItems[i].items)
// } // }
// } // }
// setLeftShow(true) // setLeftShow(true)
} }
else { else {
localStorage.setItem('poms_open_sider', JSON.stringify([])) localStorage.setItem('poms_open_sider', JSON.stringify([]))
localStorage.removeItem('poms_selected_sider') localStorage.removeItem('poms_selected_sider')
// setLeftShow(false) // setLeftShow(false)
} }
history.push(val.to); history.push(val.to);
}} }}
/> />
</Layout.Header> </Layout.Header>
<Layout style={{ height: 'calc(100% - 50px)' }}> <Layout style={{ height: 'calc(100% - 50px)' }}>
{leftShow ? (<Layout.Sider> {user && user.authorized ? (<Layout.Sider>
<Sider <Sider
sections={sections} sections={sections}
leftItems={leftItems} leftItems={leftItems}
dispatch={dispatch} dispatch={dispatch}
user={user} user={user}
leftChange={leftChange} leftChange={leftChange}
pathname={location.pathname} pathname={location.pathname}
collapsed={collapsed} collapsed={collapsed}
/> />
</Layout.Sider>) : ('')} </Layout.Sider>) : ('')}
<Layout.Content> {user && user.authorized ? <Layout.Content>
<div style={{ <div style={{
background: "#F2F3F5", background: "#F2F3F5",
}}> }}>
<div id="page-content" style={{ <div id="page-content" style={{
height: clientHeight - 12, height: clientHeight - 12,
minWidth: 520, minWidth: 520,
position: 'relative', position: 'relative',
}}> }}>
<div style={{ <div style={{
minHeight: clientHeight - 32 - 12, minHeight: clientHeight - 32 - 12,
position: 'relative', position: 'relative',
padding: '12px 8px', padding: '12px 8px',
}}> }}>
{children} {children}
</div> </div>
<Layout.Footer> <Layout.Footer>
<Footer /> <Footer />
</Layout.Footer> </Layout.Footer>
</div> </div>
</div> </div>
</Layout.Content> </Layout.Content> : ''}
</Layout> </Layout>
</> </Spin>
} }
</Layout > </Layout >
) )
} }
function mapStateToProps(state) { function mapStateToProps(state) {
const { global, auth, ajaxResponse, webSocket } = state; const { global, auth, ajaxResponse, webSocket } = state;
return { return {
title: global.title, title: global.title,
copyright: global.copyright, copyright: global.copyright,
sections: global.sections, sections: global.sections,
actions: global.actions, actions: global.actions,
clientWidth: global.clientWidth, clientWidth: global.clientWidth,
clientHeight: global.clientHeight, clientHeight: global.clientHeight,
msg: ajaxResponse.msg, msg: ajaxResponse.msg,
user: auth.user, user: auth.user,
socket: webSocket.socket, socket: webSocket.socket,
apiRoot: global.apiRoot, apiRoot: global.apiRoot,
webPepUrl: global.webPepUrl webPepUrl: global.webPepUrl
}; };
} }
export default connect(mapStateToProps)(LayoutContainer); export default connect(mapStateToProps)(LayoutContainer);

4
web/client/src/sections/humanAffairs/containers/employeeAuth.jsx
View File

@ -239,7 +239,7 @@ const EmployeeAuth = (props) => {
resourceId.push(parseInt(item)); resourceId.push(parseInt(item));
} }
} }
resourceId = [...checkedList, ...resourceId] resourceId = [...resourceId]
if (roleId == undefined || resourceId.length == 0) { if (roleId == undefined || resourceId.length == 0) {
Toast.error('请选择角色和权限！') Toast.error('请选择角色和权限！')
} else { } else {
@ -273,7 +273,7 @@ const EmployeeAuth = (props) => {
</div> </div>
<div className='authorityAdminList'> <div className='authorityAdminList'>
{ {
hrUser && hrUser.adminHr && hrUser.adminHr.map(e => { hrUser && hrUser.adminHr && hrUser.adminHr.filter(admin => admin.id != 1).map(e => {
return ( return (
<div > <div >
<span>人力资源部</span> <span>人力资源部</span>

13
web/client/src/utils/func.js
View File

@ -1,10 +1,9 @@
'use strict'; 'use strict';
const userData = JSON.parse(sessionStorage.getItem('hrUser'));
export const isAuthorized = (authcode) => { export const isAuthorized = (authcode) => {
if (JSON.parse(sessionStorage.getItem('userResource'))) { let userInfo = userData || JSON.parse(sessionStorage.getItem('hrUser'));
const resources = JSON.parse(sessionStorage.getItem('userResource')); if (userInfo) {
return resources.includes(authcode); const { codes } = userInfo
} else { return codes && codes.includes(authcode);
return false; }
}
} }
Write Preview
Loading…
Cancel
Save