code4eat 2 лет назад
Родитель
Сommit
5080766c86

+ 2 - 2
config/config.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:04:20
- * @LastEditTime: 2023-06-12 13:52:25
+ * @LastEditTime: 2023-06-13 14:39:01
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/config/config.ts
@@ -144,7 +144,7 @@ export default defineConfig({
       ],
     },
   ],
-  hash:true,
+ // hash:true,
   proxy: proxy[REACT_APP_ENV || 'dev'],
   manifest: {
     basePath: '/',

+ 3 - 3
config/proxy.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:00:52
- * @LastEditTime: 2023-06-13 10:18:10
+ * @LastEditTime: 2023-06-15 14:07:16
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/config/proxy.ts
@@ -16,8 +16,8 @@ const proxy: { [key: string]: any } = {
   dev: {
     //绩效管理
     '/gateway': {
-      //target: 'http://47.96.149.190:5000',
-      target: 'http://120.27.235.181:5000',
+      target: 'http://47.96.149.190:5000',
+      //target: 'http://120.27.235.181:5000',
       changeOrigin: true,
       // pathRewrite: { '^/master': '' },
     },

BIN
public/images/avatar.png


BIN
public/images/threePoint_white_more.png


+ 2 - 2
src/app.tsx

@@ -260,9 +260,9 @@ export const qiankun = fetch('/config').then(() => ({
     // },
     {
       name: 'budgetManaSystem', // 唯一 id
-      //entry: '//localhost:8001',
+      entry: '//localhost:8001',
       //entry: '//120.27.235.181:5000/perform/',  //开发
-      entry: '//47.96.149.190:5000/perform/', //演示
+      //entry: '//47.96.149.190:5000/perform/', //演示
     },
     {
       name: 'PFMBackC', // 唯一 id

+ 110 - 67
src/components/topBar/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-16 09:12:37
- * @LastEditTime: 2023-06-12 10:45:15
+ * @LastEditTime: 2023-06-16 11:17:35
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/index/components/topBar/index.tsx
@@ -36,7 +36,7 @@ interface TopBarType {
 
 
 const TopBar: React.FC<TopBarType> = (props) => {
-  const { onTabChange, userPannelTabClick, onCloseTab, onTabClick, userData, navData,currentTab } = props;
+  const { onTabChange, userPannelTabClick, onCloseTab, onTabClick, userData, navData, currentTab } = props;
   const [systemTabs, setSystemTabs] = useState<TopBar.Tab[]>([]); //已打开的tab
   const [currentSelectedTab, setCurrentSelectedTab] = useState<TopBar.Tab>();
   const [ifOpenPannel, setIfOpenPannel] = useState(false);
@@ -45,10 +45,13 @@ const TopBar: React.FC<TopBarType> = (props) => {
   const [currentActivedBlockIndex, set_currentActivedBlockIndex] = useState(0);
   const [panelData, set_panelData] = useState<TopBar.PanelData[]>([]);
 
-  const [onTabSystemTabs,set_onTabSystemTabs] = useState<TopBar.Tab[]>([]); //tab导航可以放下的数量,剩余通过下拉获取
+  const [onTabSystemTabs, set_onTabSystemTabs] = useState<TopBar.Tab[]>([]); //tab导航可以放下的数量,剩余通过下拉获取
+  const [onTabSystemTabs_hide, set_onTabSystemTabs_hide] = useState<TopBar.Tab[]>([]);  //下拉掩藏的导航
 
   const { initialState, setInitialState } = useModel('@@initialState');
 
+  const [showMoreTabPannel, set_showMoreTabPannel] = useState(false);
+
 
   const localSavedTab = localStorage.getItem('currentSelectedTab');
 
@@ -69,18 +72,18 @@ const TopBar: React.FC<TopBarType> = (props) => {
     //导航栏系统菜单列表点击回调
     if (currentSelectedTab?.menuId == data.menuId) return;
 
-      //临时保存衣打开过的菜单
+    //临时保存衣打开过的菜单
     const t = localStorage.getItem('visitedTabs');
 
-    if(t){
+    if (t) {
       let visitedTabs = JSON.parse(t);
-      let index = visitedTabs.findIndex((t:TopBar.Tab)=>t.menuId == data.menuId);
-      if(index == -1){
+      let index = visitedTabs.findIndex((t: TopBar.Tab) => t.menuId == data.menuId);
+      if (index == -1) {
         visitedTabs.push(data);
-        localStorage.setItem('visitedTabs',JSON.stringify(visitedTabs));
+        localStorage.setItem('visitedTabs', JSON.stringify(visitedTabs));
       }
-    }else{
-      localStorage.setItem('visitedTabs',JSON.stringify([data]));
+    } else {
+      localStorage.setItem('visitedTabs', JSON.stringify([data]));
     }
 
     _systemTabClickHandle(data); //触发一次tab点击
@@ -88,7 +91,7 @@ const TopBar: React.FC<TopBarType> = (props) => {
     set_pageTitle(panelData[currentActivedBlockIndex].child[index].name)
 
     if (panelData[currentActivedBlockIndex].child[index].child) {
-      // console.log([...panelData[currentActivedBlockIndex].child[index].child])
+      //console.log([...panelData[currentActivedBlockIndex].child[index].child])
       setSystemTabs([...panelData[currentActivedBlockIndex].child[index].child]);
     }
     setIfOpenPannel(false);
@@ -126,19 +129,19 @@ const TopBar: React.FC<TopBarType> = (props) => {
       <div className='userPannel'>
         <div className='userPannelTab' onClick={() => _userPannelTabClick('SETTING')}>
           <SettingOutlined />
-          设置
+         <span>设置</span> 
         </div>
         <div className='userPannelTab' onClick={() => _userPannelTabClick('LOGOUT')}>
           <LogoutOutlined />
-          退出
+          <span>退出</span> 
         </div>
       </div>
     );
   };
 
-  const goChannelIndex = (menuData:any) => {
+  const goChannelIndex = (menuData: any) => {
     setIfOpenPannel(false);
-    onTabClick&&onTabClick(menuData)
+    onTabClick && onTabClick(menuData)
   }
 
   const goToHome = () => {
@@ -155,24 +158,36 @@ const TopBar: React.FC<TopBarType> = (props) => {
     localStorage.removeItem('openKeys');
   }
 
-  const goSystemIndex = (name:string)=>{
-       if(panelData[currentActivedBlockIndex]){
-            const result:TopBar.TypeBlock[] = panelData[currentActivedBlockIndex].child.filter(t=>(t.name == name));
-            if(result.length>0){
-              _systemTabClickHandle(Object.assign(result[0]))
-                // history.push(result[0].path)
-            }
-       }
+  const goSystemIndex = (name: string) => {
+    if (panelData[currentActivedBlockIndex]) {
+      const result: TopBar.TypeBlock[] = panelData[currentActivedBlockIndex].child.filter(t => (t.name == name));
+      if (result.length > 0) {
+        _systemTabClickHandle(Object.assign(result[0]))
+        // history.push(result[0].path)
+      }
+    }
   }
 
   const openNav = () => {
     setIfOpenPannel(!ifOpenPannel);
   }
 
-  
 
-  const reSetNav = (_panelData: TopBar.PanelData[], cur: TopBar.Tab) => {
+  const moreItemClickHandle = (systemData:TopBar.Tab)=>{
+      //点击更多应用时
+      _systemTabClickHandle(systemData);
+      const temp = onTabSystemTabs[onTabSystemTabs.length - 1];
+      const _onTabSystemTabs = [...onTabSystemTabs];
+      const b = _onTabSystemTabs.filter(a=>a.systemId != temp.systemId);
     
+      set_onTabSystemTabs([...b,systemData]);
+      set_onTabSystemTabs_hide([...onTabSystemTabs_hide.filter(a=>a.systemId != systemData.systemId),temp])
+  }
+
+
+
+  const reSetNav = (_panelData: TopBar.PanelData[], cur: TopBar.Tab) => {
+
     if (!(_panelData.length > 0)) return
 
     if (JSON.stringify(cur) != '{}') {
@@ -185,7 +200,7 @@ const TopBar: React.FC<TopBarType> = (props) => {
 
       one: for (let index = 0; index < _panelData.length; index++) {
         blockIndex = index;
-    
+
         if (_panelData[index] && _panelData[index].child) {
           two: for (let i = 0; i < _panelData[index].child.length; i++) {
             channelIndex = i;
@@ -195,8 +210,8 @@ const TopBar: React.FC<TopBarType> = (props) => {
                 for (let k = 0; k < _systems.length; k++) {
                   if (_systems[k].menuId == _currentSelectedTabFromLocal.menuId) {
                     set_currentActivedBlockIndex(blockIndex);
-                     set_pageTitle(_panelData[blockIndex].child[channelIndex].name); //设置体系标题
-                     
+                    set_pageTitle(_panelData[blockIndex].child[channelIndex].name); //设置体系标题
+
                     break one;
                   }
                 }
@@ -212,54 +227,66 @@ const TopBar: React.FC<TopBarType> = (props) => {
         localStorage.setItem('currentSelectedTab', JSON.stringify(_currentSelectedTabFromLocal));
         setInitialState((s) => ({ ...s, currentSelectedSys: _currentSelectedTabFromLocal }));
       }
-      
+
       //_systemTabClickHandle(_currentSelectedTabFromLocal);  //恢复选中的tab
-  
+
 
     }
   }
 
-  useEffect(() => { 
+  useEffect(() => {
     if (currentSelectedTabFromLocal) {
       reSetNav(navData, currentSelectedTabFromLocal);
     }
-      
+
     set_panelData(navData);
+
   }, [navData])
 
-  useEffect(()=>{
+  useEffect(() => {
+
+    if (currentTab) reSetNav(panelData, currentTab);
+
+  }, [currentTab]);
 
-    if(currentTab)reSetNav(panelData,currentTab);
-     
-  },[currentTab]);
 
- 
 
 
-  useEffect(()=>{
-      //  console.log('systemTabs.length',systemTabs.length);
-       if(systemTabs.length>6){
-        const tabs = systemTabs.filter((a:any,index:number)=>{
-                //暂时限制只展示最多5个
-                if(index<=5){
-                   return a
-                } 
-        });
+  useEffect(() => {
+
+    if (systemTabs.length > 5) {
+      //set_onTabSystemTabs(tabs);
+      let _onTabSystemTabs: any[] = [];
+      let _set_onTabSystemTabs_hide: any[] = [];
+      systemTabs.forEach((a, index) => {
+        if (index <= 4) {
+          _onTabSystemTabs.push(a);
+        } else {
+          if (a.systemId == currentSelectedTabFromLocal.systemId) {
+            const _temp = _onTabSystemTabs[_onTabSystemTabs.length - 1];
+            _onTabSystemTabs.pop();
+            _onTabSystemTabs.push(a);
+            _set_onTabSystemTabs_hide.push(_temp);
+          } else {
+            _set_onTabSystemTabs_hide.push(a);
+          }
+        }
+      });
+      set_onTabSystemTabs(_onTabSystemTabs);
+      set_onTabSystemTabs_hide(_set_onTabSystemTabs_hide);
+    } else {
+      set_onTabSystemTabs(systemTabs);
+    }
+  }, [systemTabs]);
+
 
-        set_onTabSystemTabs(tabs);
-       }else{
-        set_onTabSystemTabs(systemTabs);
-       }
-  },[systemTabs]);
-  
-  
   useEffect(() => {
 
     //_systemTabClickHandle(currentSelectedTabFromLocal);  //恢复选中的tab
 
-    document.body.addEventListener('click', (e:any) => {
+    document.body.addEventListener('click', (e: any) => {
 
-      const classes = ['panel', 'left','typeBlockIcon', 'typeBlock', 'active', 'right', 'row', 'rowDetai', 'channelName', 'channelList', 'systemTab', 'channelIcon'];
+      const classes = ['panel', 'left', 'typeBlockIcon', 'typeBlock', 'active', 'right', 'row', 'rowDetai', 'channelName', 'channelList', 'systemTab', 'channelIcon'];
       if (e.target) {
         if (classes.includes(e.target.className)) {
           return
@@ -278,35 +305,51 @@ const TopBar: React.FC<TopBarType> = (props) => {
         <div className='menu' onClick={() => openNav()}>
           <img src={require('../../../public/images/menu.png')} alt="" />
         </div>
-        <span className='systemTitle' onClick={()=>goSystemIndex(pageTitle)}>{pageTitle}</span>
+        <span className='systemTitle' onClick={() => goSystemIndex(pageTitle)}>{pageTitle}</span>
       </div>
-      
+
       <div className='userRelaInfoWrap'>
         <>
           {/**
            * 已打开的tab
            */}
           <div className='tabWrap'>
-            {onTabSystemTabs&&(onTabSystemTabs).map((item, index) => (
+            {onTabSystemTabs && (onTabSystemTabs).map((item, index) => (
               <div key={index} className={currentSelectedTab?.menuId == item.menuId ? `tab on` : `tab`} onClick={() => _systemTabClickHandle(item)}>
                 <div className='tabText'>{item.name} </div>
                 <div className='closeIconWrap'>
-                  <img src={tabCloseIcon} onClick={(e) => closeTabHandle(item, e)}  />
+                  <img src={tabCloseIcon} onClick={(e) => closeTabHandle(item, e)} />
                 </div>
               </div>
             ))}
           </div>
+          {systemTabs.length > 5 && <div className={showMoreTabPannel?'tabMore active':'tabMore'} onMouseEnter={() => set_showMoreTabPannel(true)} >
+            {showMoreTabPannel && (<div className='morePannel' onMouseLeave={() => set_showMoreTabPannel(false)}>
+              {
+                onTabSystemTabs_hide.map((item, index) => {
+                  return (<div key={index} className='moreItem' onClick={()=>moreItemClickHandle(item)}>
+                    {/* <Tooltip placement="right" title={item.name}> */}
+                      <span>{item.name}</span>
+                    {/* </Tooltip> */}
+                  </div>)
+                })
+              }
+            </div>)}
+          </div>}
         </>
-        
 
-        {/* <div className='notification'>
+
+        <div className='notification'>
           <img className='notificationIcon' src={require('../../../public/images/notificationIcon.png')} />
-        </div> */}
-        <Tooltip title={<UserPannel />} color="#fff" onVisibleChange={(visible) => setArrowRotate(visible)}>
+        </div>
+        <Tooltip className='topBarTooltip' placement='bottomRight'  title={<UserPannel />} color="#fff"  onOpenChange={(visible) => setArrowRotate(visible)}>
           <div className='user'>
-            <img className='avator' src={require('../../../public/images/Mask.png')} />
-            <span className='name'>{userData?.name}</span>
-            <img className={arrowRotate ? `arrow on` : `arrow`} src={require('../../../public/images/arrow_white.png')} />
+            <div className='avator'><img  src={require('../../../public/images/avatar.png')} /></div>
+            <div className='info'>
+              <span className='hospName'>{localStorage.getItem('currentHospName')}</span>
+              <span className='name'>{userData?.name}</span>
+            </div>
+            {/* <img className={arrowRotate ? `arrow on` : `arrow`} src={require('../../../public/images/arrow_white.png')} /> */}
           </div>
         </Tooltip>
       </div>
@@ -314,7 +357,7 @@ const TopBar: React.FC<TopBarType> = (props) => {
       {
         ifOpenPannel && (
           <div className='panel' onClick={e => e.stopPropagation()}>
-            
+
             <div className='left'>
               {
                 panelData.map((item, index) => {

+ 171 - 24
src/components/topBar/style.less

@@ -1,3 +1,10 @@
+.kcmp-ant-tooltip {
+  .kcmp-ant-tooltip-content {
+    position: relative;
+    right: 8px;
+  }
+}
+
 .userPannel {
   width: 100px;
   background-color: white;
@@ -5,18 +12,26 @@
   .userPannelTab {
     display: flex;
     flex-direction: row;
-    justify-content: space-evenly;
+    justify-content: flex-start;
     align-items: center;
     height: 30px;
     font-size: 14px;
     font-family: SourceHanSansCN-Normal, SourceHanSansCN;
     font-weight: 400;
-    color: rgb(131, 127, 127);
+    color:#17181A;
     cursor: pointer;
-    border-bottom: 1px solid #eee;
+    padding-left: 12px;
+    border-radius: 2px;
+
+
+    &>span {
+      &:last-child{
+        margin-left: 8px;
+      }
+    }
 
     &:hover {
-      background-color: #eee;
+      background-color: #F5F7FA;
     }
 
     &:last-child {
@@ -25,6 +40,20 @@
   }
 }
 
+.kcmp-ant-tooltip {
+  padding-top: 0 !important;
+
+  .kcmp-ant-tooltip-content {
+    .kcmp-ant-tooltip-arrow {
+      display: none;
+    }
+
+    .kcmp-ant-tooltip-inner {
+      border-radius: 4px;
+    }
+  }
+}
+
 .topBar {
   position: relative;
   z-index: 999;
@@ -34,7 +63,7 @@
   width: 100%;
   height: 48px;
   padding-left: 16px;
-  background: #3071f2;
+  background: #3377FF;
 
   * {
     line-height: normal;
@@ -53,6 +82,10 @@
 
     .systemTitle {
       cursor: pointer;
+      font-size: 16px;
+      font-family: SourceHanSansCN-Medium, SourceHanSansCN;
+      font-weight: 500;
+      color: #FFFFFF;
     }
 
     .menu {
@@ -95,18 +128,18 @@
     align-items: center;
     position: fixed;
     right: 0;
-    padding-right: 16px;
 
     .tabWrap {
       display: flex;
       width: 60%;
       flex-direction: row;
-      justify-content:flex-end;
+      justify-content: flex-end;
       align-items: center;
-      margin-right: 24px;
+      margin-right: 8px;
+
       .tab {
         display: flex;
-        max-width:180px;
+        max-width: 180px;
         height: 32px;
         line-height: 32px;
         text-align: center;
@@ -116,7 +149,7 @@
         padding: 0 2%;
         border-radius: 4px;
         opacity: 0.8;
-        margin-right:1%;
+        margin-right: 1%;
         cursor: pointer;
         box-sizing: border-box;
 
@@ -149,7 +182,7 @@
 
         &.on {
           opacity: 1;
-          background: #0b54e6;
+          background: #1963FA;
         }
 
         &:last-child {
@@ -158,18 +191,93 @@
       }
     }
 
+    .tabMore {
+      position: relative;
+      z-index: 999;
+      cursor: pointer;
+      width: 32px;
+      height: 32px;
+      border-radius: 4px;
+      margin-right: 8px;
+
+      .morePannel {
+        position: absolute;
+        z-index: 999;
+        top: 40px;
+        width: 116px;
+        background: #F5F7FA;
+        box-shadow: 0px 10px 20px 0px rgba(31, 71, 153, 0.2);
+        border-radius: 0px 0px 8px 8px;
+        opacity: 0.98;
+        padding: 8px;
+
+        .moreItem {
+          display: flex;
+          justify-content: flex-start;
+          align-items: center;
+          height: 32px;
+          background: #FFFFFF;
+          border-radius: 4px;
+          padding: 8px;
+
+          span {
+            font-size: 12px;
+            font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+            font-weight: 400;
+            color: #17181A;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+
+          &:hover {
+            background: #3376FE;
+
+            span {
+              color: #ffffff;
+            }
+          }
+
+        }
+      }
+
+      &::after {
+        position: relative;
+        // top: 3px;
+        // left: 6px;
+        display: inline-block;
+        content: '';
+        width: 32px;
+        height: 32px;
+        background: url('../../../public/images/threePoint_white_more.png');
+        background-size: cover;
+        background-position: center center;
+        background-repeat: no-repeat;
+      }
+
+      &.active {
+        background: rgba(249, 248, 248, .1);
+      }
+    }
+
     .notification {
       display: flex;
       flex-direction: row;
       justify-content: center;
       align-items: center;
-      width: 18px;
-      height: 18px;
-      margin-right: 16px;
+      margin-right: 8px;
       cursor: pointer;
+      width: 32px;
+      height: 32px;
+      border-radius: 4px;
 
       .notificationIcon {
-        width: 100%;
+        width: 16px;
+        height: 16px;
+      }
+
+      &:hover {
+        background: rgba(249, 248, 248, .1);
       }
     }
 
@@ -179,19 +287,56 @@
       flex-direction: row;
       justify-content: center;
       align-items: center;
+      //margin-left: 16px;
+      height: 48px;
+      padding-right: 16px;
+      padding-left: 8px;
+      background: linear-gradient(90deg, #66A6FF 0%, #3366FF 100%);
+      border-radius: 24px 0px 0px 24px;
 
       .avator {
-        width: 26px;
-        height: 26px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 32px;
+        height: 32px;
         margin-right: 8px;
+        border-radius: 50%;
+        background: #ffffff;
+        border: 1px solid #FFFFFF;
+        img {
+          width: 101%;
+          height: 101%;
+        }
       }
 
-      .name {
-        font-size: 14px;
-        font-family: SourceHanSansCN-Normal, SourceHanSansCN;
-        font-weight: 400;
-        color: #ffffff;
-        margin-right: 10px;
+      .info {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+
+        .hospName {
+          height: 13px;
+          line-height: 13px;
+          font-size: 12px;
+          font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+          font-weight: 400;
+          color: #FFFFFF;
+          margin-bottom: 7px;
+          opacity: .9;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .name {
+          height: 13px;
+          line-height: 13px;
+          font-size: 12px;
+          font-family: SourceHanSansCN-Medium, SourceHanSansCN;
+          font-weight: 500;
+          color: #FFFFFF;
+        }
       }
 
       .arrow {
@@ -209,7 +354,7 @@
   .panel {
     display: flex;
     flex-direction: row;
-    align-items:stretch;
+    align-items: stretch;
     position: absolute;
     top: 48px;
     left: 165px;
@@ -280,6 +425,7 @@
 
         .rowDetail {
           width: 100%;
+
           .channelName {
             display: inline-block;
             font-size: 14px;
@@ -289,6 +435,7 @@
             margin-bottom: 8px;
             cursor: pointer;
             transition: all 0.3s ease-in;
+
             &:hover {
               color: #3376FE;
             }

+ 6 - 5
src/global.less

@@ -4,6 +4,7 @@
 }
 
 
+
 input {
   outline: none !important;
 }
@@ -273,29 +274,29 @@ input {
 
 
 
-div::-webkit-scrollbar {
+*::-webkit-scrollbar {
   width: 2px;
   height: 2px;
   /**/
 }
 
-div::-webkit-scrollbar-track {
+*::-webkit-scrollbar-track {
   background: transparent;
   border-radius: 2px;
 }
 
-div::-webkit-scrollbar-thumb {
+*::-webkit-scrollbar-thumb {
   background: #bfbfbf;
   border-radius: 10px;
 }
 
-div::-webkit-scrollbar-thumb:hover {
+*::-webkit-scrollbar-thumb:hover {
   width: 4px;
   height: 4px;
   background: rgb(136, 135, 135);
 }
 
-div::-webkit-scrollbar-corner {
+*::-webkit-scrollbar-corner {
   background: rgb(136, 135, 135);
 
 }

+ 2 - 2
src/layouts/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-09 13:56:33
- * @LastEditTime: 2023-06-12 13:24:16
+ * @LastEditTime: 2023-06-16 11:24:51
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/layouts/index.tsx
@@ -192,7 +192,7 @@ export default function Layout({ children, location, route, history, match }: IR
           </div>
         )
       }
-      {!isEmpty&&(<div style={{ height: `calc(100vh - 48px)`, overflowY: 'scroll' }}>{children}</div>)}
+      {!isEmpty&&(<div style={{ height: `calc(100vh - 48px)`, overflowY: 'scroll',minWidth:'1280px' }}>{children}</div>)}
     </ProLayout>
   );
 }

+ 2 - 1
src/pages/login/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-09 14:58:08
- * @LastEditTime: 2023-02-13 11:35:50
+ * @LastEditTime: 2023-06-15 15:50:53
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/login/index.tsx
@@ -56,6 +56,7 @@ const LoginPage: React.FC<LoginPageType> = ({ location, children, title }) => {
           })),
         );
         setCurrentHospName(data[0].systemName);
+        localStorage.setItem('currentHospName',data[0].systemName);
       }
       
     }

+ 2 - 2
src/pages/platform/_layout.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-06 15:25:39
- * @LastEditTime: 2023-06-09 14:22:36
+ * @LastEditTime: 2023-06-16 11:22:59
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/_layout.tsx
@@ -314,7 +314,7 @@ export default function Layout({ children, location, route, history, match, ...r
               <title>精益管理中台</title>
             </Helmet>
 
-            <div className="page" style={{ height: 'calc(100vh - 80px)', overflowY: 'scroll' }}>
+            <div className="page" style={{ height: 'calc(100vh - 80px)', overflowY: 'scroll',minWidth:'1280px' }}>
               {children}
             </div>
           </PageContainer>