From c788c34064db2372add45513f6265b6dd59bbad1 Mon Sep 17 00:00:00 2001
From: fanjie <pettzzz@icloud.com>
Date: Wed, 2 Nov 2022 15:02:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=84=E7=BB=87=E9=80=8F=E8=A7=86?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/topBar/index.jsx | 36 ++++++++--------
 src/pages/company.jsx           | 10 +++--
 src/pages/user.jsx              | 73 +++++++++++++++++++++------------
 3 files changed, 69 insertions(+), 50 deletions(-)

diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx
index ef912c4..16ad292 100644
--- a/src/components/topBar/index.jsx
+++ b/src/components/topBar/index.jsx
@@ -29,7 +29,6 @@ export class TopBar extends React.Component {
         level: '3',
         fisvitual: '0',
       },
-      colSpan: props.type == 'user' ? 5 : 4,
     };
   }
 
@@ -82,7 +81,7 @@ export class TopBar extends React.Component {
     return (
       <div className={style.topbarWrapper}>
         <Row>
-          <Col span={this.state.colSpan}>
+          <Col span={4}>
             数据日期：
             <DatePicker
               placeholder="请选择日期"
@@ -104,7 +103,7 @@ export class TopBar extends React.Component {
             />
           </Col>
 
-          <Col span={this.state.colSpan}>
+          <Col span={4}>
             维度：
             <Select
               defaultValue="0"
@@ -118,7 +117,7 @@ export class TopBar extends React.Component {
             </Select>
           </Col>
 
-          <Col span={this.state.colSpan}>
+          <Col span={4}>
             根节点：
             <Select
               showSearch
@@ -136,7 +135,7 @@ export class TopBar extends React.Component {
             </Select>
           </Col>
 
-          <Col span={this.state.colSpan}>
+          <Col span={4}>
             显示层级：
             <Select
               defaultValue="3"
@@ -150,21 +149,18 @@ export class TopBar extends React.Component {
             </Select>
           </Col>
 
-          {this.props.type == 'company' && (
-            <Col span={this.state.colSpan}>
-              <Checkbox
-                style={{ marginTop: '5px' }}
-                onChange={(e) =>
-                  this.handleFormChange({
-                    fisvitual: e.target.checked ? '1' : '0',
-                  })
-                }
-              >
-                显示虚拟组织
-              </Checkbox>
-            </Col>
-          )}
-
+          <Col span={4}>
+            <Checkbox
+              style={{ marginTop: '5px' }}
+              onChange={(e) =>
+                this.handleFormChange({
+                  fisvitual: e.target.checked ? '1' : '0',
+                })
+              }
+            >
+              显示虚拟组织
+            </Checkbox>
+          </Col>
           <Col span={4}>
             <Button
               type="primary"
diff --git a/src/pages/company.jsx b/src/pages/company.jsx
index 067b0f9..ec741d3 100644
--- a/src/pages/company.jsx
+++ b/src/pages/company.jsx
@@ -136,7 +136,7 @@ export default function companyPage() {
     let departmentUrl = `/spa/organization/static/index.html#/main/organization/departmentExtend/${d.data.fobjid}`;
 
     if (d.data.ftype == 0) {
-      return `<div onclick="window.open('${companyUrl}', '_blank')" style="text-align:center">
+      return `<div onclick="if(${d.data.fisvitual}==1) return;window.open('${companyUrl}', '_blank')" style="text-align:center">
           <div style="display: inline-block; vertical-align: top;">
             <img src="./img/company.png" />
           </div>
@@ -153,7 +153,9 @@ export default function companyPage() {
           </div>
         </div>`;
     } else if (d.data.ftype == 1) {
-      return `<div onclick="window.open('${subcompanyUrl}', '_blank')">
+      return `<div onclick="if(${
+        d.data.fisvitual
+      }==1) return;window.open('${subcompanyUrl}', '_blank')">
           <div style="width: 85px; height: 85px; border: 1px solid #66BAF5; border-radius: 50%;text-align: center; line-height: 85px; margin: 0 auto;display:flex;justify-content:center;align-items:center">
             <img src="${getSubcompanyImage()}" />
           </div>
@@ -170,7 +172,9 @@ export default function companyPage() {
         </div>`;
     } else if (d.data.ftype == 2) {
       return `
-        <div style="width: 100%; height: 100%; background-size: 100% 100%;" onclick="window.open('${departmentUrl}')">
+        <div style="width: 100%; height: 100%; background-size: 100% 100%;" onclick="if(${
+          d.data.fisvitual
+        }==1) return;window.open('${departmentUrl}')">
           <div style='position:absolute'>
           <img src='./img/company_job_label.png'/></div>
           <div style="padding-left: 8px; padding-top: 23px;display:flex;align-items:center">
diff --git a/src/pages/user.jsx b/src/pages/user.jsx
index e1efd38..027946a 100644
--- a/src/pages/user.jsx
+++ b/src/pages/user.jsx
@@ -268,15 +268,15 @@ export default function userPage() {
               font-family: Microsoft YaHei-Bold, Microsoft YaHei;
               font-weight: bold;
               color: #000000;
-            " onclick="window.open('${
-              d.data.ftype == 0
-                ? companyUrl
-                : d.data.ftype == 1
-                ? subcompanyUrl
-                : d.data.ftype == 2
-                ? departmentUrl
-                : ''
-            }', '_blank')">${d.data.fname}</span>
+            " onclick="if(${d.data.fisvitual}==1) return;window.open('${
+        d.data.ftype == 0
+          ? companyUrl
+          : d.data.ftype == 1
+          ? subcompanyUrl
+          : d.data.ftype == 2
+          ? departmentUrl
+          : ''
+      }', '_blank')">${d.data.fname}</span>
             <span style="margin-left: 70px;">
               <img src="./img/user-card/line1.png" />
               <img src="./img/user-card/line2.png" />
@@ -295,9 +295,9 @@ export default function userPage() {
             }" style="width: 58px; height: 58px;position:absolute;left:29px; border-radius: 50%; margin-top: 16px;position:absolute;left:29px;z-index:999"/>
               </div>
               <div style="display: inline-block; margin-left: 6px;width: 55%"  >
-              <div onclick="${
-                d.data.fleadername ? `window.open('${userUrl}', '_blank')` : ''
-              }">
+              <div onclick="if(${d.data.fisvitual}==1) return;${
+        d.data.fleadername ? `window.open('${userUrl}', '_blank')` : ''
+      }">
                 <div style="
                   font-size: 13px;
                   font-family: Microsoft YaHei-Bold, Microsoft YaHei;
@@ -320,19 +320,23 @@ export default function userPage() {
         d.data.fleaderjob ? `/${d.data.fleaderjob}` : ''
       }</div>
       </div>
-                <div style="display: flex;" >
+                <div style="display: ${
+                  d.data.fisvitual == 0 ? 'flex' : 'none'
+                };" >
                   <div style="height: 28px;border: 1px solid #00C2FF; border-radius: 10px; line-height: 24px; padding: 0px 5px; min-width: 60px;">编制: ${
                     d.data.fplan
                   }</div>
-                  <div style="height: 28px;border: 1px solid #00C2FF; border-radius: 10px; line-height: 24px; padding: 0px 5px; min-width: 60px; margin-left: 10px;" onclick="event.stopPropagation();window.open('${
-                    d.data.ftype == 0
-                      ? addressBookGroupUrl
-                      : d.data.ftype == 1
-                      ? addressBookUrl
-                      : d.data.ftype == 2
-                      ? addressBookDepartmentUrl
-                      : ''
-                  }', '_blank')">在岗: ${d.data.fonjob}</div>
+                  <div style="height: 28px;border: 1px solid #00C2FF; border-radius: 10px; line-height: 24px; padding: 0px 5px; min-width: 60px; margin-left: 10px;" onclick="if(${
+                    d.data.fisvitual
+                  }==1) return;event.stopPropagation();window.open('${
+        d.data.ftype == 0
+          ? addressBookGroupUrl
+          : d.data.ftype == 1
+          ? addressBookUrl
+          : d.data.ftype == 2
+          ? addressBookDepartmentUrl
+          : ''
+      }', '_blank')">在岗: ${d.data.fonjob}</div>
                 </div>
               </div>
             </div>
@@ -353,7 +357,11 @@ export default function userPage() {
               font-family: Microsoft YaHei-Bold, Microsoft YaHei;
               font-weight: bold;
               color: #000000;
-            " onclick="window.open('${jobtitleUrl}', '_blank')">${d.data.fname}</span>
+            " onclick="if(${
+              d.data.fisvitual
+            }==1) return;window.open('${jobtitleUrl}', '_blank')">${
+        d.data.fname
+      }</span>
             <span style="margin-left: 70px;">
               <img src="./img/user-card/line1.png" />
               <img src="./img/user-card/line2.png" />
@@ -370,15 +378,24 @@ export default function userPage() {
                 font-weight: bold;
                 color: #333333;
                 margin-bottom: 23px;
-                " onclick="window.open('${jobtitleUrl}', '_blank')">${d.data.fname}</div>
+                " onclick="if(${
+                  d.data.fisvitual
+                }==1) return;window.open('${jobtitleUrl}', '_blank')">${
+        d.data.fname
+      }</div>
                 <div style="
                 font-size: 13px;
                 font-family: Microsoft YaHei-Regular, Microsoft YaHei;
                 font-weight: 400;
                 color: #333333;
-                "  >
+                display: ${d.data.fisvitual == 0 ? 'flex' : 'none'};
+                ">
                   <span>编制：${d.data.fplan}</span>
-                  <span style="margin-left: 10px;" onclick="window.open('${addressBookPostUrl}', '_blank')">在岗：${d.data.fonjob}</span>
+                  <span style="margin-left: 10px;" onclick="if(${
+                    d.data.fisvitual
+                  }==1) return;window.open('${addressBookPostUrl}', '_blank')">在岗：${
+        d.data.fonjob
+      }</span>
                 </div>
               </div>
             </div>
@@ -405,7 +422,9 @@ export default function userPage() {
               }" style="width: 58px; height: 58px; border-radius: 50%; margin-top: 16px;z-index:999"/>
               </div>
 
-              <div style="display: inline-block; margin-left: 6px;width: 55%;height:100%"  onclick="window.open('${postUserUrl}', '_blank')">
+              <div style="display: inline-block; margin-left: 6px;width: 55%;height:100%"  onclick="if(${
+                d.data.fisvitual
+              }==1) return;window.open('${postUserUrl}', '_blank')">
                 <div style='display:flex;align-items:center;margin-bottom:19px;margin-top:15px'>
                   <div style="
                   font-size: 13px;