فهرست منبع

修复body标签zoom属性,调整菜单默认打开逻辑

code4eat 2 سال پیش
والد
کامیت
8ed3008d3b
5فایلهای تغییر یافته به همراه113 افزوده شده و 67 حذف شده
  1. 58 54
      config/config.ts
  2. 1 1
      config/proxy.ts
  3. 8 5
      src/app.tsx
  4. 38 2
      src/pages/platform/_layout.tsx
  5. 8 5
      src/pages/platform/setting/reports/index.tsx

+ 58 - 54
config/config.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:04:20
- * @LastEditTime: 2023-05-30 15:37:53
+ * @LastEditTime: 2023-05-30 15:55:47
  * @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
@@ -17,7 +17,7 @@ export default defineConfig({
   nodeModulesTransform: {
     type: 'none',
   },
-  title:false,
+  title: false,
   publicPath: '/',
   dva: {
     immer: true,
@@ -30,11 +30,11 @@ export default defineConfig({
     },
   },
   lessLoader: {
-    modifyVars: { '@ant-prefix': 'kcmp-ant','root-entry-name': 'default' },
+    modifyVars: { '@ant-prefix': 'kcmp-ant', 'root-entry-name': 'default' },
   }, //
   theme: {
     '@primary-color': '#3376FE',
-    '@primary-color-hover':'#3376FE',
+    '@primary-color-hover': '#3376FE',
     // '@root-entry-name':'root-entry-name'
   },
   routes: [
@@ -68,11 +68,11 @@ export default defineConfig({
         },
         {
           path: '/index',
-          title:'欢迎进入医管平台',
+          title: '欢迎进入医管平台',
           component: '@/pages/index/index.tsx',
         },
         {
-          title:'精益管管理中台',
+          title: '精益管管理中台',
           path: '/platform',
           component: '@/pages/platform/_layout.tsx',
           routes: [
@@ -81,56 +81,60 @@ export default defineConfig({
               component: '@/pages/platform/sqlediter/index.tsx',
             },
             {
-              path: '/platform/setting/userManage',
-              component: '@/pages/platform/setting/userManage/index.tsx',
+              path: '/platform/setting',
+              routes: [
+                {
+                  path: '/platform/setting/userManage',
+                  component: '@/pages/platform/setting/userManage/index.tsx',
+                },
+                {
+                  path: '/platform/setting/hospManage',
+                  component: '@/pages/platform/setting/hospManage/index.tsx',
+                },
+                {
+                  path: '/platform/setting/menuManage',
+                  component: '@/pages/platform/setting/menuManage/index.tsx',
+                },
+                {
+                  path: '/platform/setting/roleManage',
+                  component: '@/pages/platform/setting/roleManage/index.tsx',
+                },
+                // {
+                //   path: '/platform/setting/reports',
+                //   component: '@/pages/platform/setting/reports/index.tsx',
+                // },
+                {
+                  path: '/platform/setting/departmentMana',
+                  component: '@/pages/platform/setting/departmentMana/index.tsx',
+                },
+                {
+                  path: '/platform/setting/pubDicTypeMana',
+                  component: '@/pages/platform/setting/pubDicTypeMana/index.tsx',
+                },
+                {
+                  path: '/platform/setting/pubDicMana',
+                  component: '@/pages/platform/setting/pubDicMana/index.tsx',
+                },
+                {
+                  path: '/platform/setting/indicatorMana',
+                  component: '@/pages/platform/setting/indicatorMana/index.tsx',
+                },
+                {
+                  path: '/platform/setting/paramsMana',
+                  component: '@/pages/platform/setting/paramsMana/index.tsx',
+                },
+                {
+                  path: '/platform/setting/systemNavMana',
+                  component: '@/pages/platform/setting/systemNavMana/index.tsx',
+                },
+                {
+                  path: '/platform/setting/notificationTemplate',
+                  component: '@/pages/platform/setting/notificationTemplate/index.tsx',
+                },
+              ]
             },
-            {
-              path: '/platform/setting/hospManage',
-              component: '@/pages/platform/setting/hospManage/index.tsx',
-            },
-            {
-              path: '/platform/setting/menuManage',
-              component: '@/pages/platform/setting/menuManage/index.tsx',
-            },
-            {
-              path: '/platform/setting/roleManage',
-              component: '@/pages/platform/setting/roleManage/index.tsx',
-            },
-            // {
-            //   path: '/platform/setting/reports',
-            //   component: '@/pages/platform/setting/reports/index.tsx',
-            // },
-            {
-              path: '/platform/setting/departmentMana',
-              component: '@/pages/platform/setting/departmentMana/index.tsx',
-            },
-            {
-              path: '/platform/setting/pubDicTypeMana',
-              component: '@/pages/platform/setting/pubDicTypeMana/index.tsx',
-            },
-            {
-              path: '/platform/setting/pubDicMana',
-              component: '@/pages/platform/setting/pubDicMana/index.tsx',
-            },
-            {
-              path: '/platform/setting/indicatorMana',
-              component: '@/pages/platform/setting/indicatorMana/index.tsx',
-            },
-            {
-              path: '/platform/setting/paramsMana',
-              component: '@/pages/platform/setting/paramsMana/index.tsx',
-            },
-            {
-              path: '/platform/setting/systemNavMana',
-              component: '@/pages/platform/setting/systemNavMana/index.tsx',
-            },
-            {
-              path: '/platform/setting/notificationTemplate',
-              component: '@/pages/platform/setting/notificationTemplate/index.tsx',
-            },
-            
           ],
-          
+
         },
         {
           path: '/personalCenter',

+ 1 - 1
config/proxy.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:00:52
- * @LastEditTime: 2023-05-12 09:44:56
+ * @LastEditTime: 2023-06-02 18:15:37
  * @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

+ 8 - 5
src/app.tsx

@@ -122,6 +122,7 @@ const responseInterceptorsHandle = async (response: Response, options: RequestOp
 
 
   const _response: {
+    errorMessage: any;
     message: any;
     data?: any;
     status: number;
@@ -143,9 +144,9 @@ const responseInterceptorsHandle = async (response: Response, options: RequestOp
       success: true,
     };
   } else {
-  
+    console.log({_response});
     notification.error({
-      message: `${_response.msg?_response.msg:_response.message}`,
+      message: `${_response.msg?_response.msg:_response.message?_response.message:_response.errorMessage}`,
     });
     return false
   }
@@ -258,9 +259,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
@@ -293,7 +294,7 @@ export function patchRoutes({ routes }: { routes: any }) {
 
   const treeLoop = (treeData: any) => {
 
-    if (treeData.path == '/platform') {
+    if (treeData.path.indexOf('/platform') != -1) {
       if (treeData.routes) {
         const paths = [...new Array(100).keys()].map((a, index) => ({
           path: `${treeData.path == '/' ? '' : treeData.path}/reports/${index}`,
@@ -324,9 +325,11 @@ export function patchRoutes({ routes }: { routes: any }) {
         treeLoop(a);
       })
     }
+
   }
 
   treeLoop(routes[0]);
+  console.log({routes});
 }
 
 

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-06 15:25:39
- * @LastEditTime: 2023-05-10 17:01:34
+ * @LastEditTime: 2023-06-02 18:14:47
  * @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
@@ -67,7 +67,7 @@ export default function Layout({ children, location, route, history, match, ...r
   }
 
   //临时演示处理
-
+  console.log('location.pathname',location.pathname);
   if (location.pathname == '/platform/costMana') {
 
     //临时解决未嵌入成本核算,而实现访问的效果
@@ -92,6 +92,34 @@ export default function Layout({ children, location, route, history, match, ...r
       </>
     )
   }
+  if (location.pathname == '/platform/KcimDairlyLog') {
+
+    //临时解决未嵌入成本核算,而实现访问的效果
+
+    // const getToken = async () => {
+    //   // const resp = await getAllParams();
+
+    //   // if (resp) {
+    //   //   const needItem = resp.filter((a: any) => a.code == '1647777324889935872');
+
+    //   //   if (needItem.length > 0) {
+    //   //     set_pageUrl(`http://47.96.149.190:8000/platformMana/roleManage?hospSign=dOBHdoPmJgPGnMSH&token=${needItem[0].value}`)
+    //   //   }
+    //   // }
+
+    //   set_pageUrl(`http://www.baidu.com`)
+    // }
+
+    // getToken();
+
+    const pageUrl = `http://118.31.50.255:8080/`;
+
+    return (
+      <>
+        {pageUrl && <iframe id={'bi_iframe'} style={{ width: '100%', height: '100%', border: 'none' }} src={pageUrl} onLoad={() => adjustIframe()} ></iframe>};
+      </>
+    )
+  }
 
 
 
@@ -217,6 +245,14 @@ export default function Layout({ children, location, route, history, match, ...r
                       localStorage.setItem('selectedKeys', JSON.stringify([childs[0].key]));
                       history.push(`${childs[0].path}`);
 
+                    }else{
+                      if(menuData[0]){
+                        set_openKeys([menuData[0].key]);
+                        set_selectedKeys([menuData[0].key]);
+                        localStorage.setItem('openKeys', JSON.stringify([menuData[0].key]));
+                        localStorage.setItem('selectedKeys', JSON.stringify([menuData[0].key]));
+                        history.push(`${menuData[0].path}`);
+                      }
                     }
                   }
                 }

+ 8 - 5
src/pages/platform/setting/reports/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-03-03 18:04:40
- * @LastEditTime: 2023-04-13 11:21:30
+ * @LastEditTime: 2023-05-30 15:46:46
  * @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/setting/reports/index.tsx
@@ -15,6 +15,7 @@ export default () => {
   const { initialState, setInitialState } = useModel('@@initialState');
   const [specialPageUrl, setspecialPageUrl] = useState<string | undefined>(undefined);
   const [loading, setloading] = useState(false);
+  const { pathname } = location;
 
 
   const onLoadhandle = () => {
@@ -23,6 +24,11 @@ export default () => {
 
   useEffect(() => {
     setloading(true);
+
+  }, [initialState]);
+
+  useEffect(()=>{
+    console.log({pathname});
     if (initialState && initialState.spacicalPageParamsType && initialState.userData) {
       const {
         spacicalPageParamsType,
@@ -41,10 +47,7 @@ export default () => {
         setspecialPageUrl(url);
       }
     }
-
-    console.log({specialPageUrl});
-
-  }, [initialState]);
+  },[pathname])
 
   return (
     <>