组织架构图变动修复

package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "@ant-design/pro-layout": "^7.14.3",
     "@types/d3": "^7.4.0",
-    "antd": "^5.5.2",
+    "antd": "^4.5.2",
     "d3": "7.4.4",
     "d3-org-chart": "2.6.0",
     "es": "^0.8.0",

src/pages/chart.jsx

@@ -1,44 +1,38 @@
-/*
- * @Author: Chengliang 1546584672@qq.com
- * @Date: 2023-06-08 13:52:38
- * @LastEditors: Chengliang 1546584672@qq.com
- * @LastEditTime: 2023-06-08 19:21:18
- * @FilePath: /org-chart-frant/src/pages/chart.jsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import React, { useEffect, useState } from 'react';
-import qs from 'qs';
 import * as d3 from 'd3';
 import styles from './index.less';
 import { Image } from 'antd';
 
 import WaterMark from 'watermark-component-for-react';
 
-export default function companyPage() {
+export default function chartPage() {
-  const [url, setUrl] = useState('');
+  const [url, setUrl] = useState();
-  const [watermark, setWatermark] = useState('');
+  const [hasRight, setHasRight] = useState('');
+  const [watermark, setWatermark] = useState();
 
   //获取数据
   useEffect(() => {
     d3.json('/api/ais/orgChart/chartData').then((res) => {
-      setUrl(res.data.url);
       setWatermark(res.data.watermark);
+      setUrl(res.data.url);
+      setHasRight('true');
     });
-  }, [true]);
+  }, []);
 
   return (
-    <>
+    hasRight && (
-      <WaterMark content={watermark} font="20px Microsoft Yahei">
+      <>
-        <div className={styles.chartContainer}>
+        <WaterMark content={watermark} font="20px Microsoft Yahei">
-          <Image
+          <div className={styles.chartContainer}>
-            width="100%"
+            <Image
-            src={url}
+              width="100%"
-            preview={{
+              src={url}
-              src: { url },
+              preview={false}
-            }}
+              //src="https://img.xqppt.com/uploads/docx/22329/images/image1.jpg"
-          />
+            />
-        </div>
+          </div>
-      </WaterMark>
+        </WaterMark>
-    </>
+      </>
+    )
   );
 }

src/pages/company.jsx

@@ -7,7 +7,7 @@ import ToolBar from '../components/toolBar';
 import jsPDF from 'jspdf';
 import moment from 'moment';
 import qs from 'qs';
-import { message, Tooltip } from 'antd';
+import { message } from 'antd';
 import WaterMark from 'watermark-component-for-react';
 
 let active = 'top';
@@ -87,7 +87,7 @@ export default function companyPage() {
       setWatermark(resp.data.watermark);
       setHasRight('true');
     });
-  }, [true]);
+  }, []);
 
   // ButtonContent渲染
   const buttonContentRender = ({ node, state }) => {

src/pages/user.jsx

@@ -87,7 +87,7 @@ export default function userPage() {
   // 获取数据
   useEffect(() => {
     document.cookie =
-      '33_ecology_JSessionid=aaaSwPJSYdnnPeJLLTAIy; JSESSIONID=aaaSwPJSYdnnPeJLLTAIy; ecology_JSessionid=aaaSwPJSYdnnPeJLLTAIy; Systemlanguid=7; languageidweaver=7; loginuuids=1; CASTGC=TGT-24-bAecNfLfcApkHgVJI4eBDeMPZKszmMQ2zOE77onyUqE7WlUveN-c01; loginidweaver=1; __randcode__=90e4fc5f-84d7-436b-8123-d6db388371bf';
+      '33_ecology_JSessionid=aaaSwPJSYdnnPeJLLTAIy; JSESSIONID=aaaSwPJSYdnnPeJLLTAIy; ecology_JSessionid=aaaSwPJSYdnnPeJLLTAIy; Systemlanguid=7; languageidweaver=7; loginuuids=1; CASTGC=TGT-24-bAecNfLfcApkHgVJI4eBDeMPZKszmMQ2zOE77onyUqE7WlUveN-c01; loginidweaver=1; __randcode__=0f746c2d-db39-47ed-9521-83c8db7fa71b';
     d3.json(
       // "/user/data"
       '/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' +