diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx index b0f0fb6..fa3b8d7 100644 --- a/src/components/topBar/index.jsx +++ b/src/components/topBar/index.jsx @@ -30,6 +30,7 @@ export class TopBar extends React.Component { this.state = { fclasslist: [], rootTreeData: [], //根节点异步树 + treeLoadedKeys: [], treeExpandedKeys: [], requestData: { fclass: '0', @@ -66,10 +67,6 @@ export class TopBar extends React.Component { return message.error('请填写描述信息'); } this.setState({ confirmLoading: true }); - // setTimeout(() => { - // this.setState({ open: false, confirmLoading: false, description: '' }); - // message.success('版本记录成功,请重新刷新页面'); - // }, 2000); let api = '/api/bs/hrmorganization/orgchart/versionRecord?fclass=' + requestData.fclass + @@ -131,7 +128,7 @@ export class TopBar extends React.Component { */ onRootLoadData = (treeNode) => new Promise((resolve) => { - const { id } = treeNode.props; + const { id } = treeNode; setTimeout(() => { const { fclass } = this.state.requestData; let api = @@ -191,7 +188,7 @@ export class TopBar extends React.Component { render() { const { disabled, type } = this.props; - const { rootTreeData, open, confirmLoading } = this.state; + const { rootTreeData, open, confirmLoading, treeExpandedKeys } = this.state; return (
@@ -211,6 +208,9 @@ export class TopBar extends React.Component { hidedept: '0', }; this.handleFormChange(requestData); + this.setState({ + rootTreeData: [], + }); this.getNodeTreeNode( `/api/bs/hrmorganization/orgchart/getSubCompanyTree?fclass=${value}`, false, diff --git a/src/pages/user.jsx b/src/pages/user.jsx index 0321098..a92b7ea 100644 --- a/src/pages/user.jsx +++ b/src/pages/user.jsx @@ -99,7 +99,7 @@ export default function userPage() { // 获取数据 useEffect(() => { document.cookie = - 'ecology_JSessionid=aaaQRFwOgYRXPc88EZiQy; JSESSIONID=aaaQRFwOgYRXPc88EZiQy; Systemlanguid=7; languageidweaver=7; loginuuids=1; loginidweaver=sysadmin; __randcode__=0418808b-1045-4624-bea6-5b308360da7b'; + 'ecology_JSessionid=aaahTt6JHXEIM-HoSW-Xy; JSESSIONID=aaahTt6JHXEIM-HoSW-Xy; Systemlanguid=7; languageidweaver=7; loginuuids=2773; __randcode__=a8294fa0-56d7-430f-a35b-139d73474682; loginidweaver=zhangxy16'; d3.json( '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0', ).then((data) => {