module-menu 0.2.6 → 0.2.8

package/package.json

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

package/src/assets/appsystemSrc.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1706754879161" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4232" width="16" height="16" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M511.8 155.1l313.9 126.7-314.9 128.1-313.9-126.7 314.9-128.1m0-86.2c-3.7 0-7.3 0.7-10.8 2.1L49.8 254.6c-25.2 10.2-25.2 47.3-0.1 57.5L500.2 494c3.4 1.4 7 2.1 10.7 2.1 3.7 0 7.3-0.7 10.8-2.1l451.2-183.6c25.2-10.2 25.2-47.3 0.1-57.5L522.4 71c-3.4-1.4-7-2.1-10.6-2.1z" p-id="4233" fill="#515151"></path><path d="M510.5 715.7c-8.6 0-17.3-1.7-25.5-5L54.3 536.9c-21-8.5-31.1-32.3-22.6-53.3S64.1 452.5 85 461l425.6 171.8 426.3-173.4c20.9-8.6 44.8 1.5 53.4 22.5 8.5 21-1.5 44.9-22.5 53.4L536.3 710.7c-8.3 3.3-17 5-25.8 5z" p-id="4234" fill="#515151"></path><path d="M512.7 955.1c-8.7 0-17.3-1.7-25.5-5L56.4 776.2c-21-8.5-31.1-32.3-22.6-53.3s32.4-31.1 53.3-22.7L512.7 872 939 698.6c20.9-8.5 44.8 1.5 53.4 22.5 8.5 21-1.6 44.8-22.5 53.4L538.4 950c-8.2 3.4-17 5.1-25.7 5.1z" p-id="4235" fill="#515151"></path></svg>

package/src/pages/ModuleMenu/constData.jsx

@@ -55,33 +55,56 @@ export const menuList = (stash) => [
   {
     name: '数据开放',
     url: require('../../assets/ic_shujukaifang_m.svg'),
-    children: [
-      {
-        childName: '数据服务',
-        path: '/dataservice',
-        url: require('../../assets/dataservice_slogo.svg'),
-      },
-      {
-        childName: '数据资产',
-        path: '/dataasset',
-        url: require('../../assets/dataasset_slogo.svg'),
-      },
-      {
-        childName: '数据共享',
-        path: '/datasharing',
-        url: require('../../assets/datasharing_slogo.svg'),
-      },
-      {
-        childName: '目录管理',
-        path: '/muluguanli',
-        url: require('../../assets/muluguanli_slogo.png'),
-      },
-      {
-        childName: '资源管理',
-        path: '/ziyuanguanli',
-        url: require('../../assets/ziyuanguanli_slogo.png'),
-      },
-    ],
+    children: stash
+      ? [
+          {
+            childName: '数据服务',
+            path: '/dataservice',
+            url: require('../../assets/dataservice_slogo.svg'),
+          },
+          {
+            childName: '数据资产',
+            path: '/dataasset',
+            url: require('../../assets/dataasset_slogo.svg'),
+          },
+          {
+            childName: '数据共享',
+            path: '/datasharing',
+            url: require('../../assets/datasharing_slogo.svg'),
+          },
+          {
+            childName: '目录管理',
+            path: '/muluguanli',
+            url: require('../../assets/muluguanli_slogo.png'),
+          },
+          {
+            childName: '资源管理',
+            path: '/ziyuanguanli',
+            url: require('../../assets/ziyuanguanli_slogo.png'),
+          },
+          {
+            childName: '供需对接',
+            path: '/gongxuduijie',
+            url: require('../../assets/gongxuduijie_slogo.png'),
+          },
+        ]
+      : [
+          {
+            childName: '数据服务',
+            path: '/dataservice',
+            url: require('../../assets/dataservice_slogo.svg'),
+          },
+          {
+            childName: '数据资产',
+            path: '/dataasset',
+            url: require('../../assets/dataasset_slogo.svg'),
+          },
+          {
+            childName: '数据共享',
+            path: '/datasharing',
+            url: require('../../assets/datasharing_slogo.svg'),
+          },
+        ],
   },
   {
     name: '数据应用',

package/src/pages/ModuleMenu/index.jsx

@@ -23,18 +23,26 @@ const ModuleMenu = ({ sysName, stash }) => {
       const menuLists = getNewMenuList(menuGet);
       setMenuList(menuLists);
     } 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);
@@ -106,6 +114,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;
     }
@@ -115,7 +127,7 @@ const ModuleMenu = ({ sysName, stash }) => {
   // 跳转首页
   const toHomePage = (index) => {
     if (index === 0) {
-      window.location.href = '/#/index';
+      window.location.href = !stash ? '/#/index' : '/dataadmin/#/index';
     }
   };
   const getNewMenuList = (menuGet) => {

package/src/pages/ModuleUser/constData.jsx

@@ -1,11 +1,8 @@
 // 图标位置
 export const userMenuIcon = {
-    PersonalCenterSrc:require('../../assets/personalCenter.svg'),
-    MessageCenterSrc:require('../../assets/messageCenter.svg'),
-    SystemManageSrc:require('../../assets/systemManage.svg'),
-    LogoutSrc:require('../../assets/logout.png'),
-}
-export const PersonalCenterSrc = require('../../assets/personalCenter.svg');
-export const MessageCenterSrc = require('../../assets/messageCenter.svg');
-export const SystemManageSrc = require('../../assets/systemManage.svg');
-export const LogoutSrc = require('../../assets/logout.png');
+  PersonalCenterSrc: require('../../assets/personalCenter.svg'),
+  MessageCenterSrc: require('../../assets/messageCenter.svg'),
+  SystemManageSrc: require('../../assets/systemManage.svg'),
+  LogoutSrc: require('../../assets/logout.png'),
+  AppSystemSrc: require('../../assets/appsystemSrc.svg'),
+};

package/src/pages/ModuleUser/index.jsx

@@ -14,17 +14,24 @@ import './index.less';
 // stash存在则为一体化，否则为轻量级
 const ModuleUser = ({ stash }) => {
   const [tenantList, setTenantList] = useState([]);
+  const [haveAppSystemPermission, setHaveAppSystemPermission] = useState(false);
   useEffect(() => {
     if (stash) {
       getTenantList();
+      allSystemList();
     }
   }, []);
   const handleClickmenu = (url) => {
     window.location.href = url;
   };
 
-  const { PersonalCenterSrc, MessageCenterSrc, SystemManageSrc, LogoutSrc } =
-    userMenuIcon;
+  const {
+    PersonalCenterSrc,
+    MessageCenterSrc,
+    SystemManageSrc,
+    LogoutSrc,
+    AppSystemSrc,
+  } = userMenuIcon;
 
   const isHaveSystemManagementPermission = stash
     ? true
@@ -60,6 +67,31 @@ const ModuleUser = ({ stash }) => {
       })
       .catch((e) => console.log('e', e));
   };
+  const allSystemList = () => {
+    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[0]?.routes?.map((item) => {
+              return {
+                ...item,
+                path:
+                  item.path.indexOf('/') !== -1 ? item.path : '/' + item.path,
+              };
+            });
+          let haveAppSystem_Permission =
+            menuGet?.some((item) => item.name === '应用系统配置') || false;
+          setHaveAppSystemPermission(haveAppSystem_Permission);
+        }
+      })
+      .catch((e) => console.log('e', e));
+  };
 
   // 退出登录
   const logout = () => {
@@ -139,6 +171,19 @@ const ModuleUser = ({ stash }) => {
           <span>系统管理</span>
         </Menu.Item>
       )}
+      {haveAppSystemPermission && (
+        <Menu.Item
+          key="appSystem"
+          onClick={() => handleClickmenu('/dataadmin/#/appSystem/index')}
+        >
+          <img
+            src={AppSystemSrc}
+            alt=""
+            style={{ marginRight: '10px', marginTop: '-3px' }}
+          />
+          <span>应用系统配置</span>
+        </Menu.Item>
+      )}
       <Menu.Item key="logout" onClick={() => logout()}>
         <img
           src={LogoutSrc}