liang.cheng
/
org-chart-frant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

异步查询，日期条件修复

Browse Source
feature/ais
dxfeng 1 year ago
parent 69d8ff5a5d 9919087275
commit 56697c6f8d
5 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File

18
src/components/topBar/index.jsx
Unescape Escape View File

@ -23,6 +23,7 @@ export class TopBar extends React.Component {
deptartmentTreeData: [], //部门异步树 deptartmentTreeData: [], //部门异步树
treeExpandedKeys: [], treeExpandedKeys: [],
levelOptions: [], //层级数据，hrm中层级字段 levelOptions: [], //层级数据，hrm中层级字段
butvisable: true,
requestData: { requestData: {
date: moment(new Date()).format('YYYY-MM-DD'), //日期 date: moment(new Date()).format('YYYY-MM-DD'), //日期
department: undefined, department: undefined,
@ -75,7 +76,7 @@ export class TopBar extends React.Component {
onDepartmentChange = (value) => { onDepartmentChange = (value) => {
let requestData = { ...this.state.requestData, department: value }; let requestData = { ...this.state.requestData, department: value };
this.setState({ departmentData: value, requestData }); this.setState({ requestData });
}; };
paramsUtil = (param) => { paramsUtil = (param) => {
@ -99,6 +100,7 @@ export class TopBar extends React.Component {
this.setState({ this.setState({
levelOptions: data.data.deptLevel, levelOptions: data.data.deptLevel,
deptartmentTreeData: data.data.deptTree, deptartmentTreeData: data.data.deptTree,
butvisable: data.data.hasRight,
}); });
} }
}); });
@ -162,7 +164,7 @@ export class TopBar extends React.Component {
treeData={deptartmentTreeData} treeData={deptartmentTreeData}
/> />
</Col> </Col>
<Col span={6}> {/* <Col span={6}>
部门层级： 部门层级：
<Select <Select
style={{ width: 130 }} style={{ width: 130 }}
@ -170,7 +172,7 @@ export class TopBar extends React.Component {
onChange={(value) => this.handleFormChange({ level: value })} onChange={(value) => this.handleFormChange({ level: value })}
options={this.state.levelOptions} options={this.state.levelOptions}
/> />
</Col> </Col> */}
<Col span={6}> <Col span={6}>
<Button <Button
type="primary" type="primary"
@ -188,11 +190,13 @@ export class TopBar extends React.Component {
window.open('#/chart', '_blank'); window.open('#/chart', '_blank');
}} }}
> >
图谱 任命架构图
</Button> </Button>
<Dropdown overlay={this.menu}> {this.state.butvisable && (
<Button type="primary">导出</Button> <Dropdown overlay={this.menu}>
</Dropdown> <Button type="primary">导出</Button>
</Dropdown>
)}
</Col> </Col>
</Row> </Row>
</div> </div>

6
src/pages/chart.jsx
Unescape Escape View File

@ -7,7 +7,7 @@ import WaterMark from 'watermark-component-for-react';
export default function chartPage() { export default function chartPage() {
const [url, setUrl] = useState(); const [url, setUrl] = useState();
const [hasRight, setHasRight] = useState(''); const [hasRight, setHasRight] = useState('true');
const [watermark, setWatermark] = useState(); const [watermark, setWatermark] = useState();
//获取数据 //获取数据
@ -25,10 +25,10 @@ export default function chartPage() {
<WaterMark content={watermark} font="20px Microsoft Yahei"> <WaterMark content={watermark} font="20px Microsoft Yahei">
<div className={styles.chartContainer}> <div className={styles.chartContainer}>
<Image <Image
width="100%"
src={url} src={url}
preview={false} preview={false}
//src="https://img.xqppt.com/uploads/docx/22329/images/image1.jpg" //src={page}
height={'100vh'}
/> />
</div> </div>
</WaterMark> </WaterMark>

47
src/pages/company.jsx
Unescape Escape View File

@ -7,10 +7,12 @@ import ToolBar from '../components/toolBar';
import jsPDF from 'jspdf'; import jsPDF from 'jspdf';
import moment from 'moment'; import moment from 'moment';
import qs from 'qs'; import qs from 'qs';
import { message } from 'antd'; import { message, Spin } from 'antd';
import WaterMark from 'watermark-component-for-react'; import WaterMark from 'watermark-component-for-react';
let active = 'top'; let active = 'top';
let orgChart = null;
export default function companyPage() { export default function companyPage() {
const [data, setData] = useState(null); const [data, setData] = useState(null);
let addNodeChildFunc = null; let addNodeChildFunc = null;
@ -18,6 +20,7 @@ export default function companyPage() {
let topBarSearchRequest = useRef({}); let topBarSearchRequest = useRef({});
const [hasRight, setHasRight] = useState(''); const [hasRight, setHasRight] = useState('');
const [watermark, setWatermark] = useState(''); const [watermark, setWatermark] = useState('');
const [loading, setLoading] = useState('');
// 点击节点 // 点击节点
function onNodeClick(nodeId) {} function onNodeClick(nodeId) {}
@ -155,7 +158,7 @@ export default function companyPage() {
} else if (d.data.ftype == 2) { } else if (d.data.ftype == 2) {
let one = d.data.leader == '' ? 'none' : 'inline-block'; let one = d.data.leader == '' ? 'none' : 'inline-block';
let three = d.data.deputyLeader == '' ? 'none' : 'inline-block'; let three = d.data.deputyLeader == '' ? 'none' : 'inline-block';
let two = d.data.header == '' ? 'none' : 'block'; let two = d.data.header == '' ? 'none' : 'inline-block';
return ` return `
<div style="width: 100%; height: 100%; background-size: 100% 100%;" > <div style="width: 100%; height: 100%; background-size: 100% 100%;" >
<div style='position:absolute;height:100%'> <div style='position:absolute;height:100%'>
@ -173,13 +176,11 @@ export default function companyPage() {
<div style="width: 130px;margin: 0 auto;line-height: 18px;display:${two}">分管领导：${ <div style="width: 130px;margin: 0 auto;line-height: 18px;display:${two}">分管领导：${
d.data.header d.data.header
} </div> } </div>
<div style="width: 120px;margin: 0 auto;line-height: 18px;> <div style="width: 120px;margin: 0 auto;line-height: 18px;">
<span style="display:${one}">${ <p style="display:${one}">${d.data.leader}</p>
d.data.leader <p style="display:${three}"> &nbsp;|| ${d.data.deputyLeader}</p>
}</span><span style="display:${three}"> &nbsp;|| ${ </div>
d.data.deputyLeader </div>
}</span></div>
</div>
</div> </div>
`; `;
} }
@ -267,6 +268,7 @@ export default function companyPage() {
}; };
const handleSearch = (requestData) => { const handleSearch = (requestData) => {
setLoading(true);
topBarSearchRequest.current = requestData; topBarSearchRequest.current = requestData;
let api = let api =
'/api/ais/orgChart/companyData' + '/api/ais/orgChart/companyData' +
@ -280,6 +282,9 @@ export default function companyPage() {
message.warning('暂无数据'); message.warning('暂无数据');
} else { } else {
setData(resp.data.data); setData(resp.data.data);
setTimeout(function () {
setLoading(false);
}, 1000);
} }
} }
}); });
@ -339,17 +344,19 @@ export default function companyPage() {
onZoomIn={(progressBtn) => handleZoomIn(progressBtn)} onZoomIn={(progressBtn) => handleZoomIn(progressBtn)}
onZoomBehavior={(value) => handleZoomBehavior(value)} 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> </WaterMark>
</div> </div>
</> </>

10
src/pages/index.less
Unescape Escape View File

@ -1,3 +1,11 @@
/*
* @Author: Chengliang 1546584672@qq.com
* @Date: 2023-08-08 17:38:47
* @LastEditors: Chengliang 1546584672@qq.com
* @LastEditTime: 2023-08-09 14:38:52
* @FilePath: /org-chart-frant/src/pages/index.less
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AEmax
*/
.title { .title {
background: rgb(121, 242, 157); background: rgb(121, 242, 157);
} }
@ -11,5 +19,5 @@
} }
.chartContainer { .chartContainer {
width: 100%; text-align: center;
} }

2
src/pages/user.jsx
Unescape Escape View File

@ -87,7 +87,7 @@ export default function userPage() {
// 获取数据 // 获取数据
useEffect(() => { useEffect(() => {
document.cookie = document.cookie =
'33_ecology_JSessionid=aaa-86YwPw671co9NOKIy; ecology_JSessionid=aaa-86YwPw671co9NOKIy; Systemlanguid=7; languageidweaver=7; JSESSIONID=aaa-86YwPw671co9NOKIy; loginuuids=1; CASTGC=TGT-48-lHCAbEDfdJkcC7xyZ6S5BHpVJqKfYgMPoezM2bBBmyrCYyCLOc-c01; loginidweaver=1; __randcode__=5a256767-7b8d-46e3-98ca-bb4ac7a509eb'; '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( d3.json(
// "/user/data" // "/user/data"
'/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' + '/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' +

Write Preview
Loading…
Cancel
Save