中远组织架构图新增需求开发

src/components/drawer/index.jsx

@@ -52,7 +52,14 @@ export default class DrawerComponents extends React.Component {
   }
 
   // 点击节点
-  onNodeClick(node) {}
+  onNodeClick(node) {
+    if (node.ftype == '4') {
+      window.open(
+        `/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${node.id}`,
+        '_blank',
+      );
+    }
+  }
 
   onButtonClick(event, d) {
     if (d.children) {
@@ -84,6 +91,7 @@ export default class DrawerComponents extends React.Component {
             nbOptions: data.nbCondition,
             wbOptions: data.wbCondition,
             defaultNbValue: data.nbValue,
+            defaultWbValue: data.wbValue,
           });
           resolve();
         },
@@ -260,6 +268,8 @@ export default class DrawerComponents extends React.Component {
    * 节点渲染
    */
   nodeContentRender = (d, i, arr, state) => {
+    let name = d.data.deptType == 0 ? '所属部门' : '所属科室';
+
     if (d.data.ftype == 2) {
       return `<div style="position: relative;">
                 <div style=" height: 152px;background-size: 100% 100%;box-sizing: border-box;padding-top: 30px;position:relative;z-index:2">
@@ -328,7 +338,7 @@ export default class DrawerComponents extends React.Component {
                         }</div>
                     </div>
                     <div style="font-size: 13px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #333333;height: 25px;line-height: 25px;">
-                        <span>所属部门: ${d.data.localDeptName} </span>
+                        <span>${name}: ${d.data.localDeptName} </span>
                         <div>岗位名称: ${d.data.jobTitle}</div>
                     </div>
                 </div>
@@ -340,10 +350,11 @@ export default class DrawerComponents extends React.Component {
   showDrawer = async (params) => {
     this.setState({ open: true, params: params });
     await this.getDeatilCondition();
-    const { defaultNbValue } = this.state;
+    const { defaultNbValue, defaultWbValue } = this.state;
     params = {
       ...params,
       nbValue: defaultNbValue.join(','),
+      wbValue: defaultWbValue.join(','),
     };
     this.getDeatilDatas(params, 'chart', '0');
   };

src/pages/company.jsx

@@ -57,6 +57,7 @@ export default function companyPage() {
         fclass: topbar.state.requestData.fclass,
         id: infoRef.current,
         versionId: versionId,
+        deptLevel: node.deptLevel,
       };
       drawerCom.showDrawer(params);
     }

src/pages/user.jsx

@@ -99,7 +99,7 @@ export default function userPage() {
   // 获取数据
   useEffect(() => {
     document.cookie =
-      'ecology_JSessionid=aaalCA6IewNp55JvxBvtz; JSESSIONID=aaalCA6IewNp55JvxBvtz; __randcode__=a83188a6-8240-4a77-81ff-648bed93e68b; Systemlanguid=7; languageidweaver=7; loginidweaver=sysadmin; loginuuids=1';
+      'ecology_JSessionid=aaajace0y1dE-cpttwUtz; JSESSIONID=aaajace0y1dE-cpttwUtz; Systemlanguid=7; loginuuids=1; languageidweaver=7; __randcode__=bcb3a4d9-7e40-424a-8274-5081eef0bf1d; loginidweaver=sysadmin';
     d3.json(
       '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0',
     ).then((data) => {