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

src/pages/appConfig/AppMenu.less

@@ -3,14 +3,20 @@
     display: flex;
     .menuContainer{
         min-width: 300px;
+        border:1px solid #abaeb1;
+        min-height:calc(100vh - 300px);
+        overflow-y:auto;
         .ant-tree-list{
             padding: 10px;
-            border:1px solid #abaeb1;
             height:calc(100vh - 300px);
             .ant-tree-switcher{
                 line-height: 1;
                 color:#1890FF;
             }
+            .ant-tree-iconEle{
+                line-height: 1.2;
+                color:#1890FF;
+            }
         }
     }
     .previewContainer{

src/pages/userCenter/UserManage.js

@@ -27,6 +27,8 @@ import {
   ApartmentOutlined,
   SearchOutlined,
   StopOutlined,
+  FolderOpenOutlined,
+  FileOutlined,
 } from '@ant-design/icons';
 import { PageContainer } from '@ant-design/pro-layout';
 // import classnames from 'classnames';
@@ -272,7 +274,7 @@ const UserManage = () => {
         </>
       ),
       key: org.id,
-      // icon: <SolutionOutlined />,
+      // icon: org.leaf ? <FileOutlined /> : <FolderOpenOutlined />,
       // 判断它是否存在子集，若果存在就进行再次进行遍历操作，知道不存在子集便对其他的元素进行操作
       children: haveChildren ? org.children.map(i => mapTree(i)) : [],
     };
@@ -282,7 +284,7 @@ const UserManage = () => {
     return {
       title: `${org.text}`,
       key: org.id,
-      // icon: <SolutionOutlined />,
+      // icon: org.leaf ? <FileOutlined /> : <FolderOpenOutlined />,
       // 判断它是否存在子集，若果存在就进行再次进行遍历操作，知道不存在子集便对其他的元素进行操作
       children: haveChildren ? org.children.map(i => mapTree1(i)) : [],
     };
@@ -852,7 +854,7 @@ const UserManage = () => {
           okText="确认"
           cancelText="取消"
         >
-          <Form form={addUserForm}>
+          <Form form={addUserForm} labelCol={{ span: 4 }}>
             <Form.Item
               name="loginName"
               label="登录名称"
@@ -874,10 +876,10 @@ const UserManage = () => {
             >
               <Input placeholder="请输入用户姓名" />
             </Form.Item>
-            <Form.Item name="phone" label="手 机 号 码">
+            <Form.Item name="phone" label="手机号码">
               <Input placeholder="请输入手机号码" />
             </Form.Item>
-            <Form.Item name="email" label="电 子 邮 箱">
+            <Form.Item name="email" label="电子邮箱">
               <Input placeholder="请输入电子邮箱" />
             </Form.Item>
           </Form>
@@ -891,7 +893,7 @@ const UserManage = () => {
           okText="确认"
           cancelText="取消"
         >
-          <Form form={addOrgForm}>
+          <Form form={addOrgForm} labelCol={{ span: 4 }}>
             <Form.Item
               name="OUName"
               label="机构名称"
@@ -899,7 +901,7 @@ const UserManage = () => {
             >
               <Input placeholder="请输入机构名称" />
             </Form.Item>
-            <Form.Item name="description" label="--描---述--">
+            <Form.Item name="description" label="描述">
               <Input placeholder="请输入相关描述" />
             </Form.Item>
           </Form>
@@ -913,7 +915,7 @@ const UserManage = () => {
           okText="确认"
           cancelText="取消"
         >
-          <Form form={editOrgForm}>
+          <Form form={editOrgForm} labelCol={{ span: 4 }}>
             <Form.Item
               name="OUName"
               label="机构名称"
@@ -921,7 +923,7 @@ const UserManage = () => {
             >
               <Input placeholder="请输入机构名称" />
             </Form.Item>
-            <Form.Item name="description" label="--描---述--">
+            <Form.Item name="description" label="描述">
               <Input placeholder="请输入相关描述" />
             </Form.Item>
           </Form>
@@ -1006,13 +1008,13 @@ const UserManage = () => {
           okText="确认"
           cancelText="取消"
         >
-          <Form form={passwordForm}>
-            <Form.Item name="oldpassword" label="原 始 密 码">
+          <Form form={passwordForm} labelCol={{ span: 4 }}>
+            <Form.Item name="oldpassword" label="原始密码">
               <Input disabled />
             </Form.Item>
             <Form.Item
               name="newPassword"
-              label="新- 密-码"
+              label="新密码"
               rules={[{ required: true, message: '不能为空' }]}
             >
               <Input placeholder="请输入新密码" />
@@ -1035,7 +1037,7 @@ const UserManage = () => {
           okText="确认"
           cancelText="取消"
         >
-          <Form form={editUserForm}>
+          <Form form={editUserForm} labelCol={{ span: 4 }}>
             <Form.Item
               name="loginName"
               label="登录名称"
@@ -1050,10 +1052,10 @@ const UserManage = () => {
             >
               <Input placeholder="请输入用户姓名" />
             </Form.Item>
-            <Form.Item name="phone" label="手 机 号 码">
+            <Form.Item name="phone" label="手机号码">
               <Input placeholder="请输入手机号码" />
             </Form.Item>
-            <Form.Item name="email" label="电 子 邮 箱">
+            <Form.Item name="email" label="电子邮箱">
               <Input placeholder="请输入电子邮箱" />
             </Form.Item>
           </Form>

src/services/appConfig/api.js

@@ -54,11 +54,48 @@ export const addMenuApi = (
     subSystemValue: 'miniapp',
     relatedRoleList: '',
   });
+// 添加菜单组
+export const addMenuGroupApi = (
+  menuID,
+  menuName,
+  shortName,
+  imageUrl,
+  offlineImgUrl,
+  funParam,
+) =>
+  get(`/Cityinterface/rest/services/OMS.svc/MiniApp_AddMenu`, {
+    _version: 9999,
+    _dc: new Date().getTime(),
+    // 根目录添加，parentID 为-1
+    parentID: menuID || -1,
+    menuName,
+    shortName,
+    imageUrl,
+    offlineImgUrl,
+    funParam,
+    subSystemValue: 'miniapp',
+    relatedRoleList: '',
+  });
 
-// 添加菜单
+// 获取角色列表
 export const getRoleList = () =>
   get(`/Cityinterface/rest/services/OMS.svc/P_GetRoleListPlain`, {
     _version: 9999,
     _dc: new Date().getTime(),
     subSystemValue: 'miniapp',
   });
+// 获取菜单
+export const getMenuInfo = id =>
+  get(`/Cityinterface/rest/services/OMS.svc/Mini_GetMenuInfo`, {
+    _version: 9999,
+    _dc: new Date().getTime(),
+    menuID: id,
+  });
+// 获取菜单
+export const deleteMenuApi = id =>
+  get(`/Cityinterface/rest/services/OMS.svc/MiniApp_DeleteMenu`, {
+    _version: 9999,
+    _dc: new Date().getTime(),
+    menuID: id,
+    subSystemValue: 'miniapp',
+  });