feature/ais
Chengliang 2 years ago
parent 393f666dc6
commit 66dd3de27b

Binary file not shown.

@ -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,
@ -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,
}); });
} }
}); });
@ -188,11 +190,13 @@ export class TopBar extends React.Component {
window.open('#/chart', '_blank'); window.open('#/chart', '_blank');
}} }}
> >
任命架构
</Button> </Button>
{this.state.butvisable && (
<Dropdown overlay={this.menu}> <Dropdown overlay={this.menu}>
<Button type="primary">导出</Button> <Button type="primary">导出</Button>
</Dropdown> </Dropdown>
)}
</Col> </Col>
</Row> </Row>
</div> </div>

@ -155,7 +155,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,12 +173,10 @@ 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
}</span></div>
</div> </div>
</div> </div>
`; `;

@ -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=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';
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=' +

Loading…
Cancel
Save