module-menu 0.2.50 → 0.2.52-dev-hubjt.2

package/src/pages/ModuleUser/index.jsx

@@ -19,7 +19,7 @@ const ModuleUser = ({ stash = '' }) => {
   const [haveAppSystemPermission, setHaveAppSystemPermission] = useState(false);
   useEffect(() => {
     localStorage.setItem('stash', stash)
-    if (['integration', 'LNRD'].includes(stash)) {
+    if (['integration', 'LNRD', 'HBJK'].includes(stash)) {
       getTenantList();
       allSystemList();
     }
@@ -28,7 +28,7 @@ const ModuleUser = ({ stash = '' }) => {
     window.location.href = url;
   };  
   const handleClickSysManage = () => {
-    if(['integration', 'LNRD'].includes(stash)){
+    if(['integration', 'LNRD', 'HBJK'].includes(stash)){
       Axios('get', '/admin-api/system/auth/homePage', '', {})
         .then((res) => {
           if (res.data.code === 0) {
@@ -52,20 +52,20 @@ const ModuleUser = ({ stash = '' }) => {
     AppSystemSrc,
   } = userMenuIcon;
 
-  const isHaveSystemManagementPermission = (['integration', 'LNRD'].includes(stash))
+  const isHaveSystemManagementPermission = (['integration', 'LNRD', 'HBJK'].includes(stash))
     ? true
     : getStore({ name: 'isHaveSystemManagementPermission' });
-  const DEFAULT_LOGOUT_URL = (['integration', 'LNRD'].includes(stash)) ? '/admin-ui/login' : (stash === 'GZW'? '/data-platform/#/login' : '/#/login');
+  const DEFAULT_LOGOUT_URL = (['integration', 'LNRD', 'HBJK'].includes(stash)) ? '/admin-ui/login' : (stash === 'GZW'? '/data-platform/#/login' : '/#/login');
 
   // 跳转服务门户
   const jumpToExterHome = () => {
     handleClickmenu('/admin-ui/data-share-portal/homePage');
   };
 
-  const curTenantId = ['integration', 'LNRD'].includes(stash)
+  const curTenantId = ['integration', 'LNRD', 'HBJK'].includes(stash)
     ? getStore({ name: 'tenantId' }) && parseInt(getStore({ name: 'tenantId' }))
     : '';
-  const curTenantName = ['integration', 'LNRD'].includes(stash) ? getStore({ name: 'tenantName' }) : '';
+  const curTenantName = ['integration', 'LNRD', 'HBJK'].includes(stash) ? getStore({ name: 'tenantName' }) : '';
 
   const getTenantList = () => {
     Axios('get', '/admin-api/system/user/getUserTenant', '', {})
@@ -113,10 +113,10 @@ const ModuleUser = ({ stash = '' }) => {
 
   // 退出登录
   const logout = () => {
-      const logoutUrl = (['integration', 'LNRD'].includes(stash))
+      const logoutUrl = (['integration', 'LNRD', 'HBJK'].includes(stash))
       ? '/admin-api/system/auth/logout'
       : (stash === 'GZW' ? '/data-platform/auth/token/logout' : '/auth/token/logout');
-    const logouType = (['integration', 'LNRD'].includes(stash)) ? 'post' : 'delete';
+    const logouType = (['integration', 'LNRD', 'HBJK'].includes(stash)) ? 'post' : 'delete';
     Axios(logouType, logoutUrl, '', {})
       .then(() => {
         console.log('退出登录接口调用成功');
@@ -158,7 +158,7 @@ const ModuleUser = ({ stash = '' }) => {
         key="personalCenter"
         onClick={() =>
           handleClickmenu(
-            ['integration', 'LNRD'].includes(stash) ? 
+            ['integration', 'LNRD', 'HBJK'].includes(stash) ? 
             '/admin-ui/data-share-portal/personal/info':
             (stash === 'GZW'? '/data-platform/#/info/index' : '/#/info/index')
           )
@@ -169,7 +169,7 @@ const ModuleUser = ({ stash = '' }) => {
           alt=""
           style={{ marginRight: '10px', marginTop: '-3px' }}
         />
-        <span>{['integration', 'LNRD'].includes(stash) ? '用户中心' : '个人中心'}</span>
+        <span>{['integration', 'LNRD', 'HBJK'].includes(stash) ? '用户中心' : '个人中心'}</span>
       </Menu.Item>
       {isHaveSystemManagementPermission && (
         <Menu.Item key="systemManage" onClick={handleClickSysManage}>
@@ -207,13 +207,14 @@ const ModuleUser = ({ stash = '' }) => {
 
   return (
     <div className={cn(stash !== 'LNRD'? 'right_size':'right_size_LNRD', 'right')}>
-      {['integration', 'LNRD'].includes(stash) && [
-        <Button type="link" onClick={jumpToExterHome} className={cn(stash !== 'LNRD'? null:'fwmh_color_LNRD')}>
-          服务门户
-        </Button>,
+      {['integration', 'LNRD', 'HBJK'].includes(stash) && [
+        // <Button type="link" onClick={jumpToExterHome} 
+        // className={cn(stash === 'LNRD'? 'fwmh_color_LNRD': stash === 'HBJK'? 'fwmh_color_HBJK' : null)}>
+        //   服务门户
+        // </Button>,
         <Select
           defaultValue={curTenantId}
-          className={stash !== 'LNRD'? 'right-select':'right-select_LNRD'}
+          className={stash === 'LNRD'? 'right-select_LNRD': stash === 'HBJK'? 'right-select_HBJK' : 'right-select'}
           style={{
             width: 150,
             border: 'none',
@@ -232,13 +233,14 @@ const ModuleUser = ({ stash = '' }) => {
                 verticalAlign: '-2px',
                 fontSize: '16px',
                 fontWeight: '500',
-                color: stash !== 'LNRD'? null: '#FFFFFF'
+                // color: stash !== 'LNRD'? null: '#FFFFFF'
+                color: ['LNRD','HBJK'].includes(stash)? '#FFFFFF' : null
               }}
             >
               {getUserName()}
             </span>
             <CaretDownOutlined
-              style={{ marginLeft: '10px', fontSize: '8px', color: stash !== 'LNRD'? '#333333': '#FFFFFF'}}
+              style={{ marginLeft: '10px', fontSize: '8px', color: ['LNRD','HBJK'].includes(stash)? '#FFFFFF': '#333333'}}
             />
           </span>
         </HeaderDropdown>

package/src/pages/ModuleUser/index.less

@@ -55,12 +55,24 @@
   border: none !important;
   box-shadow: none !important;
 }
+:global(.right-select_HBJK> .ant-select-selector) {
+  border: none !important;
+  box-shadow: none !important;
+  background-color: #ffffff00 !important;
+  text-align: end !important;
+}
 :global(.right-select_LNRD> .ant-select-arrow>.anticon) {
   color: #FFFFFF !important;
 }
+:global(.right-select_HBJK> .ant-select-arrow>.anticon) {
+  color: #FFFFFF !important;
+}
 .right-select_LNRD .ant-select-selection-item{
   color: #FFFFFF !important;
 }
+.right-select_HBJK .ant-select-selection-item{
+  color: #FFFFFF !important;
+}
 
 .menu {
   :global(.anticon) {
@@ -77,6 +89,9 @@
 .fwmh_color_LNRD  .ant-btn-link{
   color: #FFE347 ;
 }
+.fwmh_color_HBJK.ant-btn-link{
+  color: #FFF ;
+}
 .right_size_LNRD .ant-btn-link:hover,
 .right_size_LNRD .ant-btn-link:focus{
   color:#FFE347

package/src/pages/index.jsx

@@ -1,5 +1,5 @@
 import ModuleMenu from './ModuleMenu';
 import ModuleUser from './ModuleUser';
 import Footer from './Footer';
-export { ModuleMenu, ModuleUser, Footer };
-// export default ModuleMenu;
+// export { ModuleMenu, ModuleUser, Footer };
+export default ModuleUser;

package/src/pages/util/axios.js

@@ -4,7 +4,7 @@ import baseCof from './config';
 import getStore from './userInfo';
 import { checkToken} from './permessionUtils';
 
-let tokenValue='a1a2a1b747f644acb6e26c0e1ea79fe8';
+let tokenValue='7633f3961f9f43fdb7f8cf0a9e6a553f';
 // 轻量级tokenInSessionStor存在（GZW跳/data-platform/#/login，否则/#/login）,一体化tokenInSessionStor不存在
 const tokenInSessionStor = window.sessionStorage.getItem('bigdata-access_token');
 // stash=GZW为轻量级国资委 stash=integration 为一体化，其余为其他轻量级 

package/src/pages/util/config.js

@@ -1,6 +1,6 @@
 const {origin} = window.location
 const baseCof = {
-  baseSever: origin,
+  baseSever: process.env.NODE_ENV === 'production' ? origin : '',  // 开发环境使用相对路径,
   basePath: process.env.NODE_ENV === 'production'?`/app/cmcc/data`:'/cmcc/data',
 };                                                                                                                                                     
 export default baseCof;