fix: '机构，站点树支持搜索'

src/pages/bsmanager/base/tablemanager/index.jsx

@@ -19,6 +19,7 @@ import {
   Menu,
   Modal,
   message,
+  Tag,
 } from 'antd';
 import {
   EditOutlined,
@@ -425,11 +426,11 @@ const TableManager = props => {
         if (record) {
           return (
             <Tooltip title={record}>
-              <span style={{ color: '#50aefc', cursor: 'pointer' }}>有</span>
+              <Tag color="success">有</Tag>
             </Tooltip>
           );
         }
-        return <span>无</span>;
+        return <Tag color="processing">无</Tag>;
       },
     },
     {

src/pages/bsmanager/patrolMaintenance/patrolFeedback/AddModal.jsx

@@ -395,6 +395,7 @@ const AddModal = props => {
   const pickFiled = fileds => {
     if (form.getFieldsValue().tableName) {
       let pp = formateArrDataA(nu, 'groupName');
+      console.log(pp);
       if (form.getFieldValue(fileds)) {
         let ab = form.getFieldValue(fileds).split(',');
         let arr = Object.keys(pp);

src/pages/bsmanager/workOrder/incident/incident.jsx

@@ -23,6 +23,7 @@ import {
   Modal,
   Input,
   message,
+  Tag,
 } from 'antd';
 
 import {
@@ -165,17 +166,20 @@ const incident = () => {
     //   width: 80,
     // },
 
-    {
-      title: '编辑',
-      dataIndex: 'editable',
-      key: 'editable',
-      width: 50,
-      render: item => (
-        <span style={{ color: 'grey' }} key={item}>
-          {item}
-        </span>
-      ),
-    },
+    // {
+    //   title: '编辑',
+    //   dataIndex: 'editable',
+    //   key: 'editable',
+    //   width: 50,
+    //   align: 'center',
+    //   render: record => {
+    //     if (record == '是') {
+    //       return <Tag color="success">{record}</Tag>;
+    //     } else {
+    //       return <Tag color="processing">{record}</Tag>;
+    //     }
+    //   },
+    // },
     {
       title: '编辑字段',
       dataIndex: 'editableFields',

src/pages/bsmanager/workOrder/workFlow/flow.jsx

 import React, { useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { reloadFlows, removeFlowExtend } from '@/services/flow/flow';
-import { Card, Space, Table, Popconfirm, Spin, Tooltip, notification, message, Button } from 'antd';
+import { Tag, Card, Space, Table, Popconfirm, Spin, Tooltip, notification, message, Button } from 'antd';
 import {
   DoubleLeftOutlined,
   DoubleRightOutlined,
@@ -158,6 +158,13 @@ const Flow = () => {
       dataIndex: 'useFixedCodingRule',
       width: 80,
       align: 'center',
+      render: record => {
+            if (record == '是') {
+              return <Tag color="success">{record}</Tag>;
+            } else {
+              return <Tag color="processing">{record}</Tag>;
+            }
+          },
     },
     {
       title: '异常节点',
@@ -169,7 +176,17 @@ const Flow = () => {
       title: '接口配置',
       dataIndex: 'interfaceConfig',
       align: 'center',
-      render: text => <span style={{ color: text === '(无)' ? 'grey' : '000000D9' }}>{text}</span>,
+      // render: text => <span style={{ color: text === '(无)' ? 'grey' : '000000D9' }}>{text}</span>,
+      render: record => {
+        if (record!='(无)') {
+          return (
+            <Tooltip title={record}>
+              <Tag color="success">有</Tag>
+            </Tooltip>
+          );
+        }
+        return <Tag color="processing">无</Tag>;
+      },
     },
     {
       title: '操作',

src/pages/userCenter/siteManage/SiteManage.less

@@ -378,3 +378,6 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+.titleSearch {
+  color: #f50;
+}

src/pages/userCenter/userManage/RelateRoleModal.jsx

@@ -54,7 +54,7 @@ const RelateRoleModal = props => {
   const submitRole = () => {
     console.log(1212121212);
     SetUserRelationList(
-      currentUser.userID,
+      currentUser.userId,
       Object.keys(roleValueList)
         .map(k => roleValueList[k])
         .flat(),

src/pages/userCenter/userManage/UserManage.less

@@ -264,11 +264,11 @@
       overflow: hidden;
 
       .ant-table-wrapper {
-        height: calc(100% - 50px);
+        height: calc(100% - 100px);
       }
 
       .ant-table {
-        height: calc(100% - 50px)
+        height: calc(100% - 100px)
       }
 
       .title {
@@ -405,3 +405,13 @@
 //     overflow-y: scroll;
 //     height: calc(100vh - 150px);
 // }
+.titleTop {
+  width: 20rem;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  padding-left: 10px;
+}
+.titleSearch {
+  color: #f50;
+}
\ No newline at end of file

src/services/userManage/api.js

@@ -15,9 +15,11 @@ export const getUserTree = (selectOU, node) =>
 //     OUID,
 //   });
 
-export const getOneOUUserListNew = OUID =>
+export const getOneOUUserListNew = (OUID, size, index) =>
   get(`${PUBLISH_SERVICE}/UserCenter/GroupUserList`, {
     groupId: OUID,
+    pageSize: size,
+    pageIndex: index,
   });
 
 /**