Compare commits

...

2 Commits

Binary file not shown.

@ -34,7 +34,7 @@ export default class DrawerComponents extends React.Component {
dataSource: [], dataSource: [],
columns: [], columns: [],
spinning: true, spinning: true,
showJob: false, showJob: true,
defaultTypeValue: ['isBelongTo'], defaultTypeValue: ['isBelongTo'],
defaultStatusValue: [0, 1, 2, 3], defaultStatusValue: [0, 1, 2, 3],
disabled: false, disabled: false,
@ -81,7 +81,6 @@ export default class DrawerComponents extends React.Component {
'/api/bs/hrmorganization/orgchart/getDepartmentDetail?' + '/api/bs/hrmorganization/orgchart/getDepartmentDetail?' +
qs.stringify({ detauleType: type, ...params, showJob }), qs.stringify({ detauleType: type, ...params, showJob }),
).then((data) => { ).then((data) => {
//
if (type == 'chart') { if (type == 'chart') {
this.setState({ data: data.data, spinning: false }); this.setState({ data: data.data, spinning: false });
} else { } else {
@ -245,6 +244,7 @@ export default class DrawerComponents extends React.Component {
*/ */
nodeContentRender = (d, i, arr, state) => { nodeContentRender = (d, i, arr, state) => {
const { labelData } = this.props; const { labelData } = this.props;
let bkStyle = d.data.keyJob == 0 ? 'none' : 'block';
if (d.data.ftype == 2) { if (d.data.ftype == 2) {
return `<div style="position: relative;"> return `<div style="position: relative;">
@ -271,6 +271,7 @@ export default class DrawerComponents extends React.Component {
d.data.fonjob d.data.fonjob
} ${getLabel(547525, labelData)} } ${getLabel(547525, labelData)}
</div> </div>
</div> </div>
</div> </div>
@ -292,6 +293,12 @@ export default class DrawerComponents extends React.Component {
d.data.fonjob d.data.fonjob
} ${getLabel(547525, labelData)}</span> } ${getLabel(547525, labelData)}</span>
</div> </div>
<div style="display: ${bkStyle}">
<div>是否关键岗${
d.data.keyJob == 0 ? '否' : '是'
}</div>
<div>backup人员${d.data.bkPerson}</div>
</div>
</div> </div>
</div> </div>
</div>`; </div>`;
@ -335,7 +342,7 @@ export default class DrawerComponents extends React.Component {
typeValue: defaultTypeValue.join(','), typeValue: defaultTypeValue.join(','),
statusValue: defaultStatusValue.join(','), statusValue: defaultStatusValue.join(','),
}; };
this.getDeatilDatas(params, 'chart', '0'); this.getDeatilDatas(params, 'chart', '1');
this.setState({ open: true, params: params }); this.setState({ open: true, params: params });
}; };
@ -343,7 +350,7 @@ export default class DrawerComponents extends React.Component {
this.setState({ this.setState({
open: false, open: false,
detailType: 'chart', detailType: 'chart',
showJob: false, showJob: true,
defaultStatusValue: [0, 1, 2, 3], defaultStatusValue: [0, 1, 2, 3],
defaultTypeValue: ['isBelongTo'], defaultTypeValue: ['isBelongTo'],
disabled: false, disabled: false,
@ -367,6 +374,7 @@ export default class DrawerComponents extends React.Component {
}; };
onStatusChange = (checkedValues) => { onStatusChange = (checkedValues) => {
const { labelData } = this.props;
if (checkedValues.length === 0) { if (checkedValues.length === 0) {
return message.error(`${getLabel(547728, labelData)}`, 2); return message.error(`${getLabel(547728, labelData)}`, 2);
} }
@ -384,6 +392,7 @@ export default class DrawerComponents extends React.Component {
}; };
onTypeChange = (checkedValues) => { onTypeChange = (checkedValues) => {
const { labelData } = this.props;
if (this.state.showJob) { if (this.state.showJob) {
return message.error(`${getLabel(547729, labelData)}`, 2); return message.error(`${getLabel(547729, labelData)}`, 2);
} }
@ -461,6 +470,7 @@ export default class DrawerComponents extends React.Component {
checked={showJob} checked={showJob}
disabled={disabled} disabled={disabled}
onChange={(e) => { onChange={(e) => {
debugger;
this.setState({ this.setState({
showJob: e.target.checked, showJob: e.target.checked,
}); });

@ -99,7 +99,7 @@ export default function userPage() {
// //
useEffect(() => { useEffect(() => {
document.cookie = document.cookie =
'ecology_JSessionid=aaav03Zyuvq3A9TG0PEdz; JSESSIONID=aaav03Zyuvq3A9TG0PEdz; Systemlanguid=7; languageidweaver=7; loginuuids=1; loginidweaver=sysadmin; __randcode__=62316935-a99b-4cbf-a23f-0ac9c37db0da'; 'ecology_JSessionid=aaaPm-xDlJJ8TfnuUaoiz; JSESSIONID=aaaPm-xDlJJ8TfnuUaoiz; Systemlanguid=7; languageidweaver=7; loginuuids=1; __randcode__=0bceea6f-1b5a-4026-a716-852e0fd9eb32; loginidweaver=sysadmin';
d3.json( d3.json(
'/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0', '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0',
).then((data) => { ).then((data) => {

Loading…
Cancel
Save