调整topBar跳转逻辑

config/config.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:04:20
- * @LastEditTime: 2023-01-05 09:47:38
+ * @LastEditTime: 2023-02-13 17:59:24
  * @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
@@ -46,6 +46,10 @@ export default defineConfig({
           path: '/app1',
           microApp: 'app1',
         },
+        {
+          path: '/PFMBackC',
+          microApp: 'PFMBackC',
+        },
         {
           path: '/reviewMana',
           microApp: 'reviewMana',

config/proxy.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:00:52
- * @LastEditTime: 2023-01-10 17:15:06
+ * @LastEditTime: 2023-01-13 17:49:31
  * @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
@@ -21,9 +21,9 @@ const proxy: { [key: string]: any } = {
       // pathRewrite: { '^/gateway': '' },
     },
     '/api': {
-      //target: 'http://118.31.245.65:8083/',
+      target: 'http://118.31.245.65:8083/',
       //target: 'http://112.124.59.133:8083/',
-      target: 'http://112.124.59.133:5000/',
+      //target: 'http://112.124.59.133:5000/',
       changeOrigin: true,
       pathRewrite: { '^/api': '' },
     },

src/app.tsx

@@ -162,7 +162,7 @@ const errorHandlerFunc = (error: ResponseErr) => {
   try {
     const { info } = error;
     const { errorCode , errorMessage } = info;
-
+    
     if (errorCode == 499) {
       //token过期
       Modal.confirm({
@@ -230,6 +230,10 @@ export const request: RequestConfig = {
 export const qiankun = fetch('/config').then(() => ({
   // 注册子应用信息
   apps: [
+    {
+      name: 'microApp', // 唯一 id
+      entry: '//localhost:8808', // 开发
+    },
     {
       name: 'app1', // 唯一 id
       entry: '//112.124.59.133:8804',  //测试
@@ -239,17 +243,20 @@ export const qiankun = fetch('/config').then(() => ({
     },
     {
       name: 'reviewMana', // 唯一 id
-      entry: '//112.124.59.133:8807',  //测试
-      //entry: '//118.31.245.65:8807', //线上
+     //entry: '//112.124.59.133:8807',  //测试
+      entry: '//118.31.245.65:8807', //线上
       //entry:'//192.168.50.143:8804',//本机
       //entry: '//localhost:8804', // 开发
     },
     {
       name: 'budgetManaSystem', // 唯一 id
-      //entry: '//112.124.59.133:8807',  //测试
-      //entry: '//118.31.245.65:8807', //线上
-      //entry:'//192.168.50.143:8804',//本机
-      entry: '//localhost:8000', // 开发
+      entry: '//localhost:8001'
+      //entry: '//112.124.59.133:5000/perform/', // 开发
+    },
+    {
+      name: 'PFMBackC', // 唯一 id
+      entry: '//112.124.59.133:5000/pfmManager/index.html'
+      //entry: '//112.124.59.133:5000/perform/', // 开发
     },
   ],
   // 完整生命周期钩子请看 https://qiankun.umijs.org/zh/api/#registermicroapps-apps-lifecycles
@@ -273,7 +280,6 @@ export function useQiankunStateForSlave() {
 export const layout = ({ initialState: { userData } }: { initialState: InitialStateType }): BasicLayoutProps => {
   return {
     headerRender: false,
-    
     rightContentRender: () => <>right</>,
     footerRender: () => null,
     onPageChange: () => {

src/components/topBar/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-16 09:12:37
- * @LastEditTime: 2022-12-08 10:22:42
+ * @LastEditTime: 2023-02-13 14:37:01
  * @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
@@ -51,6 +51,7 @@ const TopBar: React.FC<TopBarType> = (props) => {
   const currentSelectedTabFromLocal = localSavedTab ? JSON.parse(localSavedTab) : {};
 
   const _systemTabClickHandle = (item: TopBar.Tab) => {
+
     //导航栏tab点击
     // console.log('_systemTabClickHandle',item);
     onTabClick && onTabClick(item);
@@ -61,7 +62,6 @@ const TopBar: React.FC<TopBarType> = (props) => {
 
 
   const _systemListClickHandle = (data: TopBar.Tab, currentActivedBlockIndex: number, index: number, i: number) => {
- 
     //导航栏系统菜单列表点击回调
     if (currentSelectedTab?.menuId == data.menuId) return;
 
@@ -210,7 +210,7 @@ const TopBar: React.FC<TopBarType> = (props) => {
 
   useEffect(() => { 
     if (currentSelectedTabFromLocal) {
-      reSetNav(navData, currentSelectedTabFromLocal);
+      //reSetNav(navData, currentSelectedTabFromLocal);
     }
       
     set_panelData(navData);
@@ -218,7 +218,7 @@ const TopBar: React.FC<TopBarType> = (props) => {
 
   useEffect(()=>{
 
-    if(currentTab)reSetNav(panelData,currentTab);
+    //if(currentTab)reSetNav(panelData,currentTab);
  
   },[currentTab]);
 
@@ -231,7 +231,7 @@ const TopBar: React.FC<TopBarType> = (props) => {
   
   useEffect(() => {
 
-    _systemTabClickHandle(currentSelectedTabFromLocal);  //恢复选中的tab
+    //_systemTabClickHandle(currentSelectedTabFromLocal);  //恢复选中的tab
 
     document.body.addEventListener('click', (e:any) => {
 

src/layouts/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-09 13:56:33
- * @LastEditTime: 2022-09-07 11:21:11
+ * @LastEditTime: 2023-02-13 14:00:26
  * @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
@@ -26,7 +26,9 @@ const TopHoc = ({ currentSelectedSys, openedSysLists, navData,set_emptyPageConte
   };
 
   const onTabClickHandle = async (data: TopBar.Tab) => {
-  
+
+    console.log({data});
+
     if(JSON.stringify(data) != '{}'){
       await setInitialState((s) => ({ ...s, currentSelectedSys: data }));
   
@@ -90,7 +92,7 @@ const TopHoc = ({ currentSelectedSys, openedSysLists, navData,set_emptyPageConte
       currentTab={currentSelectedSys}
       userPannelTabClick={userPannelTabClickhandle}
     />
-
+    
   );
 };
 
@@ -109,7 +111,7 @@ export default function Layout({ children, location, route, history, match }: IR
   }
 
 
-  const getEmptyPageContent =async (menuId:Key) => {
+  const getEmptyPageContent = async (menuId:Key) => {
     const menuItem = await getSpecifyMenuDetail(menuId);
     set_emptyPageContent(menuItem.description);
   }

src/pages/channelIndex/channelIndexOne/style.less

@@ -0,0 +1,20 @@
+
+.vertuTab {
+     font-size: 12px;
+     color:purple;
+     width: 36px;
+     height: 35px;
+     background-color: #eee;
+
+     .tab {
+         width: auto;
+         justify-content: space-between;
+         align-items: center;
+         flex-direction: column;
+     }
+     .actived {
+        background-color: yellow;
+        font-size: 12px;
+     }
+     
+}

src/pages/index/components/FastEntry/index.tsx

@@ -157,7 +157,7 @@ export const FastEntry = (props: FastEntryType) => {
 
     return (
         <div className='fastEntry'>
-
+            
             <div className='topTitle'>
                 <span className='name'>快速入口</span>
                 <span className='addBtn' onClick={()=>addHandle()}>添加</span>

src/pages/index/index.tsx

@@ -70,7 +70,7 @@ const IndexPage: React.FC<IndexPageType> = ({ location }) => {
             content:t.content,
             createDate:t.createDate,
             taskLevel:t.taskLevel,
-
+            
           })));
 
           set_msgRecord(resp.messageRecords.map((t:any)=>({
@@ -141,10 +141,10 @@ const IndexPage: React.FC<IndexPageType> = ({ location }) => {
                       <span className='spanName'>进院日期</span>
                       <span className='spanValue'>{userInfo?.entryTime?`${new Date(userInfo?.entryTime).getFullYear()}-${(new Date(userInfo?.entryTime).getMonth()+1)>10?(new Date(userInfo?.entryTime).getMonth()+1):'0'+(new Date(userInfo?.entryTime).getMonth()+1)}-${(new Date(userInfo?.entryTime).getDate())>10?(new Date(userInfo?.entryTime).getDate()):'0'+(new Date(userInfo?.entryTime).getDate())}`:'-'}</span>
                     </div>
-
                   </div>
                 </div>
                 <div className="rowTwo">
+
                   <div className='medicalInfoSpan'>
                     <div className='span'>资格证号：<span>{userInfo?.qualificationCertificateNo?userInfo?.qualificationCertificateNo:'-'}</span></div>
                     <div className='span'>执业证号：<span>{userInfo?.practiceCertificateNo?userInfo?.practiceCertificateNo:'-'}</span></div>
@@ -160,12 +160,13 @@ const IndexPage: React.FC<IndexPageType> = ({ location }) => {
                   <div className='medicalInfoSpan'>
                     <div className='span'>执业类别：<span>{userInfo?.userCate?userInfo?.userCate:'-'}</span></div>
                   </div>
+
                 </div>
               </div>
-            </div>
+            </div>  
           </Skeleton>
         </div>
-        <div className='cardTwo'>
+        <div className='cardTwo '>
           <FastEntry data={fastEntry}  />
           <RecentlyVisited data={recentlyVisitedList} />
         </div>

src/pages/login/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-09 14:58:08
- * @LastEditTime: 2023-01-10 13:26:48
+ * @LastEditTime: 2023-02-13 11:35:50
  * @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
@@ -101,7 +101,7 @@ const LoginPage: React.FC<LoginPageType> = ({ location, children, title }) => {
   }, [title]);
 
   useEffect(() => {
-    if (windowWidth <= 1000) {
+    if (windowWidth <= 1000&&windowWidth != 0) {
       set_ifShowLeftBlock(false);
     } else {
       set_ifShowLeftBlock(true);

src/pages/login/style.less

@@ -96,7 +96,6 @@
       border-radius: 4px;
       border: 1px solid #cfd7e6;
     }
-
     .loginBtn {
       width: 280px;
       height: 40px;