module-menu 0.2.11 → 0.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "城市大数据平台公共头部及尾部",
   "main": "src/pages/index.jsx",
   "scripts": {

package/src/pages/ModuleMenu/index.jsx

@@ -29,18 +29,26 @@ const ModuleMenu = ({ sysName, stash }) => {
         setCanOperatExchange(true);
       }
     } else {
-      Axios('get', '/admin-api/system/user/getUserMenusList', '', {})
+      Axios(
+        'get',
+        '/admin-api/system/user/get-user-menu-List?menuName=数据平台',
+        '',
+        {},
+      )
         .then((res) => {
           if (res.data.code === 0) {
             let menuGet =
-              res.data.data &&
-              res.data.data.map((item) => {
-                return {
-                  ...item,
-                  path:
-                    item.path.indexOf('/') !== -1 ? item.path : '/' + item.path,
-                };
-              });
+              (res.data.data &&
+                res.data.data[0]?.routes?.map((item) => {
+                  return {
+                    ...item,
+                    path:
+                      item.path.indexOf('/') !== -1
+                        ? item.path
+                        : '/' + item.path,
+                  };
+                })) ||
+              [];
             setSessionMenu(menuGet);
             const menuLists = getNewMenuList(menuGet);
             setMenuList(menuLists);
@@ -68,6 +76,7 @@ const ModuleMenu = ({ sysName, stash }) => {
       message.warning('没有获取到菜单列表，请联系管理员添加权限');
       return;
     }
+
     if (nameStr === '政务共享交换平台') {
       Axios('get', '/admin/social/logoutUri', '', {})
         .then((res) => {
@@ -128,6 +137,10 @@ const ModuleMenu = ({ sysName, stash }) => {
         case '资源管理':
           thirdPartyServiceJumpPath = '/admin-ui/resource/tableResource/list';
           break;
+        case '供需对接':
+          thirdPartyServiceJumpPath =
+            '/admin-ui/supply-and-demand-docking/dataRequirement/propose/list';
+          break;
         default:
           break;
       }

package/src/pages/ModuleUser/index.jsx

@@ -24,7 +24,21 @@ const ModuleUser = ({ stash }) => {
   const handleClickmenu = (url) => {
     window.location.href = url;
   };
-
+  const handleClickSysManage = () => {
+    if (!stash) {
+      window.location.href = '/#/admin/user/index';
+    } else {
+      Axios('get', '/admin-api/system/auth/homePage', '', {})
+        .then((res) => {
+          if (res.data.code === 0) {
+            window.location.href = `/admin-ui${res.data.data.path}`;
+          } else {
+            message.warning(res.data.msg || '获取系统管理页面路由信息失败');
+          }
+        })
+        .catch((e) => console.log('e', e));
+    }
+  };
   const {
     PersonalCenterSrc,
     MessageCenterSrc,
@@ -139,7 +153,11 @@ const ModuleUser = ({ stash }) => {
       <Menu.Item
         key="personalCenter"
         onClick={() =>
-          handleClickmenu(!stash ? '/#/info/index' : '/admin-ui/user/profile')
+          handleClickmenu(
+            !stash
+              ? '/#/info/index'
+              : '/admin-ui/data-share-portal/personal/info',
+          )
         }
       >
         <img
@@ -147,19 +165,10 @@ const ModuleUser = ({ stash }) => {
           alt=""
           style={{ marginRight: '10px', marginTop: '-3px' }}
         />
-        <span>个人中心</span>
+        <span>{!stash ? '个人中心' : '用户中心'}</span>
       </Menu.Item>
       {isHaveSystemManagementPermission && (
-        <Menu.Item
-          key="systemManage"
-          onClick={() =>
-            handleClickmenu(
-              !stash
-                ? '/#/admin/user/index'
-                : '/admin-ui/bpm/manager/user-group',
-            )
-          }
-        >
+        <Menu.Item key="systemManage" onClick={handleClickSysManage}>
           <img
             src={SystemManageSrc}
             alt=""

package/src/pages/index.jsx

@@ -2,3 +2,4 @@ import ModuleMenu from './ModuleMenu';
 import ModuleUser from './ModuleUser';
 import Footer from './Footer';
 export { ModuleMenu, ModuleUser, Footer };
+// export default ModuleMenu;