diff --git a/dist.zip b/dist.zip index dd4f3fc..ba1ce0d 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/pages/company.jsx b/src/pages/company.jsx index c2fa5d1..4606c14 100644 --- a/src/pages/company.jsx +++ b/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)} /> - (orgChart = chart)} - setClick={(click) => (addNodeChildFunc = click)} - onNodeClick={onNodeClick} - data={data} - onButtonClick={onButtonClick} - buttonContent={buttonContentRender} - nodeWidth={nodeWidthRender} - nodeHeight={nodeHeightRender} - nodeContent={nodeContentRender} - /> + + (orgChart = chart)} + setClick={(click) => (addNodeChildFunc = click)} + onNodeClick={onNodeClick} + data={data} + onButtonClick={onButtonClick} + buttonContent={buttonContentRender} + nodeWidth={nodeWidthRender} + nodeHeight={nodeHeightRender} + nodeContent={nodeContentRender} + /> + diff --git a/src/pages/user.jsx b/src/pages/user.jsx index 075628c..cfaf50f 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=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=' +