diff --git a/.umirc.ts b/.umirc.ts index 02b7fc6..560592f 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -2,7 +2,7 @@ * @Author: Chengliang 1546584672@qq.com * @Date: 2022-08-04 10:22:55 * @LastEditors: Chengliang 1546584672@qq.com - * @LastEditTime: 2023-05-23 15:18:17 + * @LastEditTime: 2023-06-08 13:50:33 * @FilePath: /org-chart-frant/.umirc.ts * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -20,13 +20,14 @@ export default defineConfig({ routes: [ { path: '/user', component: '@/pages/user' }, { path: '/company', component: '@/pages/company' }, + { path: '/chart', component: '@/pages/chart' }, ], fastRefresh: {}, antd: {}, proxy: { '/api': { // 标识需要进行转换的请求的url - target: 'http://127.0.0.1:8686/api', // 服务端域名 / http://localhost:8686 + target: 'http://10.21.122.33/api', // 服务端域名 / http://localhost:8686 changeOrigin: true, // 允许域名进行转换 pathRewrite: { '^/api': '' }, // 将请求url里的ci去掉 }, diff --git a/dist.zip b/dist.zip index 7397789..b489cd2 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/package.json b/package.json index 7f0d301..0f353d9 100644 --- a/package.json +++ b/package.json @@ -20,16 +20,20 @@ ] }, "dependencies": { - "@ant-design/pro-layout": "^6.5.0", + "@ant-design/pro-layout": "^7.14.3", "@types/d3": "^7.4.0", + "antd": "^5.5.2", "d3": "7.4.4", "d3-org-chart": "2.6.0", + "es": "^0.8.0", "jspdf": "^2.5.1", "moment": "^2.29.3", "qs": "^6.11.0", "react": "17.x", "react-dom": "17.x", - "umi": "^3.5.26" + "umi": "^3.5.26", + "watermark-component-for-react": "^1.0.0", + "watermark-dom": "^2.3.0" }, "devDependencies": { "@types/react": "^17.0.0", diff --git a/public/img/company/level1.png b/public/img/company/level1.png index 2c33e84..4d2a63d 100644 Binary files a/public/img/company/level1.png and b/public/img/company/level1.png differ diff --git a/public/img/company/level2.png b/public/img/company/level2.png index d89175a..2ab4d3c 100644 Binary files a/public/img/company/level2.png and b/public/img/company/level2.png differ diff --git a/public/img/company/level3.png b/public/img/company/level3.png index 2e37486..e655097 100644 Binary files a/public/img/company/level3.png and b/public/img/company/level3.png differ diff --git a/public/img/company/level4.png b/public/img/company/level4.png index e249512..06947e4 100644 Binary files a/public/img/company/level4.png and b/public/img/company/level4.png differ diff --git a/public/img/company/level5.png b/public/img/company/level5.png index c93f9e1..e77017a 100644 Binary files a/public/img/company/level5.png and b/public/img/company/level5.png differ diff --git a/public/img/company/level6.png b/public/img/company/level6.png index e910445..6be044f 100644 Binary files a/public/img/company/level6.png and b/public/img/company/level6.png differ diff --git a/public/img/company/level7.png b/public/img/company/level7.png index 5b2def4..0d164b5 100644 Binary files a/public/img/company/level7.png and b/public/img/company/level7.png differ diff --git a/public/img/company/level8.png b/public/img/company/level8.png index 2a7ca55..e2041c7 100644 Binary files a/public/img/company/level8.png and b/public/img/company/level8.png differ diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx index d0aab66..24b3c16 100644 --- a/src/components/topBar/index.jsx +++ b/src/components/topBar/index.jsx @@ -134,7 +134,7 @@ export class TopBar extends React.Component { style={{ width: 150 }} locale={locale} allowClear={false} - disabledDate={this.disabledDate} + //disabledDate={this.disabledDate} defaultValue={moment(new Date())} value={ this.state.requestData.date && this.state.requestData.date != '' @@ -152,6 +152,7 @@ export class TopBar extends React.Component { 部门： 查询 + - + diff --git a/src/pages/chart.jsx b/src/pages/chart.jsx new file mode 100644 index 0000000..3f6591c --- /dev/null +++ b/src/pages/chart.jsx @@ -0,0 +1,44 @@ +/* + * @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(''); + + //获取数据 + useEffect(() => { + d3.json('/api/ais/orgChart/chartData').then((res) => { + setUrl(res.data.url); + setWatermark(res.data.watermark); + }); + }, [true]); + + return ( + <> + +
+ +
+ + + ); +} diff --git a/src/pages/company.jsx b/src/pages/company.jsx index 3ef0de3..020bf07 100644 --- a/src/pages/company.jsx +++ b/src/pages/company.jsx @@ -8,6 +8,7 @@ import jsPDF from 'jspdf'; import moment from 'moment'; import qs from 'qs'; import { message, Tooltip } from 'antd'; +import WaterMark from 'watermark-component-for-react'; let active = 'top'; export default function companyPage() { @@ -16,6 +17,7 @@ export default function companyPage() { let orgChart = null; let topBarSearchRequest = null; const [hasRight, setHasRight] = useState(''); + const [watermark, setWatermark] = useState(''); // 点击节点 function onNodeClick(nodeId) {} @@ -33,20 +35,10 @@ export default function companyPage() { return; } let idsStr = idsList.join(','); - let api = ''; - if (topBarSearchRequest) { - let request = { ...topBarSearchRequest, ids: idsStr }; - api = - '/api/ais/orgChart/asyncCompanyData' + - qs.stringify(request, { addQueryPrefix: true }); - } else { - api = - '/api/ais/orgChart/asyncCompanyData?level=0&date=' + - moment(new Date()).format('YYYY-MM-DD') + - '&ids=' + - idsStr; - } - + let request = { ...topBarSearchRequest, ids: idsStr }; + let api = + '/api/ais/orgChart/asyncCompanyData' + + qs.stringify(request, { addQueryPrefix: true }); fetch(api) .then((res) => res.json()) .then((resp) => { @@ -92,6 +84,7 @@ export default function companyPage() { moment(new Date()).format('YYYY-MM-DD'), ).then((resp) => { setData(resp.data.data); + setWatermark(resp.data.watermark); setHasRight('true'); }); }, [true]); @@ -322,38 +315,44 @@ export default function companyPage() { return ( hasRight && ( -
- { - handleExport(type); - }} - onSearch={(requestData) => { - handleSearch(requestData); - }} - type="company" - url="/api/ais/orgChart/getSearchCondition" - /> - handleTopLayoutClick(progressBtn)} - onLeftLayoutClick={(progressBtn) => - handleLeftLayoutClick(progressBtn) - } - onZoomOut={(progressBtn) => handleZoomOut(progressBtn)} - 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} - /> -
+ <> +
+ { + handleExport(type); + }} + onSearch={(requestData) => { + handleSearch(requestData); + }} + type="company" + url="/api/ais/orgChart/getSearchCondition" + /> + + + handleTopLayoutClick(progressBtn) + } + onLeftLayoutClick={(progressBtn) => + handleLeftLayoutClick(progressBtn) + } + onZoomOut={(progressBtn) => handleZoomOut(progressBtn)} + 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} + /> + +
+ ) ); } diff --git a/src/pages/index.less b/src/pages/index.less index 04f4d5d..c15b568 100644 --- a/src/pages/index.less +++ b/src/pages/index.less @@ -9,3 +9,7 @@ .contentWrapper { background-color: #f7f9fd; } + +.chartContainer { + width: 100%; +} diff --git a/src/pages/user.jsx b/src/pages/user.jsx index 88e9975..c1433c6 100644 --- a/src/pages/user.jsx +++ b/src/pages/user.jsx @@ -87,7 +87,7 @@ export default function userPage() { // 获取数据 useEffect(() => { document.cookie = - 'ecology_JSessionid=aaaWkjP1eWxafe-9oLVHy; JSESSIONID=aaaWkjP1eWxafe-9oLVHy; Systemlanguid=7; languageidweaver=7; loginidweaver=sysadmin; loginuuids=1; __randcode__=7dbeb514-9ed0-45cd-b615-ee71d20de8ba'; + '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'; d3.json( // "/user/data" '/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' +