fix: '角色管理界面优化'

src/pages/bsmanager/workOrder/incident/incident.less

@@ -283,7 +283,7 @@
 }
 .imgg {
   position: relative;
-  top: -80px;
+  top: -95px;
   left: -9px;
   height: 104px;
   width: 104px;

src/pages/database/ManagementDataBase/ManagementDataBase.jsx

@@ -25,6 +25,7 @@ import {
 
 const ManagementDataBase = () => {
   const [autoCheckList, setAutoCheckList] = useState([]); // 自动列表
+  const [autoCheck, setAutoCheck] = useState([]);
   const [checkList, setCheckList] = useState([]); // 手动列表
   const [logList, setLogList] = useState([]); // 日志列表
   const [checkFlag, setCheckFlag] = useState(1);
@@ -100,6 +101,7 @@ const ManagementDataBase = () => {
           console.log(data);
           setKeepValue(res.RepairTypeList);
           setRepairTypeList(data);
+          setAutoCheck(arr);
           setAutoCheckList(arr);
           setCheckList(arr2);
         }
@@ -413,6 +415,16 @@ const ManagementDataBase = () => {
 
   const onChange = e => {
     console.log(e);
+    console.log(autoCheckList);
+    let aa = [...autoCheck];
+    let data = [];
+    aa.map(i => {
+      if (e.indexOf(i.Type) != -1) {
+        data.push(i);
+      }
+    });
+    console.log(data);
+    setAutoCheckList(data);
     setKeepValue(e);
   };
 

src/pages/userCenter/roleManage/RoleManage.less

@@ -84,7 +84,7 @@
 }
 
 .cardBoxR {
-  height: calc(100% - 36px);
+  height: calc(100% - 3px);
 
   min-width: 870px;
   overflow-y: scroll;

src/pages/userCenter/roleManage/SelectUser/NewSelectUser.jsx

@@ -246,22 +246,23 @@ const NewSelectUser = props => {
         destroyOnClose
         centered
       > */}
+      {/* 头部搜索框 */}
+      <div className={styles.searchHeader}>
+        <Input.Search
+          value={searchName}
+          placeholder="请输入部门或用户"
+          onChange={searchChange}
+          onSearch={onSearch}
+          enterButton
+          style={{ width: '300px', marginRight: '15px' }}
+          allowClear
+        />
+        <Button onClick={onFinish} type="primary" htmlType="submit">
+          提交
+        </Button>
+      </div>
       <div className={styles.pushTestContent}>
         <div className={styles.leftContent}>
-          {/* 头部搜索框 */}
-          <div className={styles.searchHeader}>
-            <Input.Search
-              value={searchName}
-              placeholder="请输入部门或用户"
-              onChange={searchChange}
-              onSearch={onSearch}
-              enterButton
-              style={{ width: '300px', marginRight: '15px' }}
-            />
-            <Button type="primary" htmlType="submit" onClick={onReset}>
-              重置
-            </Button>
-          </div>
           {/* 复选框模块 */}
           <div className={styles.checkScrollBox}>
             {/* <Spin spinning={loading}> */}
@@ -285,7 +286,7 @@ const NewSelectUser = props => {
         <div className={styles.tableRight}>
           <Table
             bordered
-            style={{ width: '400px', height: '100%', overflowX: 'hidden' }}
+            style={{ width: '400px', height: '100%' }}
             rowKey={record => record.value}
             columns={columns}
             dataSource={checkList}
@@ -304,13 +305,11 @@ const NewSelectUser = props => {
         defaultCurrent={1}
         current={currentPage}
         onChange={paginationChange}
-        style={{ marginBottom: '10px' }}
+        style={{ marginBottom: '10px', width: '70%' }}
         size="small"
         showQuickJumper
       />
-      <Button onClick={onFinish} type="primary" htmlType="submit" style={{ float: 'right' }}>
-        提交
-      </Button>
+
       {/* </Modal> */}
     </>
   );

src/pages/userCenter/roleManage/SelectUser/SelectUser.less

+.searchHeader {
+  display: flex;
+  justify-content: space-between;
+}
 .pushTestContent {
+  .ant-table-body {
+    height: calc(100vh - 225px) !important;
+}
   display: flex;
-  height: calc(100% - 75px);
-
-  .searchHeader {
-    display: flex;
-  }
-
+  height: calc(100% - 40px);
   .checkScrollBox {
     overflow-y: scroll;
-    height: calc(100% - 82px);
-    margin: 20px 0;
+    height: calc(100% - 25px);
+    margin: 10px 0px 0px 0px;
     padding-right: 5px;
 
     .checkContainer {
@@ -69,16 +71,16 @@
 
   .tableRight {
     margin-left: 10px;
-    height: 100%;
+    margin-top:10px;
 
     .ant-spin-nested-loading {
-      height: 100%;
+  
 
       .ant-table {
-        height: 100%;
+       
 
         .ant-table-container {
-          height: 100%;
+      
         }
       }
     }