样式修改

src/app.tsx

@@ -4,7 +4,7 @@ import { message } from 'antd';
 import UserDropdown from '@/components/UserDropdown';
 import { getToken } from '@/utils/utils';
 import { history } from 'umi';
-import logo from "@/assets/logo.jpg"
+import logo from '@/assets/logo.png';
 
 // 全局初始化数据配置，用于 Layout 用户信息和权限初始化
 // 更多信息见文档：https://umijs.org/docs/api/runtime-config#getinitialstate
@@ -17,13 +17,43 @@ export const layout: RunTimeLayoutConfig = (initialState) => {
     navTheme: 'light',
     layout: 'side',
     contentWidth: 'Fluid',
-    title: "",
+    title: '金科环境数字化平台',
+    token: {
+      sider: {
+        colorMenuBackground: '#292f33',
+        // colorMenuItemDivider: '#dfdfdf',
+        // colorBgMenuItemHover: '#f6f6f6',
+        // colorTextMenu: '#dfdfdf',
+        // colorTextMenuSelected: '#fff',
+        // colorTextMenuActive: 'rgba(255,255,255,0.85)',
+        // colorBgMenuItemCollapsedHover: '#fff',
+        // colorTextMenuItemHover: '#dfdfdf',
+
+        colorBgCollapsedButton: '#fff',
+        colorTextCollapsedButtonHover: 'rgba(0,0,0,0.65)',
+        colorTextCollapsedButton: 'rgba(0,0,0,0.45)',
+        colorBgMenuItemCollapsedHover: 'rgba(0,0,0,0.06)',
+        colorBgMenuItemCollapsedSelected: 'rgba(0,0,0,0.15)',
+        colorBgMenuItemCollapsedElevated: 'rgba(0,0,0,0.85)',
+        colorMenuItemDivider: 'rgba(255,255,255,0.15)',
+        colorBgMenuItemHover: 'rgba(0,0,0,0.06)',
+        colorBgMenuItemSelected: 'rgba(0,0,0,0.15)',
+        colorTextMenuSelected: '#fff',
+        colorTextMenuItemHover: 'rgba(255,255,255,0.75)',
+        colorTextMenu: 'rgba(255,255,255,0.75)',
+        colorTextMenuSecondary: 'rgba(255,255,255,0.65)',
+        colorTextMenuTitle: 'rgba(255,255,255,0.95)',
+        colorTextMenuActive: 'rgba(255,255,255,0.95)',
+        colorTextSubMenuSelected: '#fff',
+      },
+    },
+    siderMenuType: 'group',
     // fixedHeader: true,
     // fixSiderbar: true,
     rightRender(initialState, setInitialState, runtimeConfig) {
       return <UserDropdown />;
     },
-    logo: <img src={logo} style={{height: 28}} />,
+    logo: logo,
   };
 };
 

src/pages/Flow/Audit.js

@@ -2,7 +2,7 @@ import React, { useEffect, useRef, useMemo, useState } from 'react';
 import { Button, Tabs } from 'antd';
 import { connect } from 'umi';
 import Flow from '@/components/Flow';
-import { PageContainer } from '@ant-design/pro-components';
+import { PageContainer, ProCard } from '@ant-design/pro-components';
 import AuditForm from '@/components/AuditForm';
 import { useModel } from '@umijs/max';
 
@@ -23,7 +23,7 @@ function Audit(props) {
   } = props;
   const [tabActiveKey, setTabActiveKey] = useState('1');
   const ref = useRef();
-  const {user} = useModel('userInfo');
+  const { user } = useModel('userInfo');
   const permission = user?.Permission || {};
 
   const curItem = useMemo(() => {
@@ -37,7 +37,7 @@ function Audit(props) {
       return 1;
     }
     // 判断是否为创建者
-    if (user.IsSuper) {
+    if (user?.IsSuper) {
       return 1;
     }
 
@@ -122,16 +122,18 @@ function Audit(props) {
         },
       ]}
     >
-      {tabActiveKey == 1 && (
-        <AuditForm value={formData} onChange={(values) => onChange(values)} />
-      )}
-      {tabActiveKey == 2 && (
-        <Flow
-          meta={{ type: 'edit', editMode, flowId: curItem.id }}
-          flowDetail={flowDetail}
-          ref={ref}
-        />
-      )}
+      <ProCard>
+        {tabActiveKey == 1 && (
+          <AuditForm value={formData} onChange={(values) => onChange(values)} />
+        )}
+        {tabActiveKey == 2 && (
+          <Flow
+            meta={{ type: 'edit', editMode, flowId: curItem.id }}
+            flowDetail={flowDetail}
+            ref={ref}
+          />
+        )}
+      </ProCard>
     </PageContainer>
   );
 }

src/pages/Flow/index.js

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Form, Button, Table } from 'antd';
 import { connect, useNavigate } from 'umi';
 import AuditModal from './AuditModal';
-import { PageContainer } from '@ant-design/pro-components';
+import { PageContainer, ProCard } from '@ant-design/pro-components';
 
 function Audit(props) {
   const { list = [], dispatch, loading } = props;
@@ -12,6 +12,7 @@ function Audit(props) {
     audit: false,
     auditNode: false,
   });
+  const [tabActive, setTabActive] = useState('1');
   const columns = [
     {
       title: '审批流名称',
@@ -33,7 +34,6 @@ function Audit(props) {
     },
   ];
   const handleAuditOk = (values) => {
-    console.log(values);
     dispatch({
       type: 'flow/addAudit',
       payload: values,
@@ -70,17 +70,30 @@ function Audit(props) {
     <PageContainer
       title={null}
       extra={[
-        <Button key={1} onClick={() => changeVisible('audit', true)} type="primary">
+        <Button
+          key={1}
+          onClick={() => changeVisible('audit', true)}
+          type="primary"
+        >
           新建流程
         </Button>,
       ]}
+      tabActiveKey={tabActive}
+      tabList={[
+        { key: 1, tab: 'OA' },
+        { key: 2, tab: 'BOM' },
+      ]}
+      onTabChange={setTabActive}
     >
-      <Table
-        loading={loading['flow/queryAuditList']}
-        rowKey="id"
-        dataSource={list}
-        columns={columns}
-      />
+      <ProCard>
+        <Table
+          loading={loading['flow/queryAuditList']}
+          rowKey="id"
+          dataSource={list}
+          columns={columns}
+        />
+      </ProCard>
+
       <AuditModal
         loading={loading['flow/addAudit']}
         visible={visible.audit}