Merge branch 'master' of https://g.civnet.cn:8443/test/maintenance

src/components/CheckGroup/index.jsx

@@ -21,6 +21,7 @@ export const checkChildrenByCondition = (item, fn, tag = 'every') => {
 };
 
 const ListCard = props => {
+  console.log(props, 'props');
   const {
     ouid,
     searchWord,
@@ -85,7 +86,7 @@ const ListCard = props => {
                 />
               ))
           ) : (
-            <Empty />
+            <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
           )}
         </>
       )}

src/components/CheckGroup/itemCard.less

@@ -25,7 +25,12 @@
 .divSingle{
   border: none;
   margin-top: 20px;
-  flex:0 0 180px;
+  min-width: 180px;
+  flex-grow: 0;
+  flex-shrink: 0;
+  // flex:0 0 auto;
+  // flex-basis: auto;
+  margin-right: 10px;
   background: transparent;
 }
 .isSearch{

src/pages/appConfig/AppMenu.js

@@ -153,7 +153,7 @@ const AppMenu = () => {
         </>
       ),
       key: menu.menuID,
-      icon: menu.leaf ? <FileOutlined /> : <FolderOpenOutlined />,
+      // icon: menu.leaf ? <FileOutlined /> : <FolderOpenOutlined />,
       // 判断它是否存在子集，若果存在就进行再次进行遍历操作，知道不存在子集便对其他的元素进行操作
       children: haveChildren ? menu.children.map(i => mapTree(i)) : [],
     };

src/pages/database/databaseConfig/mongDB/MongDBTable.jsx

@@ -48,13 +48,13 @@ const MongDBTable = props => {
         setTableLoading(false);
         if (res.success) {
           notification.success({
-            message: '通知',
-            description: res.message || '连接成功',
+            message: '提示',
+            description: '连接成功',
             duration: 3,
           });
         } else {
           notification.error({
-            message: '通知',
+            message: '提示',
             description: res.message || '连接失败',
             duration: 3,
           });

src/pages/database/databaseConfig/mysqltable/MySQLTable.jsx

@@ -48,15 +48,15 @@ const MySQLTable = props => {
         setTableLoading(false);
         if (res.success) {
           notification.success({
-            message: '通知',
-            description: res.message || '连接成功',
+            message: '提示',
+            description: '连接成功',
             duration: 3,
           });
         } else {
           notification.error({
-            message: '通知',
+            message: '提示',
             description: res.message || '连接失败',
-            duration: 3,
+            duration: 15,
           });
         }
       })

src/pages/database/databaseConfig/oracle/OracleTable.jsx

@@ -48,13 +48,13 @@ const OracleTable = props => {
         setTableLoading(false);
         if (res.success) {
           notification.success({
-            message: '通知',
-            description: res.message || '连接成功',
+            message: '提示',
+            description: '连接成功',
             duration: 3,
           });
         } else {
           notification.error({
-            message: '通知',
+            message: '提示',
             description: res.message || '连接失败',
             duration: 3,
           });

src/pages/database/databaseConfig/sqlServer/SQLServerTable.jsx

@@ -48,13 +48,13 @@ const SQLServerTable = props => {
         setTableLoading(false);
         if (res.success) {
           notification.success({
-            message: '通知',
+            message: '提示',
             description: '连接成功',
             duration: 3,
           });
         } else {
           notification.error({
-            message: '通知',
+            message: '提示',
             description: res.message || '连接失败',
             duration: 3,
           });

src/pages/mobileConfig/index.js

@@ -7,7 +7,7 @@ import SiteConfig from './SiteConfig';
 import MenuConfig from './menuconfig/MenuConfig';
 const { TabPane } = Tabs;
 const MobileConfigPage = props => {
-  const [activeKey, setActiveKey] = useState('1'); // tabs活动页
+  const [activeKey, setActiveKey] = useState('0'); // tabs活动页
   const [miniTitle, setMiniTitle] = useState('');
   const [flag, setFlag] = useState(1);
   useEffect(() => {

src/pages/orgnazation/ListCardItem.less

@@ -25,7 +25,11 @@
       flex-wrap: wrap;
       align-items: center;
       .ant-checkbox-group-item{
-        flex:0 0 150px;
+        flex:0 0 auto;
+        flex-shrink: 0;
+        flex-grow: 0;
+        margin-right: 60px;
+        // min-width: 180px;
         margin-bottom: 5px;
       }
     }

src/pages/userCenter/UserManage.less

@@ -30,7 +30,15 @@
             display: block;
         }
     }
-    
+    .ant-pagination-prev,.ant-pagination-next{
+        line-height: 8px !important;
+    }
+    .ant-input-search-button{
+        line-height: 1;
+    }
+    .ant-dropdown-menu-item > .anticon:first-child {
+        vertical-align: 0.15em !important;
+    }
 }
 .redText{
     color: red;
@@ -78,9 +86,13 @@
             height: calc(100vh - 74px);
             float: left;
             padding: 10px;
-            width: 200px;
+            padding-right: 22px;
+            width: 240px;
             background: white;
             overflow: auto;
+            margin-right:10px;
+            transform: translateX(0px);
+            transition: transform 0.5s;
             .ant-tree{
                 padding-top: 6px;
                 .ant-tree-switcher{
@@ -91,14 +103,23 @@
                     }
                 }
             }
+            .switcher{
+                color: #1890FF; 
+                font-size: 18px;
+                position: absolute;
+                left: 220px;
+                top: 46%;
+            }
         }
-        .hide{
-            display: none;
+        
+        .orgContainerHide{
+            transform: translateX(-230px);
         }
+        
         .userContainer{
-            height: calc(100vh - 168px) !important;
+            height: calc(100vh - 74px) !important;
             flex: 1;
-            min-width: 840px;
+            min-width: 760px;
             background: white;
             .ant-table-pagination{
                 padding-right: 12px;
@@ -106,14 +127,13 @@
                 margin: 1px 0;
                 padding:8px;
                 padding-right: 20px;
-                .ant-pagination-prev,.ant-pagination-next{
-                    line-height: 8px !important;
-                }
             }
+            .ant-btn{
+                margin: 0px 10px;
                 .ant-btn-primary{
-                margin-left: 20px;
                     background: #50aefc;
                 }
+            }
             .ant-input-search-button{
                 margin-left: 0px !important;
             }
@@ -133,6 +153,10 @@
                 border-right: white;
                 overflow: auto !important;
             }
+            .ant-pagination{
+                z-index: 999;
+                border-top: 1px solid #f0eded;
+            }
         }
     }
 }

src/pages/userCenter/roleManage/RoleManage.jsx

@@ -16,6 +16,7 @@ import { DoubleLeftOutlined, DoubleRightOutlined } from '@ant-design/icons';
 import {
   setMenuToRole,
   getRoleGroupList,
+  getMenuByRoleWithLevel,
 } from '@/services/userCenter/roleManage/api';
 import ListCard, {
   checkChildrenByCondition,
@@ -28,7 +29,6 @@ import AddModal from './AddModal';
 import DelModal from './DelModal';
 import EditModal from './EditModal';
 import EditGroup from './EditGroup';
-import { get } from '@/services';
 import userStyles from '../UserManage.less';
 
 const { Search } = Input;
@@ -79,7 +79,7 @@ const SiteManage = () => {
   };
   useEffect(() => {
     setSpinLoading(true);
-    getRoleGroupList({ userID: 1 }).then(res => {
+    getRoleGroupList({ userID: '1' }).then(res => {
       setSpinLoading(false);
       if (res.code === 0) {
         const { roleList } = res.data;
@@ -114,8 +114,7 @@ const SiteManage = () => {
       title: '默认组',
       id: '',
     };
-
-    get('/Cityinterface/rest/services/OMS.svc/W4_GetMenuByRoleWithLevel', {
+    getMenuByRoleWithLevel({
       roleID: itemObj.roleID,
       subSystemValue: itemObj.subSystemValue,
       subSystemName: itemObj.subSystemValue,
@@ -168,14 +167,28 @@ const SiteManage = () => {
   // 树形数据转换;
   const transTree = val => {
     let arr = val;
-    let arr2 = arr.map(item => {
+    let newArr = [];
+    let arr2 = arr.filter(item => {
       if (item.child && item.child.length > 0) {
         item.child.forEach(itemC => {
           item.roleList.unshift(itemC);
         });
       }
-      return item;
+      if (item.visibleTitle === '手持系统') {
+        newArr[0] = item;
+      }
+      if (item.visibleTitle === '小程序') {
+        newArr[1] = item;
+      }
+      return (
+        item.visibleTitle !== '其它角色' &&
+        item.visibleTitle !== '运维管理' &&
+        item.visibleTitle !== '手持系统' &&
+        item.visibleTitle !== '小程序'
+      );
     });
+    arr2 = arr2.concat(newArr);
+    console.log(arr2, 'arr2');
     let arr3 = arr2.map(item => {
       item.title = item.visibleTitle || '';
       item.key = item.visibleValue || '';
@@ -288,9 +301,8 @@ const SiteManage = () => {
   };
   return (
     <PageContainer>
-      {/* <GridContent> */}
       <Row gutter={0}>
-        <Col lg={mulu ? 5 : 0}>
+        <Col span={mulu ? 5 : 0}>
           <Card className={styles.cardBox}>
             <Spin
               tip="loading...."
@@ -338,21 +350,28 @@ const SiteManage = () => {
               confirmModal={groupModal}
             />
           </Card>
-        </Col>
-        <Col>
+          <div>
             {mulu && (
               <Tooltip title="隐藏角色栏" className={styles.hide}>
                 <DoubleLeftOutlined onClick={() => handleHide()} />
               </Tooltip>
             )}
+          </div>
+        </Col>
+        <Col span={mulu ? 0 : 1}>
+          {/* {mulu && (
+            <Tooltip title="隐藏角色栏" className={styles.hide}>
+              <DoubleLeftOutlined onClick={() => handleHide()} />
+            </Tooltip>
+          )} */}
           {!mulu && (
             <Tooltip title="显示角色栏" className={styles.hide}>
               <DoubleRightOutlined onClick={() => handleHide()} />
             </Tooltip>
           )}
         </Col>
-        <Col lg={mulu ? 18 : 23}>
-          <Card style={{ marginBottom: '10px' }}>
+        <Col span={mulu ? 19 : 23}>
+          <Card style={{ marginBottom: '10px', minWidth: '870px' }}>
             <Row align="middle">
               <Col span={1}>搜索</Col>
               <Col span={8}>
@@ -385,6 +404,7 @@ const SiteManage = () => {
                     编辑角色
                   </Button>
                   <Button
+                    type="primary"
                     danger
                     onClick={() => {
                       handleDel();
@@ -421,7 +441,6 @@ const SiteManage = () => {
           </Card>
         </Col>
       </Row>
-      {/* </GridContent> */}
     </PageContainer>
   );
 };

src/pages/userCenter/roleManage/RoleManage.less

@@ -2,6 +2,7 @@
   min-height: calc(100vh - 80px);
   max-height: calc(100vh - 80px);
   overflow-y: scroll;
+  margin-right: 20px;
 }
 .ant-tree-node-content-wrapper-open{
   display: flex;
@@ -26,6 +27,7 @@
   align-items: center;
 }
 .cardBoxR{
+  min-width: 870px;
   min-height: calc(100vh - 172px);
   max-height: calc(100vh - 172px);
   overflow-y: scroll;
@@ -43,10 +45,11 @@
 
 .hide{
   display: block;
-  position: relative;
+  position: absolute;
   font-size: 20px;
   color: #1890FF!important;
   top: 45%;
-  left: 50%;
-  transform: translate(-50%,-50%);
+  right:0;
+  transform: translate(0%,-50%);
+  z-index: 2;
 }

src/pages/userCenter/siteManage/SiteManage.jsx

@@ -11,20 +11,17 @@ import {
   List,
   Space,
 } from 'antd';
-import {
-  FileAddTwoTone,
-  EditTwoTone,
-  DeleteTwoTone,
-  DoubleLeftOutlined,
-  DoubleRightOutlined,
-} from '@ant-design/icons';
-import { GridContent } from '@ant-design/pro-layout';
+import { DoubleLeftOutlined, DoubleRightOutlined } from '@ant-design/icons';
 import PageContainer from '@/components/BasePageContainer';
 import {
   getWebModuleTree,
   chooseUserToStation,
+  getUserByStation,
 } from '@/services/userCenter/siteManage/api';
-import ListCard from '@/pages/orgnazation/ListCard';
+import ListCard, {
+  checkChildrenByCondition,
+  getId,
+} from '@/components/CheckGroup';
 import styles from '@/pages/userCenter/siteManage/SiteManage.less';
 import qs from 'qs';
 import classnames from 'classnames';
@@ -46,6 +43,9 @@ const SiteManage = () => {
   const [subList, setSubList] = useState([]); // 选中的数组
   const [spinLoading, setSpinLoading] = useState(false);
   const [btnLoading, setBtnLoading] = useState(false);
+  const [valueList, setValueList] = useState([]);
+  const [dataList, setdataList] = useState([]);
+  const [loading, setLoading] = useState(true);
   const [mulu, setMulu] = useState(true);
 
   useEffect(() => {
@@ -81,38 +81,68 @@ const SiteManage = () => {
         console.error(err);
       });
   }, [flag]);
-
-  const Title = props => {
-    const { text } = props;
-    return (
-      <div className={styles.treeTitle}>
-        {text}
-        <div className={styles.titleBox}>
-          <Tooltip title="新增站点">
-            <FileAddTwoTone
-              onClick={() => {
-                handleAdd(props);
-              }}
-            />
-          </Tooltip>
-          <Tooltip title="编辑站点">
-            <EditTwoTone
-              onClick={() => {
-                handleEdit(props);
-              }}
-            />
-          </Tooltip>
-          <Tooltip title="删除站点">
-            <DeleteTwoTone
-              onClick={() => {
-                handleDel(props);
-              }}
-            />
-          </Tooltip>
-        </div>
-      </div>
+  useEffect(() => {
+    if (!currentStation.stationID) return;
+    setLoading(true);
+    const defaultConfig = {};
+    getUserByStation({
+      stationID: currentStation.stationID,
+      _version: 9999,
+      _dc: new Date().getTime(),
+    })
+      .then(res => {
+        const list = [];
+        // eslint-disable-next-line no-unused-expressions
+        res &&
+          res.forEach(item => {
+            list.push({ ...defaultConfig, ...item });
+          });
+        const finalList = buildMap(list);
+        setdataList(finalList);
+        setValueList(
+          finalList
+            .map(l =>
+              checkChildrenByCondition(
+                l,
+                it => (it.isChecked ? [getId(it)] : []),
+                'map',
+              ).flat(Infinity),
+            )
+            .flat(Infinity)
+            .filter(Boolean),
         );
+        setLoading(false);
+      })
+      .catch(err => {
+        setLoading(false);
+      });
+  }, [currentStation]);
+
+  const buildMap = list => {
+    const obj = {
+      type: 'widgetGroup',
+      searchWord,
+      children: '',
+      text: '',
+      itemid: '',
     };
+    let arr = list.map(item => {
+      item.id = item.OUID * 10000;
+      item.text = item.OUName;
+      item.type = 'widgetGroup';
+      item.children = item.userList.map(u => ({
+        ...u,
+        text: u.userName,
+        type: 'widgetChild',
+      }));
+      return item;
+    });
+
+    console.log(arr);
+    return arr.filter(item => item.userList.length > 0);
+  };
+
+  // 新增站点
   const handleAdd = e => {
     console.log(e);
     setModalVisible(true);
@@ -125,21 +155,6 @@ const SiteManage = () => {
   const handleEdit = e => {
     setEditVisible(true);
   };
-  // 树形数据转换
-  const transTree = val => {
-    let arr = val;
-    return arr.map((item, index) => {
-      item.title = Title(item) || item.text;
-      item.key = item.stationID || '';
-      let obj = {};
-      if (Array.isArray(item.children) && item.children.length > 0) {
-        transTree(item.children);
-        obj = item;
-        return obj;
-      }
-      return item;
-    });
-  };
   // 获取搜索框的值
   const handleSearch = value => {
     setSearchWord(value);
@@ -163,12 +178,12 @@ const SiteManage = () => {
   const valueCallback = valueObj => {
     setSubList(valueObj);
   };
-  const handleCommit = value => {
-    let arr = Object.values(subList);
+  const handleCommit = results => {
     setBtnLoading(true);
     chooseUserToStation(
       qs.stringify({
-        userList: String(arr.flat()),
+        // userList: String(arr.flat()),
+        userList: String(results.flat()),
         stationID: currentStation.stationID,
       }),
       {
@@ -188,7 +203,7 @@ const SiteManage = () => {
         } else {
           notification.error({
             message: '提示',
-            duration: 3,
+            duration: 15,
             description: res.message,
           });
         }
@@ -219,10 +234,13 @@ const SiteManage = () => {
 
   return (
     <PageContainer>
-      <GridContent>
-        <Row gutter={0}>
-          <Col lg={mulu ? 5 : 0}>
-            <Card className={styles.cardBox}>
+      <Row>
+        <Col span={mulu ? 5 : 0}>
+          <Card
+            className={classnames({
+              [styles.cardBox]: true,
+            })}
+          >
             <Spin
               tip="loading...."
               spinning={spinLoading}
@@ -251,13 +269,25 @@ const SiteManage = () => {
               confirmModal={editModal}
             />
           </Card>
-          </Col>
-          <Col>
+          <div>
             {mulu && (
               <Tooltip title="隐藏站点" className={styles.hide}>
                 <DoubleLeftOutlined onClick={() => handleHide()} />
               </Tooltip>
             )}
+            {/* {!mulu && (
+              <Tooltip title="显示站点" className={styles.hide}>
+                <DoubleRightOutlined onClick={() => handleHide()} />
+              </Tooltip>
+            )} */}
+          </div>
+        </Col>
+        <Col span={mulu ? 0 : 1}>
+          {/* {mulu && (
+            <Tooltip title="隐藏站点" className={styles.hide}>
+              <DoubleLeftOutlined onClick={() => handleHide()} />
+            </Tooltip>
+          )} */}
           {!mulu && (
             <Tooltip title="显示站点" className={styles.hide}>
               <DoubleRightOutlined onClick={() => handleHide()} />
@@ -265,8 +295,8 @@ const SiteManage = () => {
           )}
         </Col>
 
-          <Col lg={mulu ? 18 : 23}>
-            <Card style={{ marginBottom: '10px' }}>
+        <Col span={mulu ? 19 : 23}>
+          <Card style={{ marginBottom: '10px', minWidth: '600px' }}>
             <Row align="middle">
               <Col span={1}>搜索</Col>
               <Col span={8}>
@@ -300,6 +330,7 @@ const SiteManage = () => {
                   </Button>
                   <Button
                     danger
+                    type="primary"
                     onClick={() => {
                       handleDel(currentStation.stationID);
                     }}
@@ -314,9 +345,10 @@ const SiteManage = () => {
           <Card className={styles.cardBoxR}>
             {currentStation.stationID && (
               <ListCard
-                  ouid={currentStation.stationID}
+                loading={loading}
+                checkList={valueList}
+                dataList={dataList}
                 searchWord={searchWord}
-                  valueCallback={valueCallback}
                 onCommit={handleCommit}
                 btnLoading={btnLoading}
               />
@@ -324,7 +356,6 @@ const SiteManage = () => {
           </Card>
         </Col>
       </Row>
-      </GridContent>
     </PageContainer>
   );
 };

src/pages/userCenter/siteManage/SiteManage.less

@@ -2,8 +2,8 @@
   min-height: calc(100vh - 80px);
   max-height: calc(100vh - 80px);
   overflow: auto;
+  margin-right: 20px;
 }
-
 .siteTitle{
   font-size: 16px;
   margin: 0 0 6px 0;
@@ -14,6 +14,7 @@
 .cardBoxR{
   min-height: calc(100vh - 172px);
   max-height: calc(100vh - 172px);
+  min-width: 600px;
   overflow-y: scroll;
 }
 .ant-tree-node-content-wrapper-open{
@@ -53,10 +54,14 @@
 
 .hide{
   display: block;
-  position: relative;
+  position: absolute;
   font-size: 20px;
   color: #1890FF!important;
   top: 45%;
-  left: 50%;
-  transform: translate(-50%,-50%);
+  right: 0;
+  transform: translate(0%,-50%);
+  z-index: 2;
 }
+// .hide{
+//   left: 0;
+// }
\ No newline at end of file

src/routes/config.js

@@ -80,7 +80,7 @@ export default {
             // },
             {
               path: '/dbm/dbInit',
-              name: '数据库初始化',
+              name: '数据库连接',
               authority: adminAuthority,
               component: InitDataBase,
             },

src/services/userCenter/RoleManage/api.js

@@ -53,3 +53,7 @@ export const deleteRole = params =>
 // 编辑分组名称
 export const setRoleGroupName = params =>
   get('/Cityinterface/rest/services/OMS.svc/P_SetRoleGroupName', params);
+
+// 保存选择的功能
+export const getMenuByRoleWithLevel = params =>
+  get('/Cityinterface/rest/services/OMS.svc/W4_GetMenuByRoleWithLevel', params);

src/services/userCenter/siteManage/api.js

@@ -29,3 +29,7 @@ export const chooseUserToStation = (params, options) =>
     params,
     options,
   );
+
+// 获取人员
+export const getUserByStation = params =>
+  get('/Cityinterface/rest/services/OMS.svc/P_GetUserByStation', params);

src/services/userCenter/userManage/api.js

@@ -100,6 +100,15 @@ export const addToOrg = (userID, orgID, newOrgID) =>
     oldOUID: orgID,
     newOUID: newOrgID,
   });
+// 批量更改机构
+export const addToOrgs = (userIDs, orgIDs, newOrgID) =>
+  get(`${PUBLISH_SERVICE}/UserCenter/ModifyUserRole`, {
+    _version: 9999,
+    _dc: Date.now(),
+    userIds: userIDs,
+    oldGroupIds: orgIDs,
+    newGroupId: newOrgID,
+  });
 
 export const updateUserPassword = (
   userID,
@@ -141,6 +150,14 @@ export const deleteUser = userID =>
     _dc: Date.now(),
     userID,
   });
+// 批量删除用户
+export const multiDeleteUsers = (userIDs, orgIDs) =>
+  get(`${PUBLISH_SERVICE}/UserCenter/DeleteUsers`, {
+    _version: 9999,
+    _dc: Date.now(),
+    userIds: userIDs,
+    groupId: orgIDs,
+  });
 
 export const setUserRelation = (userID, roleList = [], stationList) =>
   post(