diff --git a/public/img/sship/dept0.png b/public/img/sship/dept0.png index 06947e4..378cb76 100644 Binary files a/public/img/sship/dept0.png and b/public/img/sship/dept0.png differ diff --git a/public/img/sship/dept1.png b/public/img/sship/dept1.png index 2ab4d3c..e069312 100644 Binary files a/public/img/sship/dept1.png and b/public/img/sship/dept1.png differ diff --git a/public/img/sship/dept2.png b/public/img/sship/dept2.png index 4d2a63d..ef6f16c 100644 Binary files a/public/img/sship/dept2.png and b/public/img/sship/dept2.png differ diff --git a/public/img/sship/dept3.png b/public/img/sship/dept3.png index e655097..6bb8569 100644 Binary files a/public/img/sship/dept3.png and b/public/img/sship/dept3.png differ diff --git a/public/img/sship/dept4.png b/public/img/sship/dept4.png new file mode 100644 index 0000000..b8d356d Binary files /dev/null and b/public/img/sship/dept4.png differ diff --git a/public/img/sship/dept5.png b/public/img/sship/dept5.png new file mode 100644 index 0000000..7d030d9 Binary files /dev/null and b/public/img/sship/dept5.png differ diff --git a/public/img/sship/dept6.png b/public/img/sship/dept6.png new file mode 100644 index 0000000..c254ebc Binary files /dev/null and b/public/img/sship/dept6.png differ diff --git a/public/img/sship/dept7.png b/public/img/sship/dept7.png new file mode 100644 index 0000000..5ee083b Binary files /dev/null and b/public/img/sship/dept7.png differ diff --git a/public/img/sship/dept8.png b/public/img/sship/dept8.png new file mode 100644 index 0000000..da22f1d Binary files /dev/null and b/public/img/sship/dept8.png differ diff --git a/public/img/sship/dept9.png b/public/img/sship/dept9.png new file mode 100644 index 0000000..455c733 Binary files /dev/null and b/public/img/sship/dept9.png differ diff --git a/src/components/drawer/index.jsx b/src/components/drawer/index.jsx index 9ce616a..762e4a0 100644 --- a/src/components/drawer/index.jsx +++ b/src/components/drawer/index.jsx @@ -38,6 +38,7 @@ export default class DrawerComponents extends React.Component { isModalOpen: false, jobResponsibility: '', personId: '', + jobTitle: '', }; } @@ -46,9 +47,9 @@ export default class DrawerComponents extends React.Component { // 点击节点 onNodeClick = (node) => { if (node.ftype == '4') { - debugger; this.setState({ jobResponsibility: node.jobResponsibility, + jobTitle: node.jobTitle, isModalOpen: true, personId: node.id, }); @@ -79,7 +80,7 @@ export default class DrawerComponents extends React.Component { //获取数据 getDeatilDatas(params, type = 'chart', showJob = '1') { const { language } = this.props; - this.setState({ spinning: true }); + this.setState({ spinning: true, data: [] }); d3.json( '/api/bs/hrmorganization/orgchart/getDepartmentDetail?' + qs.stringify({ detauleType: type, ...params, showJob }), @@ -354,7 +355,7 @@ export default class DrawerComponents extends React.Component { : './img/default_avator.png' }" style="width: 58px; height: 58px; border-radius: 50%; margin-top: 16px;margin-left: -6px;z-index:999" /> -
+
${ d.data.fname @@ -365,6 +366,7 @@ export default class DrawerComponents extends React.Component { d.data.companyWorkYear } ${i18n.year[language]}
${i18n.postion[language]}: ${d.data.jobTitle}
+
${i18n.level[language]}: ${d.data.level}
@@ -415,6 +417,7 @@ export default class DrawerComponents extends React.Component { spinning, showJob, jobResponsibility, + jobTitle, isModalOpen, personId, } = this.state; @@ -470,8 +473,14 @@ export default class DrawerComponents extends React.Component { } > {detailType == 'chart' ? ( - data.length > 0 && ( - +
+ + {data.length > 0 && ( (orgChart = chart)} setClick={(click) => (addNodeChildFunc = click)} @@ -483,8 +492,8 @@ export default class DrawerComponents extends React.Component { nodeHeight={this.nodeHeightRender} nodeContent={this.nodeContentRender} /> - - ) + )} +
) : (
)} this.setState({ isModalOpen: false })} footer={[ diff --git a/src/components/drawer/index.less b/src/components/drawer/index.less index e2403ec..e27a063 100644 --- a/src/components/drawer/index.less +++ b/src/components/drawer/index.less @@ -2,3 +2,11 @@ width: 500px; text-align: left; } + +.loading-center { + position: absolute; + top: 50vh; + left: 50%; + margin-left: -8px; + margin-top: -8px; +} diff --git a/src/pages/user.jsx b/src/pages/user.jsx index d13d73e..b90a477 100644 --- a/src/pages/user.jsx +++ b/src/pages/user.jsx @@ -99,7 +99,7 @@ export default function userPage() { // 获取数据 useEffect(() => { document.cookie = - 'ecology_JSessionid=aaaJufMEQ3m8EecoqOd8y; JSESSIONID=aaaJufMEQ3m8EecoqOd8y; Systemlanguid=7; languageidweaver=7; loginidweaver=sysadmin; loginuuids=1;'; + 'ecology_JSessionid=aaat6IetRDaXpbGfRHl9y; JSESSIONID=aaat6IetRDaXpbGfRHl9y; Systemlanguid=7; languageidweaver=7; loginidweaver=sysadmin; loginuuids=1;'; d3.json( '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0', ).then((data) => { diff --git a/src/util/i18n.js b/src/util/i18n.js index 97030e5..2c45e6f 100644 --- a/src/util/i18n.js +++ b/src/util/i18n.js @@ -15,6 +15,7 @@ export const i18n = { serveAge: { cn: '司龄', en: 'Serving Age' }, year: { cn: '年', en: 'Year' }, postion: { cn: '岗位', en: 'Position' }, + level: { cn: '职等', en: 'Level' }, postionInfo: { cn: '岗位职责', en: 'Job Responsibilities' }, close: { cn: '关闭', en: 'Close' }, employeeInfo: { cn: '人员详情', en: 'Employee Information' },