Browse Source

调整transferTable和首页报告参数

code4eat 2 năm trước cách đây
mục cha
commit
218e2b58c9

+ 2 - 1
config/config.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:04:20
- * @LastEditTime: 2023-05-30 15:55:47
+ * @LastEditTime: 2023-06-12 13:52:25
  * @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,6 +144,7 @@ export default defineConfig({
       ],
     },
   ],
+  hash:true,
   proxy: proxy[REACT_APP_ENV || 'dev'],
   manifest: {
     basePath: '/',

+ 3 - 1
config/proxy.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:00:52
- * @LastEditTime: 2023-06-06 09:25:18
+ * @LastEditTime: 2023-06-13 10:18: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
@@ -45,3 +45,5 @@ const proxy: { [key: string]: any } = {
 };
 
 export default proxy;
+
+

+ 4 - 3
src/app.tsx

@@ -179,7 +179,8 @@ const errorHandlerFunc = (error: ResponseErr) => {
       //token过期
       Modal.confirm({
         title: '抱歉,你的登录已过期,请重新登录!',
-        // closable:false,
+        okText:'确定',
+        cancelText:'取消',
         maskClosable: false,
         // cancelButtonProps:
         onOk: () => {
@@ -259,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

+ 2 - 1
src/components/topBar/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-16 09:12:37
- * @LastEditTime: 2023-06-07 15:31:14
+ * @LastEditTime: 2023-06-12 10:45:15
  * @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
@@ -148,6 +148,7 @@ const TopBar: React.FC<TopBarType> = (props) => {
     setCurrentSelectedTab(undefined);
     set_pageTitle('欢迎进入医管平台');
     setIfOpenPannel(false);
+    console.log('goToHome');
     localStorage.removeItem('currentSelectedTab');
     localStorage.removeItem('selectedKeys');
     // localStorage.removeItem('visitedTabs');

+ 2 - 1
src/global.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-21 11:05:37
- * @LastEditTime: 2023-03-23 16:49:49
+ * @LastEditTime: 2023-06-12 10:44:24
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/global.tsx
@@ -18,6 +18,7 @@ const loginPath = '/login';
 
 export const logoutHandle = async () => {
   // await logout();
+  console.log('logoutHandle');
   localStorage.removeItem('userData');
   localStorage.removeItem('initialState');
   localStorage.removeItem('currentSelectedTab');

+ 3 - 3
src/layouts/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-09 13:56:33
- * @LastEditTime: 2023-06-07 15:42:30
+ * @LastEditTime: 2023-06-12 13:24:16
  * @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,8 +29,8 @@ const TopHoc = ({ currentSelectedSys, openedSysLists, navData,set_emptyPageConte
 
     if(JSON.stringify(data) != '{}'){
       await setInitialState((s) => ({ ...s, currentSelectedSys: data }));
-
-      localStorage.removeItem('currentSelectedTab');
+      console.log('onTabClickHandle');
+      // localStorage.removeItem('currentSelectedTab');
       localStorage.removeItem('selectedKeys');
       // localStorage.removeItem('visitedTabs');
       localStorage.removeItem('openKeys');

+ 3 - 3
src/pages/index/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-10 09:33:30
- * @LastEditTime: 2023-04-14 10:59:12
+ * @LastEditTime: 2023-06-13 09:59: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.tsx
@@ -110,7 +110,7 @@ const IndexPage: React.FC<IndexPageType> = ({ location }) => {
       }
 
       if (needItem.length > 0) {
-        setspecialPageUrl(`http://eastern1.kcim-bi.163yun.com/dash/integration/56?rid=${needItem[0].value}&toolbar=[]&hideTitle=true&hideScaleBar=false&&scale=width&hidePageBar=false&token=${token}`);
+        setspecialPageUrl(`http://eastern1.kcim-bi.163yun.com/dash/integration/56?rid=${needItem[0].value}&toolbar=[]&hideTitle=true&hideScaleBar=false&&scale=screen&hidePageBar=false&token=${token}`);
       }
     }
   }
@@ -209,7 +209,7 @@ const IndexPage: React.FC<IndexPageType> = ({ location }) => {
           <Skeleton loading={iframeLoading} paragraph={{ rows: 50 }} active />
           <iframe
             onLoad={() => onLoadhandle()}
-            style={{ width: '100%', height: '600px', border: 'none' }}
+            style={{ width: '100%', height: 'calc(100vh - 40px)', border: 'none' }}
             src={specialPageUrl}
           ></iframe>
         </div>

+ 2 - 1
src/pages/personalCenter/components/security.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-03-03 17:42:10
- * @LastEditTime: 2022-07-21 16:13:32
+ * @LastEditTime: 2023-06-12 16:14: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/personalCenter/components/security.tsx
@@ -104,6 +104,7 @@ const SecurityView: React.FC = () => {
         Modal.confirm({
           title: '密码修改成功,前往重新登录?',
           closable: false,
+          okText:'确定',
           onOk: () => {
             if (initialState?.logout) {
               initialState.logout();

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-06 15:25:39
- * @LastEditTime: 2023-06-02 18:30:25
+ * @LastEditTime: 2023-06-09 14:22:36
  * @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
@@ -92,7 +92,7 @@ export default function Layout({ children, location, route, history, match, ...r
       </>
     )
   }
-  if (location.pathname == '/platform/KcimDairlyLog') {
+  if (location.pathname == '/platform/fullCostCheck') {
 
     //临时解决未嵌入成本核算,而实现访问的效果
 
@@ -112,7 +112,7 @@ export default function Layout({ children, location, route, history, match, ...r
 
     // getToken();
 
-    const pageUrl = `http://118.31.50.255:8080/`;
+    const pageUrl = `https://test.baokangyiguan.com/index/apiLogin?username=admin&url=cost/index`;
 
     return (
       <>
@@ -128,7 +128,7 @@ export default function Layout({ children, location, route, history, match, ...r
       style={{
         height: 'calc(100vh - 50px)',
       }}
-      iconfontUrl="//at.alicdn.com/t/font_8d5l8fzk5b87iudi.js"
+      //iconfontUrl="//at.alicdn.com/t/font_8d5l8fzk5b87iudi.js"
       logoStyle={{
         display: 'none',
       }}

+ 1 - 1
src/pages/platform/setting/departmentMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-03-31 17:22:38
+ * @LastEditTime: 2023-06-09 10:57:54
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */

+ 3 - 1
src/pages/platform/setting/systemNavMana/index.tsx

@@ -4,7 +4,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-16 09:42:52
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-05-10 15:12:52
+ * @LastEditTime: 2023-06-12 16:15:33
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -242,6 +242,8 @@ const MonthlyInfoCheck: React.FC = () => {
             title: '菜单功能设置(核算单元管理)',
             icon: '',
             width: 672,
+            okText:'确定',
+            cancelText:'取消',
             content: <TableTransfer
                 ref={ref}
                 record={record}

+ 2 - 2
src/utils.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-13 17:09:05
- * @LastEditTime: 2023-03-24 09:23:30
+ * @LastEditTime: 2023-06-09 10:57:13
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/utils.js
@@ -52,7 +52,7 @@ export const downloadTemplateReq = (path:string) => {
 
   axios({
       method: 'get',
-      url: path,
+      url: `/gateway/${path}`,
       responseType: 'blob',
       headers: { token },
   })