亚信修改

src/pages/company.jsx

@@ -7,17 +7,19 @@ 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;
-  let orgChart = null;
   let topBarSearchRequest = null;
   const [hasRight, setHasRight] = useState('');
   const [watermark, setWatermark] = useState('');
+  const [loading, setLoading] = useState('');
 
   // 点击节点
   function onNodeClick(nodeId) {}
@@ -265,6 +267,7 @@ export default function companyPage() {
   };
 
   const handleSearch = (requestData) => {
+    setLoading(true);
     topBarSearchRequest = requestData;
     let api =
       '/api/ais/orgChart/companyData' +
@@ -278,6 +281,9 @@ export default function companyPage() {
             message.warning('暂无数据');
           } else {
             setData(resp.data.data);
+            setTimeout(function () {
+              setLoading(false);
+            }, 1000);
           }
         }
       });
@@ -337,17 +343,19 @@ export default function companyPage() {
               onZoomIn={(progressBtn) => handleZoomIn(progressBtn)}
               onZoomBehavior={(value) => handleZoomBehavior(value)}
             />
-            <OrgChartComponent
+            <Spin spinning={loading} tip="页面加载中 请稍候">
-              setChart={(chart) => (orgChart = chart)}
+              <OrgChartComponent
-              setClick={(click) => (addNodeChildFunc = click)}
+                setChart={(chart) => (orgChart = chart)}
-              onNodeClick={onNodeClick}
+                setClick={(click) => (addNodeChildFunc = click)}
-              data={data}
+                onNodeClick={onNodeClick}
-              onButtonClick={onButtonClick}
+                data={data}
-              buttonContent={buttonContentRender}
+                onButtonClick={onButtonClick}
-              nodeWidth={nodeWidthRender}
+                buttonContent={buttonContentRender}
-              nodeHeight={nodeHeightRender}
+                nodeWidth={nodeWidthRender}
-              nodeContent={nodeContentRender}
+                nodeHeight={nodeHeightRender}
-            />
+                nodeContent={nodeContentRender}
+              />
+            </Spin>
           </WaterMark>
         </div>
       </>

src/pages/user.jsx

@@ -87,7 +87,7 @@ export default function userPage() {
   // 获取数据
   useEffect(() => {
     document.cookie =
-      '33_ecology_JSessionid=aaaB2ipClrImrf_cwBwJy; JSESSIONID=aaaB2ipClrImrf_cwBwJy; ecology_JSessionid=aaaB2ipClrImrf_cwBwJy; Systemlanguid=7; languageidweaver=7; loginuuids=2761; CASTGC=TGT-8-SejF5mLWvSQwjKm9DlNGjlcpdvfcbm4uevY6qWcYinoneozleM-c01; loginidweaver=2761; __randcode__=60a5a6ab-4d49-4e14-a360-3660fb0bde4d';
+      '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=' +