code4eat 3 年之前
父節點
當前提交
59fa808f6e
共有 6 個文件被更改,包括 61 次插入40 次删除
  1. 5 1
      config/config.ts
  2. 9 2
      config/proxy.ts
  3. 9 1
      src/app.tsx
  4. 32 32
      src/components/topBar/index.tsx
  5. 3 3
      src/global.less
  6. 3 1
      src/layouts/index.tsx

+ 5 - 1
config/config.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:04:20
- * @LastEditTime: 2022-07-18 10:25:40
+ * @LastEditTime: 2022-09-03 17:35:23
  * @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: '/reviewMana',
+          microApp: 'reviewMana',
+        },
         {
           path: '/channelIndex/channelIndexOne',
           component: '@/pages/channelIndex/channelIndexOne/index.tsx',

+ 9 - 2
config/proxy.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:00:52
- * @LastEditTime: 2022-08-01 09:49:23
+ * @LastEditTime: 2022-09-02 16:42:10
  * @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
@@ -15,16 +15,23 @@
 const proxy: { [key: string]: any } = {
   dev: {
     '/master': {
-      //target: 'http://192.168.50.246:7003/',
+      //target: 'http://192.168.51.39:7001/',
       target: 'http://112.124.59.133:7001/',
       changeOrigin: true,
       pathRewrite: { '^/master': '' },
     },
     '/api': {
       target: 'http://112.124.59.133:8083/',
+      //target: 'http://112.124.59.133:8083/',
       changeOrigin: true,
       pathRewrite: { '^/api': '' },
     },
+    '/view': {
+      target: 'http://112.124.59.133:8085/',
+      //target: 'http://112.124.59.133:8083/',
+      changeOrigin: true,
+      pathRewrite: { '^/view': '' },
+    },
   },
   mock: {
     '/master/': {

+ 9 - 1
src/app.tsx

@@ -231,8 +231,16 @@ export const qiankun = fetch('/config').then(() => ({
   apps: [
     {
       name: 'app1', // 唯一 id
-      entry: '//112.124.59.133:8804',  //测试
+      //entry: '//112.124.59.133:8804',  //测试
       // entry: '//118.31.245.65:8804', //线上
+      //entry:'//192.168.50.143:8804',//本机
+      entry: '//localhost:8804', // 开发
+    },
+    {
+      name: 'reviewMana', // 唯一 id
+      entry: '//112.124.59.133:8807',  //测试
+      // entry: '//118.31.245.65:8804', //线上
+      //entry:'//192.168.50.143:8804',//本机
       //entry: '//localhost:8804', // 开发
     },
   ],

+ 32 - 32
src/components/topBar/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-16 09:12:37
- * @LastEditTime: 2022-07-29 12:47:03
+ * @LastEditTime: 2022-09-07 10:24:52
  * @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
@@ -165,49 +165,49 @@ const TopBar: React.FC<TopBarType> = (props) => {
 
   const reSetNav = (_panelData: TopBar.PanelData[], cur: TopBar.Tab) => {
     
-    if (!(_panelData.length > 0)) return
+    // if (!(_panelData.length > 0)) return
 
-    if (JSON.stringify(cur) != '{}') {
+    // if (JSON.stringify(cur) != '{}') {
 
-      let blockIndex = 0;
-      let channelIndex = 0;
+    //   let blockIndex = 0;
+    //   let channelIndex = 0;
 
 
-      const _currentSelectedTabFromLocal = cur;
+    //   const _currentSelectedTabFromLocal = cur;
 
-      one: for (let index = 0; index < _panelData.length; index++) {
-        blockIndex = index;
+    //   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;
-            if (_panelData && _panelData.length > 0) {
-              const _systems = _panelData[index].child[i].child;
-              if (_systems && _systems.length > 0) {
-                for (let k = 0; k < _systems.length; k++) {
-                  if (_systems[k].menuId == _currentSelectedTabFromLocal.menuId) {
-                    set_currentActivedBlockIndex(blockIndex);
-                     set_pageTitle(_panelData[blockIndex].child[channelIndex].name); //设置体系标题
+    //     if (_panelData[index] && _panelData[index].child) {
+    //       two: for (let i = 0; i < _panelData[index].child.length; i++) {
+
+    //         channelIndex = i;
+    //         if (_panelData && _panelData.length > 0) {
+    //           const _systems = _panelData[index].child[i].child;
+    //           if (_systems && _systems.length > 0) {
+    //             for (let k = 0; k < _systems.length; k++) {
+    //               if (_systems[k].menuId == _currentSelectedTabFromLocal.menuId) {
+    //                 set_currentActivedBlockIndex(blockIndex);
+    //                  set_pageTitle(_panelData[blockIndex].child[channelIndex].name); //设置体系标题
                      
-                    break one;
-                  }
-                }
-              }
-            }
+    //                 break one;
+    //               }
+    //             }
+    //           }
+    //         }
 
-          }
-        }
-      }
+    //       }
+    //     }
+    //   }
 
-      if (_panelData && _panelData.length > 0 && _panelData[blockIndex].child) {
-        setSystemTabs(_panelData[blockIndex].child[channelIndex].child);  //恢复体系列表
-      }
+    //   if (_panelData && _panelData.length > 0 && _panelData[blockIndex].child) {
+    //     setSystemTabs(_panelData[blockIndex].child[channelIndex].child);  //恢复体系列表
+    //   }
 
-      _systemTabClickHandle(_currentSelectedTabFromLocal);  //恢复选中的tab
+    //   _systemTabClickHandle(_currentSelectedTabFromLocal);  //恢复选中的tab
   
 
-    }
+    // }
   }
 
   useEffect(() => { 

+ 3 - 3
src/global.less

@@ -18,14 +18,14 @@ input {
 
 
 // div {
-//    overflow-x: hidden;
+//    overflow-x: h idden;
 // }
 
 
 div::-webkit-scrollbar{
   
-  width:5px;
-  height:5px;
+  width:2px;
+  height:2px;
   /**/
 }
 div::-webkit-scrollbar-track{

+ 3 - 1
src/layouts/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-09 13:56:33
- * @LastEditTime: 2022-07-29 12:46:45
+ * @LastEditTime: 2022-09-07 09:41:38
  * @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
@@ -29,6 +29,8 @@ const TopHoc = ({ currentSelectedSys, openedSysLists, navData,set_emptyPageConte
   
     if(JSON.stringify(data) != '{}'){
       await setInitialState((s) => ({ ...s, currentSelectedSys: data }));
+
+      console.log({data});
   
       if(data.contentType == '4'){
           //空白页面