Merge branch 'develop' of http://git.mmcuav.cn/iuav/csf-admin into develop

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 7ba43daa620965cbaed7b2167edf014117ebab2b
+  newTag: 0c40c04e4e7744b42711f2414d516b8c41294f9c

src/components/select-map/index.tsx

@@ -73,6 +73,9 @@ const SelectMapModal: FC<propType> = (props) => {
   // componentDidMount
   useEffect(() => {
     if (!open) return;
+    return () => {
+      setPosition(undefined);
+    };
   }, [open]);
   return (
     <Modal open={open} title={title} onCancel={handleCancel} onOk={handleOk} destroyOnClose>

src/pages/customManage/customIdentity/comp/addEditModal/index.tsx

@@ -145,7 +145,12 @@ const AddEditModal: FC<propType> = (props) => {
             name='content'
             rules={[{ required: true, message: '请输入服务资质' }]}
           >
-            <Input.TextArea placeholder={'请输入服务资质'} maxLength={140} allowClear showCount />
+            <Input.TextArea
+              placeholder={'请输入服务资质（“；”号换行）'}
+              maxLength={140}
+              allowClear
+              showCount
+            />
           </Form.Item>
           <Form.Item
             label='服务评分'

src/pages/systemManage/accountManage/index.tsx

@@ -110,13 +110,13 @@ function AccountManageView() {
       width: '150px',
       fixed: 'left',
     },
-    {
-      title: '账号类型',
-      dataIndex: 'companyInfoVO',
-      align: 'center',
-      width: '10%',
-      render: (_text, record) => (record?.companyInfoVO?.companyType === 1 ? '合伙人' : '员工'),
-    },
+    // {
+    //   title: '账号类型',
+    //   dataIndex: 'companyInfoVO',
+    //   align: 'center',
+    //   width: '10%',
+    //   render: (_text, record) => (record?.companyInfoVO?.companyType === 1 ? '合伙人' : '员工'),
+    // },
     { title: '姓名', dataIndex: 'userName', align: 'center', width: '10%' },
     {
       title: '所属单位',
@@ -125,12 +125,12 @@ function AccountManageView() {
       width: '150px',
       ellipsis: true,
     },
-    {
-      title: '渠道等级',
-      dataIndex: 'channelLevel',
-      align: 'center',
-      width: '150px',
-    },
+    // {
+    //   title: '渠道等级',
+    //   dataIndex: 'channelLevel',
+    //   align: 'center',
+    //   width: '150px',
+    // },
     {
       title: '角色',
       align: 'center',
@@ -157,12 +157,12 @@ function AccountManageView() {
       width: '10%',
       render: (text) => (text === 1 ? '可用' : '停用'),
     },
-    {
-      title: '企业实名认证',
-      dataIndex: 'companyAuthStatus',
-      align: 'center',
-      width: '10%',
-    },
+    // {
+    //   title: '企业实名认证',
+    //   dataIndex: 'companyAuthStatus',
+    //   align: 'center',
+    //   width: '10%',
+    // },
     {
       title: '操作',
       width: '160px',
@@ -212,16 +212,16 @@ function AccountManageView() {
             type: 'input',
             placeholder: '请输入姓名或账号',
           },
-          {
-            label: '账号类型',
-            name: 'userType',
-            type: 'Select',
-            placeholder: '请选择账号类型',
-            options: [
-              { value: 1, label: '员工' },
-              { value: 0, label: '合伙人' },
-            ],
-          },
+          // {
+          //   label: '账号类型',
+          //   name: 'userType',
+          //   type: 'Select',
+          //   placeholder: '请选择账号类型',
+          //   options: [
+          //     { value: 1, label: '员工' },
+          //     { value: 0, label: '合伙人' },
+          //   ],
+          // },
           {
             label: '角色',
             name: 'roleId',

src/router/router.tsx

@@ -102,14 +102,14 @@ const CategoryDetail = React.lazy(() => import('~/pages/categoryManage/category/
 // 目录管理
 const DirectoryManage = React.lazy(() => import('~/pages/categoryManage/directoryManage'));
 
-//飞手培训
-const InstitutionsListView = React.lazy(
-  () => import('~/pages/pilotTraining/ licensureExamination/institutionsList'),
-);
-//机构上传
-const AddInstitutionsView = React.lazy(
-  () => import('~/pages/pilotTraining/ licensureExamination/addOrEditInstitution'),
-);
+// //飞手培训
+// const InstitutionsListView = React.lazy(
+//   () => import('~/pages/pilotTraining/ licensureExamination/institutionsList'),
+// );
+// //机构上传
+// const AddInstitutionsView = React.lazy(
+//   () => import('~/pages/pilotTraining/ licensureExamination/addOrEditInstitution'),
+// );
 
 // 系统管理
 import AccountManageView from '~/pages/systemManage/accountManage';
@@ -895,50 +895,50 @@ export const routerList: Array<RouteObjectType> = [
   //     },
   //   ],
   // },
-  {
-    path: '/pilotTraining',
-    element: <LayoutView />,
-    errorElement: <ErrorPage />,
-    meta: {
-      id: 1500,
-      icon: <SettingOutlined />,
-      title: '飞手培训',
-    },
-    children: [
-      {
-        path: '/pilotTraining/institutionsList',
-        element: withLoadingComponent(<InstitutionsListView />),
-        errorElement: <ErrorPage />,
-        meta: {
-          id: 1510,
-          title: '执照考试',
-          icon: <UserOutlined />,
-        },
-      },
-      {
-        path: '/pilotTraining/institutionsList/add',
-        element: withLoadingComponent(<AddInstitutionsView />),
-        errorElement: <ErrorPage />,
-        meta: {
-          id: 1520,
-          title: '机构上传',
-          icon: <UserOutlined />,
-          hidden: true,
-        },
-      },
-      {
-        path: '/pilotTraining/institutionsList/edit',
-        element: withLoadingComponent(<AddInstitutionsView />),
-        errorElement: <ErrorPage />,
-        meta: {
-          id: 1530,
-          title: '机构编辑',
-          icon: <UserOutlined />,
-          hidden: true,
-        },
-      },
-    ],
-  },
+  // {
+  //   path: '/pilotTraining',
+  //   element: <LayoutView />,
+  //   errorElement: <ErrorPage />,
+  //   meta: {
+  //     id: 1500,
+  //     icon: <BankOutlined />,
+  //     title: '飞手培训',
+  //   },
+  //   children: [
+  //     {
+  //       path: '/pilotTraining/institutionsList',
+  //       element: withLoadingComponent(<InstitutionsListView />),
+  //       errorElement: <ErrorPage />,
+  //       meta: {
+  //         id: 1510,
+  //         title: '执照考试',
+  //         icon: <VerifiedOutlined />,
+  //       },
+  //     },
+  //     {
+  //       path: '/pilotTraining/institutionsList/add',
+  //       element: withLoadingComponent(<AddInstitutionsView />),
+  //       errorElement: <ErrorPage />,
+  //       meta: {
+  //         id: 1520,
+  //         title: '机构上传',
+  //         icon: <UserOutlined />,
+  //         hidden: true,
+  //       },
+  //     },
+  //     {
+  //       path: '/pilotTraining/institutionsList/edit',
+  //       element: withLoadingComponent(<AddInstitutionsView />),
+  //       errorElement: <ErrorPage />,
+  //       meta: {
+  //         id: 1530,
+  //         title: '机构编辑',
+  //         icon: <UserOutlined />,
+  //         hidden: true,
+  //       },
+  //     },
+  //   ],
+  // },
   {
     path: '/systemManage',
     element: <LayoutView />,
@@ -966,7 +966,7 @@ export const routerList: Array<RouteObjectType> = [
         meta: {
           id: 1420,
           title: '权限角色',
-          icon: <UserOutlined />,
+          icon: <TeamOutlined />,
         },
       },
       {