diff --git a/dist.zip b/dist.zip
index b489cd2..4b26370 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/package.json b/package.json
index 0f353d9..1d55f0c 100644
--- a/package.json
+++ b/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",
diff --git a/src/pages/chart.jsx b/src/pages/chart.jsx
index 3f6591c..60af27c 100644
--- a/src/pages/chart.jsx
+++ b/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() {
- const [url, setUrl] = useState('');
- const [watermark, setWatermark] = useState('');
+export default function chartPage() {
+ const [url, setUrl] = 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 && (
+ <>
+
+
+
+
+
+ >
+ )
);
}
diff --git a/src/pages/company.jsx b/src/pages/company.jsx
index 020bf07..d7237c3 100644
--- a/src/pages/company.jsx
+++ b/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 }) => {
diff --git a/src/pages/user.jsx b/src/pages/user.jsx
index c1433c6..d356915 100644
--- a/src/pages/user.jsx
+++ b/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=' +