中远组织架构图版本记录

src/components/topBar/index.jsx

@@ -217,7 +217,7 @@ export class TopBar extends React.Component {
   );
 
   render() {
-    const { disabled, type } = this.props;
+    const { disabled, type, timelineId } = this.props;
     const {
       rootTreeData,
       open,
@@ -247,6 +247,7 @@ export class TopBar extends React.Component {
               treeIcon
             />
           </Col>
+          {timelineId == 0 && (
             <Col span={6}>
               <Checkbox
                 style={{ marginTop: '5px', marginLeft: 60 }}
@@ -269,6 +270,7 @@ export class TopBar extends React.Component {
                 />
               </Tooltip>
             </Col>
+          )}
 
           <Col span={6}>
             <Checkbox
@@ -308,6 +310,7 @@ export class TopBar extends React.Component {
           </Col>
         </Row>
         <Row style={{ marginTop: '15px' }}>
+          {timelineId == 0 && (
             <Col span={6}>
               部门节点：
               <TreeSelect
@@ -322,7 +325,8 @@ export class TopBar extends React.Component {
                 treeIcon
               />
             </Col>
-          <Col span={8} style={{ textAlign: 'center' }}>
+          )}
+          <Col span={6} style={{ textAlign: 'center' }}>
             <Button
               type="primary"
               style={{ marginRight: '10px' }}

src/pages/company.jsx

@@ -22,6 +22,8 @@ let timeLine = null;
 let orgChart = null;
 let topbar = null;
 
+let versionId = 0;
+
 export default function companyPage() {
   const [data, setData] = useState(null);
   let compact = 0;
@@ -54,6 +56,7 @@ export default function companyPage() {
         rootId: node.id,
         fclass: topbar.state.requestData.fclass,
         id: infoRef.current,
+        versionId: versionId,
       };
       drawerCom.showDrawer(params);
     }
@@ -359,9 +362,9 @@ export default function companyPage() {
    */
   const timeLineSearch = (timeline) => {
     setTimelineId(timeline.id);
+    versionId = timeline.id;
     const fclass = topbar.state.requestData.fclass;
     const resetParams = {
-      root: undefined,
       level: '2',
       fisvitual: '0',
       hidedept: '0',
@@ -460,6 +463,7 @@ export default function companyPage() {
           changeFclass={(requestData) => {
             handleChange(requestData);
           }}
+          timelineId={timelineId}
           type="company"
           url="/api/bs/hrmorganization/orgchart/getCondition?fclass=0&type=company&id=0"
         />

src/pages/user.jsx

@@ -99,7 +99,7 @@ export default function userPage() {
   // 获取数据
   useEffect(() => {
     document.cookie =
-      'ecology_JSessionid=aaaOSu6bA71rZb9EYCuhz; JSESSIONID=aaaOSu6bA71rZb9EYCuhz; Systemlanguid=7; languageidweaver=7; loginidweaver=sysadmin; loginuuids=1;';
+      'ecology_JSessionid=aaaOSu6bA71rZb9EYCuhz; JSESSIONID=aaaOSu6bA71rZb9EYCuhz; Systemlanguid=7; languageidweaver=7; loginuuids=1; loginidweaver=sysadmin;';
     d3.json(
       '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0',
     ).then((data) => {