module-menu 0.3.0 → 0.3.2

package/package.json

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

package/src/pages/ModuleMenu/constData.jsx

@@ -349,3 +349,35 @@ export const sysNameMap = (stash = '') => [
     logoSrc: stash !=='LNRD'? require('../../assets/alert_logo.svg'): require('../../assets/alert_logo_LNRD.svg'),
   },
 ];
+
+export const menuList_HBJK = [{
+    name: '数据资源中心',
+    url: require('../../assets/sjzyzx.png'),
+     children: [
+        {
+            childName: '公共卫生监测人口库',
+            path: '/datamanage',
+            url:require('../../assets/ggws.png'),
+        },
+         {
+            childName: '电子传染病档案库',
+            path: '/datamanage',
+            url:require('../../assets/dzcrb.png'),
+        },
+         {
+            childName: '应急资源库',
+            path: '/datamanage',
+            url:require('../../assets/yjzyk.png'),
+        },
+         {
+            childName: '传染病防控知识库',
+            path: '/datamanage',
+            url:require('../../assets/crbd.png'),
+        },
+         {
+            childName: '主题库',
+            path: '/datamanage',
+            url:require('../../assets/ztk.png'),
+        },
+    ]
+}]

package/src/pages/ModuleMenu/index.jsx

@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef, useMemo } from 'react';
 import { Popconfirm, message, Popover } from 'antd';
-import { menuList as menuListInit, menuIconSrc, sysNameMap } from './constData';
+import { menuList as menuListInit, menuIconSrc, sysNameMap, menuList_HBJK} from './constData';
 import HeaderDropdown from '../ModuleUser/HeaderDropdown';
 import { getInfoByName, getUrlByInfo } from './service.js'
 import Axios from '../util/axios';
@@ -247,6 +247,9 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
           newMenuList.splice(index, 1);
         }
       }
+    }
+     if (stash === 'HBJK') {
+      newMenuList = newMenuList.concat(menuList_HBJK);
     }
     return newMenuList;
   };
@@ -265,7 +268,7 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
         }}
       >
         <div
-          className="leftMenu"
+          className={stash === 'HBJK' ? 'leftMenu_HBJK' : 'leftMenu'}
           style={{
             height:
               item.children.length > 6
@@ -281,7 +284,10 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
                 : '70px',
           }}
         >
-          <img src={item.url} className={stash !== 'LNRD'? 'middle' : 'middle_LNRD'} />
+          <img src={item.url} className={
+            stash === 'HBJK' ? 'middle_HBJK' : 
+            stash !== 'LNRD' ? 'middle' : 'middle_LNRD'
+          } />
           <span
           className={cn(stash !== 'LNRD'? 'middle' : 'middle_LNRD', 'textPad')}
             // className=`${{stash !== 'LNRD'? 'middle' : 'middle_LNRD'}} textPad`
@@ -363,7 +369,7 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
             backgroundRepeat: 'no-repeat',
             backgroundSize: '50%',
             backgroundPosition: 'center',
-            backgroundColor: stash === 'LNRD'? '#EA1A1A': stash === 'HBJK'? '#1890ff' : '#4091F7'
+            backgroundColor: stash === 'LNRD'? '#EA1A1A': stash === 'HBJK'? '#1373FF' : '#4091F7'
 
           }}
         >

package/src/pages/ModuleMenu/index.less

@@ -39,6 +39,16 @@
   font-weight: 400;
 }
 
+.leftMenu_HBJK {
+  width: 120px;
+  float: left;
+  color: rgba(0, 0, 0, 0.85);
+  font-size: 16px;
+  cursor: pointer;
+  text-align: left;
+  font-weight: 400;
+}
+
 .rightMenu {
   width: 460px;
   float: left;
@@ -67,9 +77,19 @@
   display: inline-block;
 }
 
+.childMenu_HBJK {
+  width: 30%;
+  display: inline-block;
+}
 .middle, .middle_LNRD {
   vertical-align: middle;
 }
+
+.middle_HBJK {
+  vertical-align: middle;
+  width: 20px;
+  height: 20px;
+}
 // .middle_sub_LNRD {
 //   width: 20px;
 //   height: 20px;

package/src/pages/ModuleUser/index.jsx

@@ -12,6 +12,7 @@ import Axios from '../util/axios';
 import getStore, { getUserName } from '../util/userInfo';
 import './index.less';
 import cn from 'classnames'
+import userLogo1 from '../../assets/userLogo1.png';
 
 // stash存在则为一体化，否则为轻量级
 const ModuleUser = ({ stash = '' }) => {
@@ -226,7 +227,11 @@ const ModuleUser = ({ stash = '' }) => {
       {getUserName() ? (
         <HeaderDropdown overlay={menu}>
           <span style={{ display: 'inline-block', marginLeft: '12px' }}>
-            <Avatar size="small" icon={<UserOutlined />} />
+           {stash === 'HBJK' ? (
+              <Avatar size="small" src={userLogo1} />
+            ) : (
+              <Avatar size="small" icon={<UserOutlined />} />
+            )}
             <span
               style={{
                 marginLeft: '10px',