海泰组织架构图搜索条件筛选

src/components/drawer/index.jsx

@@ -367,7 +367,6 @@ export default class DrawerComponents extends React.Component {
   };
 
   onStatusChange = (checkedValues) => {
-    const { labelData } = this.props;
     if (checkedValues.length === 0) {
       return message.error(`${getLabel(547728, labelData)}`, 2);
     }
@@ -385,7 +384,6 @@ export default class DrawerComponents extends React.Component {
   };
 
   onTypeChange = (checkedValues) => {
-    const { labelData } = this.props;
     if (this.state.showJob) {
       return message.error(`${getLabel(547729, labelData)}`, 2);
     }

src/components/timeline/index.jsx

@@ -7,12 +7,10 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 import React from 'react';
-import { Timeline, Drawer, Popconfirm, message } from 'antd';
+import { Timeline, Drawer } from 'antd';
 import styles from './index.less';
 import leftTreeShow from './img/leftTree-show.png';
 import leftHide from './img/leftTree-hide.png';
-import { CloseCircleOutlined } from '@ant-design/icons';
-import { getLabel } from '../../util/i18n.js';
 
 export default class TimeLine extends React.Component {
   constructor(props) {
@@ -37,21 +35,6 @@ export default class TimeLine extends React.Component {
     this.props.onClick(data);
   }
 
-  handleDelete(key) {
-    const { labelData } = this.props;
-    let api = `/api/bs/hrmorganization/orgchart/versionDelete?versionId=${key}`;
-    fetch(api)
-      .then((res) => res.json())
-      .then((data) => {
-        if (data.api_status) {
-          message.success(`${getLabel(547484, labelData)}`, 2, 3);
-          window.location.reload(true);
-        } else {
-          message.error(`${getLabel(547483, labelData)}`, 2, 3);
-        }
-      });
-  }
-
   componentDidMount() {
     this.searchTimeLines(this.props.url);
   }
@@ -73,8 +56,6 @@ export default class TimeLine extends React.Component {
   };
 
   render() {
-    const { labelData } = this.props;
-
     let showStyle = {};
     let positionStyle = {};
     if (this.state.open) {
@@ -108,30 +89,14 @@ export default class TimeLine extends React.Component {
               return (
                 <Timeline.Item
                   key={item.key}
+                  onClick={this.handleLineClick.bind(this, item)}
                   className={styles.timeline}
                   color={item.color}
-                >
-                  <div
-                    className={styles.title}
                   style={{
                     color: item.color == 'blue' ? '#1890ff' : 'dimgray',
                   }}
-                    onClick={this.handleLineClick.bind(this, item)}
                 >
-                    {item.title}
+                  <div>{item.title}</div>
-                  </div>
-                  {item.key != 0 && (
-                    <Popconfirm
-                      title={`${getLabel(547491, labelData)}[${item.title}]?`}
-                      onConfirm={this.handleDelete.bind(this, item.key)}
-                      okText={getLabel(547319, labelData)}
-                      cancelText={getLabel(547318, labelData)}
-                    >
-                      <div className={styles.delete}>
-                        <CloseCircleOutlined />
-                      </div>
-                    </Popconfirm>
-                  )}
                   <div className={styles.time}>{item.time}</div>
                 </Timeline.Item>
               );

src/components/timeline/index.less

@@ -15,25 +15,21 @@
     cursor: pointer;
   }
 
-  // .timeline .title:hover {
+  .timeline :hover {
-  //   color: #1890ff;
+    color: #1890ff;
-  // }
+  }
 
   .time {
     color: dimgray;
   }
-
-  .delete :hover {
-    color: red;
-  }
 }
 
 .leftRightLayoutBtn {
   width: 18px;
   height: 60px;
-  position: fixed;
+  position: absolute;
   top: 50%;
-  // margin-top: -30px;
+  margin-top: -30px;
   z-index: 101;
   cursor: pointer;
 }

src/components/topBar/index.jsx

@@ -22,7 +22,7 @@ const { TextArea } = Input;
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 import locale from 'antd/lib/date-picker/locale/zh_CN';
-import { HomeOutlined, FolderOutlined } from '@ant-design/icons';
+import { HomeOutlined } from '@ant-design/icons';
 moment.locale('zh-cn');
 import { getLabel } from '../../util/i18n.js';
 import { SmileOutlined } from '@ant-design/icons';
@@ -45,8 +45,6 @@ export class TopBar extends React.Component {
       open: false,
       confirmLoading: false,
       description: '',
-      timelineId: '0',
-      treeKey: 1,
     };
   }
 
@@ -59,29 +57,10 @@ export class TopBar extends React.Component {
     this.setState({ requestData });
   }
 
-  handleTreeData(treeData = [], timelineId) {
-    this.setState({
-      rootTreeData: treeData,
-      timelineId: timelineId,
-      treeKey: this.state.treeKey + 1,
-    });
-  }
-
   onChange = (e) => {
     this.setState({ description: e.target.value });
   };
 
-  generateKey = (
-    length = 5,
-    chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',
-  ) => {
-    let result = '';
-    for (let i = 0; i < length; i++) {
-      result += chars.charAt(Math.floor(Math.random() * chars.length));
-    }
-    return result;
-  };
-
   /**
    * 弹窗确认
    */
@@ -138,9 +117,6 @@ export class TopBar extends React.Component {
           }
           arr.map((item, index) => {
             item.icon = <HomeOutlined />;
-            if (item.type == 2) {
-              item.icon = <FolderOutlined />;
-            }
           });
           this.setState({
             rootTreeData: arr,
@@ -159,14 +135,11 @@ export class TopBar extends React.Component {
       const { id } = treeNode;
       setTimeout(() => {
         const { fclass } = this.state.requestData;
-        const { timelineId } = this.state;
         let api =
           '/api/bs/hrmorganization/orgchart/getSubCompanyTree?subcompany=' +
           id +
           '&fclass=' +
-          fclass +
+          fclass;
-          '&id=' +
-          timelineId;
         this.getNodeTreeNode(api);
         resolve(undefined);
       }, 500);
@@ -219,8 +192,7 @@ export class TopBar extends React.Component {
 
   render() {
     const { disabled, type, labelData } = this.props;
-    const { rootTreeData, open, confirmLoading, treeExpandedKeys, treeKey } =
+    const { rootTreeData, open, confirmLoading, treeExpandedKeys } = this.state;
-      this.state;
 
     return (
       <div className={style.topbarWrapper}>
@@ -228,6 +200,7 @@ export class TopBar extends React.Component {
           <Col span={6}>
             {getLabel(547293, labelData)}：
             <Select
+              disabled
               defaultValue="0"
               style={{ width: 140 }}
               value={this.state.requestData.fclass}
@@ -257,11 +230,9 @@ export class TopBar extends React.Component {
               ))}
             </Select>
           </Col>
-
+          {/* <Col span={6}>
-          <Col span={8}>
             {getLabel(547294, labelData)}：
             <TreeSelect
-              key={treeKey}
               treeDataSimpleMode
               allowClear
               style={{ width: '65%' }}
@@ -273,16 +244,20 @@ export class TopBar extends React.Component {
               treeData={rootTreeData}
               treeIcon
             />
-          </Col>
+          </Col> */}
-          <Col span={5}>
+          <Col span={6}>
             <Checkbox
               style={{ marginTop: '5px', marginLeft: 100 }}
               checked={this.state.requestData.hidedept == '1'}
-              onChange={(e) =>
+              onChange={(e) => {
                 this.handleFormChange({
                   hidedept: e.target.checked ? '1' : '0',
-                })
+                });
-              }
+                this.props.onSearch({
+                  ...this.state.requestData,
+                  hidedept: e.target.checked ? '1' : '0',
+                });
+              }}
             >
               {getLabel(547296, labelData)}
             </Checkbox>
@@ -296,7 +271,7 @@ export class TopBar extends React.Component {
               />
             </Tooltip>
           </Col>
-          <Col span={5}>
+          {/* <Col span={6}>
             {getLabel(547299, labelData)}：
             <Select
               defaultValue="3"
@@ -309,10 +284,10 @@ export class TopBar extends React.Component {
               <Option value="3">{getLabel(547464, labelData)}</Option>
               <Option value="4">{getLabel(547465, labelData)}</Option>
             </Select>
-          </Col>
+          </Col> */}
-        </Row>
+          {/* </Row> */}
-        <Row style={{ marginTop: '15px' }}>
+          {/* <Row style={{ marginTop: '15px' }}> */}
-          <Col span={6}>
+          {/* <Col span={6}>
             <Checkbox
               style={{ marginTop: '5px' }}
               checked={this.state.requestData.fisvitual == '1'}
@@ -333,9 +308,8 @@ export class TopBar extends React.Component {
                 style={{ color: '#0082fb', cursor: 'pointer', fontSize: 16 }}
               />
             </Tooltip>
-          </Col>
+          </Col> */}
-
+          <Col span={12}>
-          <Col span={10}>
             {this.state.requestData.fclass == '0' && (
               <span>
                 <Button
@@ -365,7 +339,7 @@ export class TopBar extends React.Component {
                   }}
                 >
                   {getLabel(547313, labelData)}
-                </Button>
+                </Button>{' '}
               </span>
             )}
 

src/pages/company.jsx

@@ -351,10 +351,6 @@ export default function companyPage() {
    */
   const handleExport = (type) => {
     if (type == 'png') {
-      const hiddenElements = document.querySelectorAll('.tooltitle');
-      const hiddenElementsArray = Array.from(hiddenElements);
-      // 从 DOM 中移除隐藏内容
-      hiddenElementsArray.forEach((el) => (el.style.display = 'none'));
       orgChart && orgChart.exportImg({ full: true });
     } else {
       orgChart && downloadPdf(orgChart);
@@ -375,8 +371,6 @@ export default function companyPage() {
       hidedept: '0',
     };
     topbar.handleFormChange({ ...resetParams });
-    //根节点初始化
-    topbar.handleTreeData([], timeline.id);
     topbar.getNodeTreeNode(
       `/api/bs/hrmorganization/orgchart/getSubCompanyTree?fclass=${fclass}&id=${timeline.id}`,
       false,
@@ -496,7 +490,6 @@ export default function companyPage() {
             timeLineSearch(timeline);
           }}
           url={'/api/bs/hrmorganization/orgchart/timeLines?fclass=0'}
-          labelData={labelData}
         />
         <Spin size="large" spinning={spinning}>
           <OrgChartComponent

src/pages/user.jsx

@@ -99,7 +99,7 @@ export default function userPage() {
   // 获取数据
   useEffect(() => {
     document.cookie =
-      'ecology_JSessionid=aaaLiDqzA0rZHgPBdxGez; JSESSIONID=aaaLiDqzA0rZHgPBdxGez; Systemlanguid=7; languageidweaver=7; loginuuids=1; loginidweaver=sysadmin; __randcode__=7b9b3b9b-a780-4d6a-b8d5-22d0f8aaf11a';
+      'ecology_JSessionid=aaa5JLqrHUV6R9P1cmTbz; JSESSIONID=aaa5JLqrHUV6R9P1cmTbz; loginuuids=1; languageidweaver=7; Systemlanguid=7; loginidweaver=sysadmin; __randcode__=72a0b641-7599-4301-a47f-61620f350ec5';
     d3.json(
       '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0',
     ).then((data) => {