diff --git a/src/components/drawer/index.jsx b/src/components/drawer/index.jsx index fe287ce..b619005 100644 --- a/src/components/drawer/index.jsx +++ b/src/components/drawer/index.jsx @@ -34,7 +34,7 @@ export default class DrawerComponents extends React.Component { dataSource: [], columns: [], spinning: true, - showJob: false, + showJob: true, defaultTypeValue: ['isBelongTo'], defaultStatusValue: [0, 1, 2, 3], disabled: false, @@ -81,7 +81,6 @@ export default class DrawerComponents extends React.Component { '/api/bs/hrmorganization/orgchart/getDepartmentDetail?' + qs.stringify({ detauleType: type, ...params, showJob }), ).then((data) => { - // if (type == 'chart') { this.setState({ data: data.data, spinning: false }); } else { @@ -245,6 +244,7 @@ export default class DrawerComponents extends React.Component { */ nodeContentRender = (d, i, arr, state) => { const { labelData } = this.props; + let bkStyle = d.data.keyJob == 0 ? 'none' : 'block'; if (d.data.ftype == 2) { return `
@@ -271,6 +271,7 @@ export default class DrawerComponents extends React.Component { d.data.fonjob } ${getLabel(547525, labelData)}
+ @@ -292,6 +293,12 @@ export default class DrawerComponents extends React.Component { d.data.fonjob } ${getLabel(547525, labelData)} +
+
是否关键岗:${ + d.data.keyJob == 0 ? '否' : '是' + }
+
backup人员:${d.data.bkPerson}
+
`; @@ -335,7 +342,7 @@ export default class DrawerComponents extends React.Component { typeValue: defaultTypeValue.join(','), statusValue: defaultStatusValue.join(','), }; - this.getDeatilDatas(params, 'chart', '0'); + this.getDeatilDatas(params, 'chart', '1'); this.setState({ open: true, params: params }); }; @@ -343,7 +350,7 @@ export default class DrawerComponents extends React.Component { this.setState({ open: false, detailType: 'chart', - showJob: false, + showJob: true, defaultStatusValue: [0, 1, 2, 3], defaultTypeValue: ['isBelongTo'], disabled: false, @@ -461,6 +468,7 @@ export default class DrawerComponents extends React.Component { checked={showJob} disabled={disabled} onChange={(e) => { + debugger; this.setState({ showJob: e.target.checked, }); diff --git a/src/pages/user.jsx b/src/pages/user.jsx index e2c91e3..bdd892c 100644 --- a/src/pages/user.jsx +++ b/src/pages/user.jsx @@ -99,7 +99,7 @@ export default function userPage() { // 获取数据 useEffect(() => { 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( '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0', ).then((data) => {