From 4a630310f59e9e2fe321d9e56c3f8b46523d03e5 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 23 Dec 2024 11:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC=E5=A2=9E=E5=8A=A0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/timeline/index.jsx  | 27 ++++++++++++++++++++++++---
 src/components/timeline/index.less |  5 +++++
 src/pages/company.jsx              |  5 +----
 src/pages/user.jsx                 |  2 +-
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/components/timeline/index.jsx b/src/components/timeline/index.jsx
index 3c2bbb6..b5267de 100644
--- a/src/components/timeline/index.jsx
+++ b/src/components/timeline/index.jsx
@@ -7,7 +7,7 @@
  * @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, Popconfirm, message, Input } from 'antd';
 import styles from './index.less';
 import leftTreeShow from './img/leftTree-show.png';
 import leftHide from './img/leftTree-hide.png';
@@ -20,6 +20,8 @@ export default class TimeLine extends React.Component {
     this.state = {
       timelineList: [],
       open: true,
+      timeName: '',
+      fclass: 0,
     };
   }
 
@@ -53,10 +55,16 @@ export default class TimeLine extends React.Component {
   }
 
   componentDidMount() {
-    this.searchTimeLines(this.props.url);
+    this.searchTimeLines();
   }
 
-  searchTimeLines(url) {
+  searchTimeLines(fclass = 0) {
+    const { timeName } = this.state;
+    this.setState({ fclass: fclass });
+    if (fclass != 0) {
+      this.setState({ timeName: '' });
+    }
+    let url = `/api/bs/hrmorganization/orgchart/timeLines?fclass=${fclass}&timeName=${timeName}`;
     fetch(url)
       .then((res) => res.json())
       .then((data) => {
@@ -72,6 +80,13 @@ export default class TimeLine extends React.Component {
     });
   };
 
+  handleEnterPress = (e) => {
+    if (e.key === 'Enter') {
+      // 当按下回车键时触发搜索操作
+      this.searchTimeLines(this.state.fclass);
+    }
+  };
+
   render() {
     const { labelData } = this.props;
 
@@ -103,6 +118,12 @@ export default class TimeLine extends React.Component {
           onClick={this.setOpen}
         ></div>
         <div className={styles.lineWrapper} style={showStyle}>
+          <Input
+            placeholder="关键字搜索"
+            value={this.state.timeName}
+            onChange={(e) => this.setState({ timeName: e.target.value })}
+            onKeyDown={this.handleEnterPress} // 监听回车键事件
+          />
           <Timeline>
             {this.state.timelineList.map((item) => {
               return (
diff --git a/src/components/timeline/index.less b/src/components/timeline/index.less
index 32e977f..0f2f0d2 100644
--- a/src/components/timeline/index.less
+++ b/src/components/timeline/index.less
@@ -10,6 +10,11 @@
   padding-top: 20px;
   padding-bottom: 20px;
   padding-left: 20px;
+  padding-right: 5px;
+
+  input {
+    margin-bottom: 20px;
+  }
 
   .timeline {
     cursor: pointer;
diff --git a/src/pages/company.jsx b/src/pages/company.jsx
index ae7a4cd..64ad3f4 100644
--- a/src/pages/company.jsx
+++ b/src/pages/company.jsx
@@ -421,9 +421,7 @@ export default function companyPage() {
    */
   const handleChange = (requestData) => {
     setTimelineId(0);
-    timeLine.searchTimeLines(
-      `/api/bs/hrmorganization/orgchart/timeLines?fclass=${requestData.fclass}`,
-    );
+    timeLine.searchTimeLines(requestData.fclass);
     requestData = { ...requestData, id: 0 };
     handleSearch(requestData, false);
   };
@@ -495,7 +493,6 @@ export default function companyPage() {
           onClick={(timeline) => {
             timeLineSearch(timeline);
           }}
-          url={'/api/bs/hrmorganization/orgchart/timeLines?fclass=0'}
           labelData={labelData}
         />
         <Spin size="large" spinning={spinning}>
diff --git a/src/pages/user.jsx b/src/pages/user.jsx
index f037581..121dbd8 100644
--- a/src/pages/user.jsx
+++ b/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=aaaimqoOmNl-h8fHABnpz; JSESSIONID=aaaimqoOmNl-h8fHABnpz; Systemlanguid=7; languageidweaver=7; loginuuids=1; loginidweaver=sysadmin; __randcode__=f58cd90c-d187-4c90-bd38-0981bf5232e0';
     d3.json(
       '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0',
     ).then((data) => {