优化新运维中站点管理及角色管理的界面

src/pages/platformCenter/schemeConfig/projectMessage/projectMessage.jsx

@@ -64,7 +64,7 @@ const VectorData = props => {
     }
     return (
         <>
-            <Row>
+            <div style={{ width: 'calc(100vw - 265px)' }}>
                 <div className={styles.tileBtn}>
                     <Button type="primary" onClick={() => {
                         handleAdd();
@@ -72,11 +72,10 @@ const VectorData = props => {
                         新增
                 </Button>
                 </div>
-            </Row>
-            <Row gutter={16}>
+                <Row >
                     {tileData && tileData.length ?
                         tileData.map((item, index) => {
-                        return <Col key={index} span={8}> <Card title={<div><span className={styles.schemeName}>方案名</span>{item.schemename}</div>} extra={<a href="#">
+                            return <Col key={index} span={5}> <Card title={<div><span className={styles.schemeName}>方案名</span>{item.schemename}</div>} extra={<a href="#">
                                 <Popconfirm
                                     title="是否删除该方案？"
                                     okText="确认"
@@ -122,6 +121,7 @@ const VectorData = props => {
                     type={type}
                     formObj={formObj}
                 />
+            </div>
         </>
     )
 }

src/pages/userCenter/roleManage/UserModal.jsx

@@ -4,7 +4,7 @@ import SiteModal from '@/components/Modal/SiteModa';
 import classnames from 'classnames'
 import styles from './UserModal.less';
 import lodash, { clone } from 'lodash';
-import { Card, Empty, Pagination, Checkbox, notification, Input,Row,Col } from 'antd'
+import { Card, Empty, Pagination, Checkbox, notification, Input, Row, Col } from 'antd'
 import {
     getWebModuleTree,
     chooseUserToStation,
@@ -96,7 +96,7 @@ const UserModal = props => {
         }).then(
             res => {
                 let list = []
-                if (res.data&&res.data.length > 0) {
+                if (res.data && res.data.length > 0) {
 
                     res.data.map((item, index) => {
                         list.push({
@@ -355,16 +355,17 @@ const Panels2 = React.memo(props => {
                 {/* <UpOutlined className={styles.siteIcon} /> */}
                 <UserOutlined className={styles.siteIcon} />
                 <p style={{ color }}>{GroupName}</p>
-            </div>
-            <div className={styles.sitePanelCon}>
                 <Checkbox
                     key="0"
-                    className={styles.siteList}
+                    className={styles.siteListTitle}
                     checked={isChecked}
                     onClick={e => props.handleChangeAll(e, index)}
                 >
                     全选
           </Checkbox>
+            </div>
+            <div className={styles.sitePanelCon}>
+
                 {Users.length > 0 &&
                     Users.map((v, vIndex) => (
                         <CheckBoxRow

src/pages/userCenter/roleManage/UserModal.less

@@ -52,14 +52,21 @@
   }
   
   .siteList {
+    width: 120px;
+    // margin:0 0 15px 0;
+    padding: 0 0 15px 10px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+  .siteListTitle {
     width: 199px;
     // margin:0 0 15px 0;
-    padding: 0 0 15px 0;
+    padding: 0  0  0 15px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
   }
-  
   .sitePanel {
     margin: 0 0 10px 0;
   }

src/pages/userCenter/siteManageV2/siteManage.jsx

@@ -86,7 +86,7 @@ const SiteManageV2 = () => {
         checkBoxLoading: false,
     });
     const [total, setTotal] = useState(0); // 分页总数
-    const [page, setPage] = useState({ pageNum: 1, pageSize: 5 });
+    const [page, setPage] = useState({ pageNum: 1, pageSize: 10 });
     const [selectList, setSelectList] = useState([]); // 选择列表数据
     const [updatePageUser, setUpdatePageUser] = useState(1);//
     const [updateCheck, setUpdateCheck] = useState(1);
@@ -253,7 +253,7 @@ const SiteManageV2 = () => {
         } else {
             setCurrentStation(props[0]);
         }
-        setPage({ pageNum: 1, pageSize: 5 });
+        setPage({ pageNum: 1, pageSize: 10 });
 
     }
     // 弹出模态框
@@ -598,7 +598,7 @@ const SiteManageV2 = () => {
                                 ) : (
                                     <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
                                 )}
-                                <Spin spinning={visibleParams.loading}>
+                                <Spin spinning={visibleParams.loading} >
                                     {dataList.map((item, index) => (
                                         <Panels
                                             {...item}
@@ -617,9 +617,9 @@ const SiteManageV2 = () => {
                                         size="small"
                                         total={total}
                                         current={page.pageNum}
-                                        defaultPageSize="5"
+                                        defaultPageSize="10"
                                         onChange={handleChangePage}
-                                        pageSizeOptions={['5']}
+                                        pageSizeOptions={['10']}
                                     />
                                 </div>) : ''
                             }

src/pages/userCenter/siteManageV2/siteManage.less

@@ -87,6 +87,13 @@
 }
 
 .siteManageContainer {
+  .ant-card-body{
+    padding: 15px;
+  }
+  .ant-spin-container{
+    overflow-y: scroll;
+    height: calc(100vh - 410px);
+  }
   .ant-tree-treenode {
     width: 100% !important;
 
@@ -243,7 +250,7 @@
   min-height: calc(100vh - 210px);
   max-height: calc(100vh - 210px);
   min-width: 600px;
-  overflow-y: scroll;
+
 }
 
 
@@ -317,9 +324,9 @@
 
 .siteSelectList {
   border: 1px solid #f5f5f5;
-  height: 200px;
+  height: 120px;
   overflow: auto;
-  margin-bottom: 50px;
+  margin-bottom:20px;
 
   .siteSelectUl {
     margin: 0;
@@ -329,25 +336,24 @@
     flex-wrap: wrap;
 
     li {
-      width: 200px;
       height: 35px;
       line-height: 35px;
-      background: rgba(24, 144, 255, 0.16) url('../../../assets/images/icons/close.png') no-repeat 175px;
+      background: rgba(24, 144, 255, 0.16) url('../../../assets/images/icons/close.png') no-repeat 170px;
       background-size: 20px;
+      background-position:center right;
       margin: 0 10px 10px 0;
       cursor: pointer;
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
-      padding: 0 20px 0 10px;
+      padding: 0 40px 0 10px;
     }
   }
 }
 
 .siteline {
-  border-top: 1px solid #eee;
-  padding-top: 15px;
-  margin-top: 20px;
+
+
 }
 
 .siteBtn {