feat: update

zhongnanhuang
1 parent 24d321bc
Showing 8 changed files with 32 additions and 14 deletions
.umirc.ts
src/access.ts
src/app.ts
src/pages/Login/index.tsx
src/pages/Order/index.tsx
src/pages/OrderReport/components/OrderDualAxes.tsx
src/pages/OrderReport/index.tsx
src/services/demo/typings.d.ts
@@ -43,6 +43,7 @@ export default defineConfig({
       path: '/orderReport',
       component: './OrderReport',
       icon: 'LineChartOutlined',
+      access: 'canReadAdmin',
     },
     {
       name: '打印',
 export default (initialState: API.UserInfo) => {
   // 在这里按照初始化数据定义项目中的权限，统一管理
   // 参考文档 https://umijs.org/docs/max/access
-  const canSeeAdmin = !!(
-    initialState && initialState.name !== 'dontHaveAccess'
-  );
+  const { roleSmallVO } = initialState;
+
+  console.log(roleSmallVO.code === 'admin');
   return {
-    canSeeAdmin,
+    canReadAdmin: roleSmallVO.code === 'admin',
   };
 };
@@ -7,12 +7,12 @@ import { message } from &#39;antd&#39;;
 import { RESPONSE_CODE } from './constants/enum';
 import './style/global.css';
+import { getUserInfo } from './utils';
 // 全局初始化数据配置，用于 Layout 用户信息和权限初始化
 // 更多信息见文档：https://umijs.org/docs/api/runtime-config#getinitialstate
-export async function getInitialState(): Promise<{ name: string }> {
-  // getUserInfo();
-  return { name: '' };
+export async function getInitialState() {
+  return getUserInfo();
 }
 export const layout = () => {
@@ -9,7 +9,7 @@ import {
   ProConfigProvider,
   ProFormText,
 } from '@ant-design/pro-components';
-import { history, useModel } from '@umijs/max';
+import { useModel } from '@umijs/max';
 import { Button, theme } from 'antd';
 import { useEffect, useState } from 'react';
@@ -27,6 +27,7 @@ export default () =&gt; {
   useEffect(() => {
     fetchCode();
   }, []);
+
   return (
     <ProConfigProvider hashed={false}>
       <div
@@ -43,7 +44,10 @@ export default () =&gt; {
               if (res.result === RESPONSE_CODE.SUCCESS) {
                 setUserLocalInfo(res.data.token, res.data?.user);
-                history.push('/order');
+                /**
+                 * 使用history.push或者history.replace会导致菜单路由无法更新，需要再次刷新页面
+                 */
+                window.location.href = '/order';
               } else {
                 fetchCode();
               }
@@ -6,6 +6,7 @@ import {
 } from '@/services';
 import { orderExport } from '@/services/order';
 import { enumValueToLabel, formatDateTime } from '@/utils';
+import { getUserInfo } from '@/utils/user';
 import {
   ClockCircleTwoTone,
   ContainerTwoTone,
@@ -90,7 +91,7 @@ const OrderPage = () =&gt; {
   const [orderRow, setOrderRow] = useState<Partial<OrderType>>({});
   const [mainOrderAllItemKeys, setMainOrderAllItemKeys] = useState([]);
   const [rolePath, setRolePath] = useState([]); //当前角色权限（新增跟打印按钮）
-  const userInfo = JSON.parse(localStorage.getItem('userInfo'));
+  const userInfo = getUserInfo();
   // const [tableHeight, setTableHeight] = useState(200);
   const [selectedRows, setSelectedRows] = useState({});
   const [selectedRowObj, setSelectedRowObj] = useState({});
 import { DualAxes } from '@ant-design/charts';
-const OrderDualAxes = ({ data }) => {
+const OrderDualAxes = ({ data, statisticMethod }) => {
+  let yFiledString = '';
+  if (statisticMethod === 'MONTH_STATISTICS') {
+    yFiledString = 'curTime';
+  } else {
+    yFiledString = 'curMonth';
+  }
   const config = {
     data: [
       data.targetAndTotalPaymentDtoList === undefined
@@ -8,7 +14,7 @@ const OrderDualAxes = ({ data }) =&gt; {
         : data.targetAndTotalPaymentDtoList,
       data.orderNumberDtoList === undefined ? [] : data.orderNumberDtoList,
     ],
-    xField: 'curTime',
+    xField: yFiledString,
     yField: ['curDayTotalPayment', 'curDayTotalOrderNumber'],
     geometryOptions: [
       {
 import { postServiceOrderQueryReportFormsInformation } from '@/services';
 import { enumToSelect } from '@/utils';
+import { getUserInfo } from '@/utils/user';
 import { EllipsisOutlined } from '@ant-design/icons';
 import {
   PageContainer,
@@ -28,7 +29,7 @@ import {
 import OrderDualAxes from './components/OrderDualAxes';
 import OrderStatisticCard from './components/OrderStatisticCard';
 import './index.less';
-const userInfo = JSON.parse(localStorage.getItem('userInfo'));
+const userInfo = getUserInfo();
 const OrderReportPage = () => {
   const [form] = Form.useForm<{
@@ -181,7 +182,10 @@ const OrderReportPage = () =&gt; {
           bordered
         >
           <Spin spinning={loading}>
-            <OrderDualAxes data={statisticData} />
+            <OrderDualAxes
+              data={statisticData}
+              statisticMethod={statisticsMethod}
+            />
           </Spin>
         </ProCard>
       </Space>
@@ -54,6 +54,8 @@ declare namespace API {
     /** email */
     email?: string;
     gender?: UserGenderEnum;
+    /**role */
+    roleSmallVO: { code: string; id: string; name: string };
   }
   interface UserInfoVO {