From 51884bd8df4150c7cf5bcb8d89ea3dd6bc3bac77 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Mon, 22 May 2023 09:50:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=9B=E5=88=9B=E7=BB=84=E7=BB=87=E6=9E=B6?=
 =?UTF-8?q?=E6=9E=84=E5=9B=BE=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/topBar/index.jsx | 31 +------------------------------
 src/pages/user.jsx              |  5 ++---
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx
index f56a247..ad8f325 100644
--- a/src/components/topBar/index.jsx
+++ b/src/components/topBar/index.jsx
@@ -104,23 +104,8 @@ export class TopBar extends React.Component {
               }
             />
           </Col>
-
           <Col span={6}>
-            维度：
-            <Select
-              defaultValue="0"
-              style={{ width: 120 }}
-              value={this.state.requestData.fclass}
-              onChange={(value) => this.handleFormChange({ fclass: value })}
-            >
-              {this.state.fclasslist.map((item) => (
-                <Option value={item.id}>{item.companyname}</Option>
-              ))}
-            </Select>
-          </Col>
-
-          <Col span={6}>
-            根节点：
+            组织：
             <Select
               showSearch
               filterOption={(input, option) =>
@@ -150,20 +135,6 @@ export class TopBar extends React.Component {
               <Option value="3">三级</Option>
             </Select>
           </Col>
-        </Row>
-        <Row style={{ marginTop: '15px' }}>
-          <Col span={6}>
-            <Checkbox
-              style={{ marginTop: '5px' }}
-              onChange={(e) =>
-                this.handleFormChange({
-                  fisvitual: e.target.checked ? '1' : '0',
-                })
-              }
-            >
-              显示虚拟组织
-            </Checkbox>
-          </Col>
           <Col span={6}>
             <Button
               type="primary"
diff --git a/src/pages/user.jsx b/src/pages/user.jsx
index 1fe271b..dcbc73a 100644
--- a/src/pages/user.jsx
+++ b/src/pages/user.jsx
@@ -323,6 +323,7 @@ export default function userPage() {
                   font-weight: 400;
                   color: #333333;
                   margin-bottom: 19px;
+                  margin-top: 25px;
                   white-space:nowrap;
                   overflow:hidden;
                   text-overflow:ellipsis;"
@@ -335,9 +336,7 @@ export default function userPage() {
                 <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; margin-left: 10px;">在岗: ${
-                    d.data.fonjob
-                  }</div>
+
                 </div>
               </div>
             </div>