异步查询，日期条件修复

src/components/topBar/index.jsx

@@ -23,6 +23,7 @@ export class TopBar extends React.Component {
       deptartmentTreeData: [], //部门异步树
       treeExpandedKeys: [],
       levelOptions: [], //层级数据，hrm中层级字段
+      butvisable: true,
       requestData: {
         date: moment(new Date()).format('YYYY-MM-DD'), //日期
         department: undefined,
@@ -75,7 +76,7 @@ export class TopBar extends React.Component {
 
   onDepartmentChange = (value) => {
     let requestData = { ...this.state.requestData, department: value };
-    this.setState({ departmentData: value, requestData });
+    this.setState({ requestData });
   };
 
   paramsUtil = (param) => {
@@ -99,6 +100,7 @@ export class TopBar extends React.Component {
           this.setState({
             levelOptions: data.data.deptLevel,
             deptartmentTreeData: data.data.deptTree,
+            butvisable: data.data.hasRight,
           });
         }
       });
@@ -162,7 +164,7 @@ export class TopBar extends React.Component {
               treeData={deptartmentTreeData}
             />
           </Col>
-          <Col span={6}>
+          {/* <Col span={6}>
             部门层级：
             <Select
               style={{ width: 130 }}
@@ -170,7 +172,7 @@ export class TopBar extends React.Component {
               onChange={(value) => this.handleFormChange({ level: value })}
               options={this.state.levelOptions}
             />
-          </Col>
+          </Col> */}
           <Col span={6}>
             <Button
               type="primary"
@@ -188,11 +190,13 @@ export class TopBar extends React.Component {
                 window.open('#/chart', '_blank');
               }}
             >
-              图谱
+              任命架构图
             </Button>
+            {this.state.butvisable && (
               <Dropdown overlay={this.menu}>
                 <Button type="primary">导出</Button>
               </Dropdown>
+            )}
           </Col>
         </Row>
       </div>

src/pages/chart.jsx

@@ -7,7 +7,7 @@ import WaterMark from 'watermark-component-for-react';
 
 export default function chartPage() {
   const [url, setUrl] = useState();
-  const [hasRight, setHasRight] = useState('');
+  const [hasRight, setHasRight] = useState('true');
   const [watermark, setWatermark] = useState();
 
   //获取数据
@@ -25,10 +25,10 @@ export default function chartPage() {
         <WaterMark content={watermark} font="20px Microsoft Yahei">
           <div className={styles.chartContainer}>
             <Image
-              width="100%"
               src={url}
               preview={false}
-              //src="https://img.xqppt.com/uploads/docx/22329/images/image1.jpg"
+              //src={page}
+              height={'100vh'}
             />
           </div>
         </WaterMark>

src/pages/company.jsx

@@ -7,10 +7,12 @@ import ToolBar from '../components/toolBar';
 import jsPDF from 'jspdf';
 import moment from 'moment';
 import qs from 'qs';
-import { message } from 'antd';
+import { message, Spin } from 'antd';
 import WaterMark from 'watermark-component-for-react';
 
 let active = 'top';
+let orgChart = null;
+
 export default function companyPage() {
   const [data, setData] = useState(null);
   let addNodeChildFunc = null;
@@ -18,6 +20,7 @@ export default function companyPage() {
   let topBarSearchRequest = useRef({});
   const [hasRight, setHasRight] = useState('');
   const [watermark, setWatermark] = useState('');
+  const [loading, setLoading] = useState('');
 
   // 点击节点
   function onNodeClick(nodeId) {}
@@ -155,7 +158,7 @@ export default function companyPage() {
     } else if (d.data.ftype == 2) {
       let one = d.data.leader == '' ? 'none' : 'inline-block';
       let three = d.data.deputyLeader == '' ? 'none' : 'inline-block';
-      let two = d.data.header == '' ? 'none' : 'block';
+      let two = d.data.header == '' ? 'none' : 'inline-block';
       return `
         <div style="width: 100%; height: 100%; background-size: 100% 100%;" >
           <div style='position:absolute;height:100%'>
@@ -173,12 +176,10 @@ export default function companyPage() {
             <div style="width: 130px;margin: 0 auto;line-height: 18px;display:${two}">分管领导：${
         d.data.header
       } </div>
-            <div style="width: 120px;margin: 0 auto;line-height: 18px;>
-            <span style="display:${one}">${
-        d.data.leader
-      }</span><span style="display:${three}"> &nbsp;|| ${
-        d.data.deputyLeader
-      }</span></div>
+           <div style="width: 120px;margin: 0 auto;line-height: 18px;">
+             <p style="display:${one}">${d.data.leader}</p>
+             <p style="display:${three}"> &nbsp;|| ${d.data.deputyLeader}</p>
+           </div>
         </div>
         </div>
         `;
@@ -267,6 +268,7 @@ export default function companyPage() {
   };
 
   const handleSearch = (requestData) => {
+    setLoading(true);
     topBarSearchRequest.current = requestData;
     let api =
       '/api/ais/orgChart/companyData' +
@@ -280,6 +282,9 @@ export default function companyPage() {
             message.warning('暂无数据');
           } else {
             setData(resp.data.data);
+            setTimeout(function () {
+              setLoading(false);
+            }, 1000);
           }
         }
       });
@@ -339,6 +344,7 @@ export default function companyPage() {
               onZoomIn={(progressBtn) => handleZoomIn(progressBtn)}
               onZoomBehavior={(value) => handleZoomBehavior(value)}
             />
+            <Spin spinning={loading} tip="页面加载中 请稍候">
               <OrgChartComponent
                 setChart={(chart) => (orgChart = chart)}
                 setClick={(click) => (addNodeChildFunc = click)}
@@ -350,6 +356,7 @@ export default function companyPage() {
                 nodeHeight={nodeHeightRender}
                 nodeContent={nodeContentRender}
               />
+            </Spin>
           </WaterMark>
         </div>
       </>

src/pages/index.less

@@ -1,3 +1,11 @@
+/*
+ * @Author: Chengliang 1546584672@qq.com
+ * @Date: 2023-08-08 17:38:47
+ * @LastEditors: Chengliang 1546584672@qq.com
+ * @LastEditTime: 2023-08-09 14:38:52
+ * @FilePath: /org-chart-frant/src/pages/index.less
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AEmax
+ */
 .title {
   background: rgb(121, 242, 157);
 }
@@ -11,5 +19,5 @@
 }
 
 .chartContainer {
-  width: 100%;
+  text-align: center;
 }

src/pages/user.jsx

@@ -87,7 +87,7 @@ export default function userPage() {
   // 获取数据
   useEffect(() => {
     document.cookie =
-      '33_ecology_JSessionid=aaa-86YwPw671co9NOKIy; ecology_JSessionid=aaa-86YwPw671co9NOKIy; Systemlanguid=7; languageidweaver=7; JSESSIONID=aaa-86YwPw671co9NOKIy; loginuuids=1; CASTGC=TGT-48-lHCAbEDfdJkcC7xyZ6S5BHpVJqKfYgMPoezM2bBBmyrCYyCLOc-c01; loginidweaver=1; __randcode__=5a256767-7b8d-46e3-98ca-bb4ac7a509eb';
+      '33_ecology_JSessionid=aaaa-IcPBu61A7ZrtCyLy; JSESSIONID=aaaa-IcPBu61A7ZrtCyLy; ecology_JSessionid=aaaa-IcPBu61A7ZrtCyLy; Systemlanguid=7; languageidweaver=7; loginuuids=1; loginidweaver=sysadmin; CASTGC=TGT-1-H9KSLsgcxVxv1DacS9ONFSR2Ajb3nkZDho15XOOnoAtQN4ypIb-c01';
     d3.json(
       // "/user/data"
       '/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' +