package.json

@@ -31,7 +31,6 @@
     "leaflet": "^1.9.4",
     "lodash": "^4.17.21",
     "react-activation": "^0.13.4",
-    "react-countup": "^6.5.3",
     "react-use": "^17.5.1",
     "valtio": "^1.13.2"
   },

src/common/components/layout/AvatarProps.tsx

@@ -1,13 +1,12 @@
 import { Apis } from '@/gen/Apis';
 import {
-  DownOutlined,
   LogoutOutlined,
   UnlockOutlined,
   UserOutlined,
 } from '@ant-design/icons';
 import { history } from '@umijs/max';
 import { Avatar, Dropdown, MenuProps, Space } from 'antd';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { stateActions } from '../../libs/valtio/actions';
 import AvatarIcon from './AvatarIcon.png';
 import ChangePassword from './ChangePassword';
@@ -42,7 +41,6 @@ export default function AvatarProps({ user }: { user: any }) {
           onClick={() => {
             Apis.Common.Auth.Logout().then(() => {
               stateActions.setLogout();
-              sessionStorage.removeItem('loginUserInfo');
               history.push('/login');
             });
           }}
@@ -54,15 +52,6 @@ export default function AvatarProps({ user }: { user: any }) {
     },
   ];
 
-  useEffect(() => {
-    let loginUserInfo = sessionStorage.getItem('loginUserInfo');
-    console.log(loginUserInfo, 'loginUserInfo');
-    if (loginUserInfo === 'I0xZMDEyM18wMQ==') {
-      setOpen(true);
-      console.log('登录成功');
-    }
-  }, []);
-
   return (
     <>
       <Dropdown menu={{ items }} trigger={['click']}>
@@ -70,7 +59,6 @@ export default function AvatarProps({ user }: { user: any }) {
           <Space>
             <Avatar icon={<UserOutlined />} src={AvatarIcon} size={28} />
             <span>{user?.name}</span>
-            <DownOutlined />
           </Space>
         </a>
       </Dropdown>

src/common/components/layout/ChangePassword.tsx

@@ -1,8 +1,7 @@
 import { Apis } from '@/gen/Apis';
 import { ModalForm, ProFormText } from '@ant-design/pro-components';
-import { history } from '@umijs/max';
 import { message } from 'antd';
-import { stateActions } from '../../libs/valtio/actions';
+
 export default function ChangePassword({
   open,
   setOpen,
@@ -15,17 +14,12 @@ export default function ChangePassword({
       open={open}
       wrapperCol={{ span: 24 }}
       width="500px"
-      title="请修改初始密码"
+      title="修改密码"
       onFinish={async (values) => {
         return Apis.Common.Auth.ChangePassword(values)
           .then(() => {
             message.success('修改密码成功');
-            Apis.Common.Auth.Logout().then(() => {
-              stateActions.setLogout();
-              sessionStorage.removeItem('loginUserInfo');
-              history.push('/login');
             setOpen(false);
-            });
           })
           .catch(() => false);
       }}

src/common/libs/umi/layoutConfig.tsx

@@ -1,16 +1,15 @@
 import { MyIcons, MyIconsType, PermissionsType, useMyState } from '@/common';
 import AvatarProps from '@/common/components/layout/AvatarProps';
-import { Apis } from '@/gen/Apis';
+import { SettingOutlined } from '@ant-design/icons';
 import { Link, RuntimeConfig, history, useNavigate } from '@umijs/max';
-import { AutoComplete, Input, Menu, MenuProps, Select, Space } from 'antd';
+import { AutoComplete, Button, Input, Menu, MenuProps, Space } from 'antd';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import './allConfig.scss';
 // import Logo from './logo.png';
 interface LevelKeysProps {
   key?: string;
   children?: LevelKeysProps[];
 }
-
 const loopMenu = (permissions: PermissionsType[] | undefined) => {
   let tree: PermissionsType[] = [];
   let map: Record<number, PermissionsType> = {};
@@ -58,7 +57,6 @@ const loopMenu = (permissions: PermissionsType[] | undefined) => {
 };
 
 export const LayoutConfig: RuntimeConfig['layout'] = () => {
-  const [getSelectProject, setSelectProject] = useState<LevelKeysProps[]>([]);
   const { snap } = useMyState();
   const navigate = useNavigate();
   const permissionsList = (snap.session.permissions || [])
@@ -71,20 +69,12 @@ export const LayoutConfig: RuntimeConfig['layout'] = () => {
     { label: '收费Bi', path: '/charge/charge_bi' },
     { label: '项目Bi', path: '/asset/asset_bi' },
   ];
-  const handleLoadProject = async () => {
-    let res = await Apis.Common.Auth.GetProjects();
-    setSelectProject(
-      res?.data?.map((item) => ({
-        value: item.id,
-        label: item.name,
-      })),
-    );
-  };
 
   const [stateOpenKeys, setStateOpenKeys] = useState(['2', '23']);
   const getLevelKeys: any = (items1: LevelKeysProps[]) => {
     const key: Record<string, number> = {};
     const func = (items2: LevelKeysProps[], level = 1) => {
+      console.log(items2, 'level');
       items2?.forEach((item) => {
         if (item.key) {
           key[item.key] = level;
@@ -98,22 +88,18 @@ export const LayoutConfig: RuntimeConfig['layout'] = () => {
     return key;
   };
 
-  useEffect(() => {
-    handleLoadProject('');
-  }, []);
-
   return {
     title: '',
     // 首页 logo
     logo: (
-      <div style={{ width: 136, display: 'flex', justifyContent: 'center' }}>
+      <div style={{ width: 181 }}>
         <img
           src={
             snap.session?.company_configs?.config_value?.admin_logo
               ? snap.session?.company_configs?.config_value?.admin_logo[0]?.url
               : ''
           }
-          style={{ width: 'auto', height: '42px' }}
+          style={{ height: '42px' }}
         />
       </div>
     ),
@@ -128,29 +114,45 @@ export const LayoutConfig: RuntimeConfig['layout'] = () => {
       <div className="headerContentRender">
         <div style={{ display: 'flex', alignItems: 'center', gap: 20 }}>
           <HeaderSearch permissionsList={permissionsList} />
+          {/* <Space size={20} style={{ color: '#666' }}>
+            常用功能:
+            {quickLinks.map((q) => (
+              <a
+                key={q.path}
+                onClick={() => history.push(q.path)}
+                className="quick_link"
+              >
+                {q.label}
+              </a>
+            ))}
+          </Space> */}
         </div>
         <Space size={10}>
-          {/* <Button
+          {/* <Popover
+            placement="bottom"
+            title="小程序二维码"
+            content={
+              <Space style={{ textAlign: 'center' }} size="large">
+                <div>
+                  <Image src={ImgEmployeeWxApp} style={{ height: '120px' }} />
+                  <div style={{ marginTop: 10 }}>员工端</div>
+                </div>
+
+                <div>
+                  <Image src={ImgCustomerWxApp} style={{ height: '120px' }} />
+                  <div style={{ marginTop: 10 }}>客户端</div>
+                </div>
+              </Space>
+            }
+          >
+            <Button type="default" shape="circle" icon={<TabletOutlined />} />
+          </Popover>
+          <Button type="default" shape="circle" icon={<BellOutlined />} /> */}
+          <Button
             type="default"
             shape="circle"
             icon={<SettingOutlined />}
             onClick={() => history.push('/system/sys_permissions')}
-          /> */}
-          <Select
-            onSearch={handleLoadProject}
-            options={getSelectProject}
-            allowClear
-            style={{ width: 160 }}
-            defaultValue={snap.session.current_project?.id}
-            onChange={(e: any) => {
-              Apis.Common.Auth.SwitchProject({
-                project_id: e ? e?.toString() : 'all',
-              }).then(() => {
-                window.location.reload();
-              });
-              console.log(e, 'e');
-            }}
-            placeholder="选择项目"
           />
         </Space>
       </div>
@@ -200,6 +202,7 @@ export const LayoutConfig: RuntimeConfig['layout'] = () => {
           const repeatIndex = openKeys
             .filter((key) => key !== currentOpenKey)
             .findIndex((key) => levelKeys[key] === levelKeys[currentOpenKey]);
+
           setStateOpenKeys(
             openKeys
               // remove repeat key

src/common/libs/umi/requestConfig.ts

@@ -41,9 +41,7 @@ export const requestConfig: RequestConfig = {
     // 错误接收及处理
     errorHandler: (error: any) => {
       if (error) {
-        if (error.errorMessage !== '用户未登录') {
         message.error(error.errorMessage);
-        }
         switch (error.errorCode) {
           case 10000:
             if (history.location.pathname !== '/login') history.push('/login');

src/common/libs/valtio/actions.ts

@@ -17,7 +17,6 @@ export const stateActions = {
     state.session.campus = res.data.campus;
     state.session.company_configs = res.data.company_configs;
     state.session.permissions = res.data.permissions;
-    state.session.current_project = res.data.current_project;
     if (res.data?.token?.access_token)
       state.storage.access_token = res.data?.token?.access_token;
     // 解析apis

src/common/libs/valtio/state.ts

@@ -48,10 +48,6 @@ type SessionType = {
   permissions?: any;
   apiKeys: string[];
   loading: number;
-  current_project?: {
-    id: number;
-    name: string;
-  };
 };
 
 const session: SessionType = proxy({
@@ -62,7 +58,6 @@ const session: SessionType = proxy({
   company_configs: {},
   apiKeys: [],
   loading: 0,
-  current_project: undefined,
 });
 
 export const state = proxy({

src/common/pages/MyLoginPage.tsx

@@ -59,10 +59,7 @@ export function MyLoginPage() {
               ...values,
               ...{ captcha_key: getCaptcha?.key },
             })
-              .then(async (res: any) => {
+              .then(async (res) => {
-                let pass = btoa(`${values?.password}_01`);
-                console.log(pass, 'pass', values?.password);
-                sessionStorage.setItem('loginUserInfo', pass);
                 await stateActions.setLogin(res);
                 navigate('/');
               })

src/common/utils/day.ts

@@ -11,41 +11,3 @@ export const isInTimeRange = (startTime?: string, endTime?: string) => {
 export function showTime(time?: string, num?: number) {
   return time?.substring(0, num || 5) || '';
 }
-
-export function useCurrentDayTime() {
-  let currentTime = dayjs().format('HH:mm:ss');
-  let intervalId: NodeJS.Timeout;
-
-  const start = () => {
-    intervalId = setInterval(() => {
-      currentTime = dayjs().format('HH:mm:ss');
-    }, 1000);
-  };
-
-  const stop = () => {
-    if (intervalId) {
-      clearInterval(intervalId);
-    }
-  };
-
-  const getTime = () => {
-    return currentTime;
-  };
-
-  return {
-    start,
-    stop,
-    getTime,
-  };
-}
-
-// 保持原有函数兼容性
-export function ShowCurrentDayTime() {
-  const timeString = dayjs().format('HH:mm:ss');
-  return timeString;
-}
-
-export function GetFromNow(time: string) {
-  //获取时间距离现在的时间
-  return time ? dayjs(time).fromNow() : '';
-}

src/common/utils/renderTextHelper.tsx

@@ -27,7 +27,11 @@ export const renderTextHelper = {
     let item: any = Object.values(Enums).find((data: any) => {
       return data.value === '' + value;
     });
-    return isColor ? <Tag color={item?.color}>{item?.text}</Tag> : item?.text;
+    return isColor ? (
+      <Tag color={item?.color}>{item?.text}</Tag>
+    ) : (
+      <Tag>{item?.text}</Tag>
+    );
     //  return <Tag style={{ color: item.color }}>{item.text}</Tag>;
   },
   Images(images: string[]) {

src/components/MyModal.tsx

@@ -34,7 +34,6 @@ export function MyModal(props?: any) {
             type={props.type || 'primary'}
             size={props.size || 'small'}
             onClick={() => setOpen(true)}
-            {...props?.modal?.btnProps}
           />
         )
       ) : (

src/gen/Enums.ts

@@ -282,7 +282,7 @@ export const BannersTypeEnum= {
 
 // 缓存类型
 export const CacheTypeEnum= {
-  'MobilePhoneVerificationCode': {"text":"手机验证码","color":"#827a7d","value":"MobilePhoneVerificationCode"}, 
+  'MobilePhoneVerificationCode': {"text":"手机验证码","color":"#e72e44","value":"MobilePhoneVerificationCode"}, 
 };
 
 // CompaniesMerchantTypeEnum
@@ -729,7 +729,6 @@ export const HouseRegistersTypeEnum= {
   'UpdateInfo': {"text":"修改信息","color":"#722ed1","value":"UpdateInfo"}, 
   'UpdatePhone': {"text":"修改电话","color":"#13c2c2","value":"UpdatePhone"}, 
   'GoodsRelease': {"text":"物品放行","color":"#a0d911","value":"GoodsRelease"}, 
-  'VisitorApplies': {"text":"来访申请","color":"#a0d911","value":"VisitorApplies"}, 
 };
 
 // HouseRegistersUsagePlanEnum

src/pages/asset/activities/index.tsx

@@ -38,7 +38,13 @@ export default function Index({ title = '项目活动' }) {
           // title={title}
         />
       ),
-      enrolls: <EnrollsList item={item} title="报名" reload={action?.reload} />,
+      enrolls: (
+        <>
+          {item.is_enroll === 1 && (
+            <EnrollsList item={item} title="报名" reload={action?.reload} />
+          )}
+        </>
+      ),
       publish: (
         <MyButtons.Default
           title={
@@ -193,6 +199,7 @@ export default function Index({ title = '项目活动' }) {
             render: (_, item: any, index, action) => (
               <Space key={index}>
                 <ActivityShow item={item} />
+
                 <>{tableRender(item, action)}</>
               </Space>
             ),

src/pages/asset/activities/modals/EnrollsList.tsx

@@ -16,11 +16,6 @@ export default function EnrollsList(props: MyBetaModalFormProps) {
       title={props.title || '报名'}
       type={props.item?.type || 'primary'}
       width="800px"
-      modal={{
-        btnProps: {
-          disabled: !props?.item.is_enroll,
-        },
-      }}
       node={
         <ProTable
           {...MyProTableProps.props}

src/pages/charge/charge_bi/index.tsx

@@ -1,6 +1,13 @@
 import { MyPageContainer } from '@/common';
+import { ProCard } from '@ant-design/pro-components';
+import { Space } from 'antd';
+import MyDemoLine from './charts/DemoLine';
+import MyOverviewClient from './charts/OverviewClient';
+import MyOverviewFinancialData from './components/OverviewFinancialData';
+import MyRanking from './components/Ranking';
 import './style.scss';
 export default function Index({ title = '财务Bi' }) {
+  
   return (
     <MyPageContainer
       title={title}
@@ -16,7 +23,18 @@ export default function Index({ title = '财务Bi' }) {
           justifyContent: 'space-between',
         }}
       >
-        2
+        <Space
+          direction="vertical"
+          style={{ flex: 1, minWidth: '500px', marginRight: '20px' }}
+          size="middle"
+        >
+          <MyOverviewFinancialData />
+          <MyOverviewClient />
+          <MyDemoLine />
+        </Space>
+        <ProCard style={{ maxWidth: '33vw' }} title="项目收款排名">
+          <MyRanking />
+        </ProCard>
       </div>
     </MyPageContainer>
   );

src/pages/customer/house_registers_audit/index.tsx

@@ -88,7 +88,9 @@ export default function Index({ title = '登记审核' }) {
           MyColumns.Option({
             render: (_, item: any, index, action) => (
               <Space key={index}>
+                {item?.status === HouseRegistersStatusEnum.Pending.value && (
                   <Audit item={item} reload={action?.reload} title={title} />
+                )}
               </Space>
             ),
           }),

src/pages/customer/house_registers_audit/modals/Audit.tsx

@@ -32,15 +32,7 @@ export default function Update(props: MyBetaModalFormProps) {
     <BetaSchemaForm<ApiTypes.Archive.HouseRegisters.Update>
       {...MyModalFormProps.props}
       title={props.title}
-      trigger={
+      trigger={<MyButtons.Default title="审核" type="primary" />}
-        <MyButtons.Default
-          title="审核"
-          disabled={
-            props.item?.status !== HouseRegistersStatusEnum.Pending.value
-          }
-          type="primary"
-        />
-      }
       wrapperCol={{ span: 24 }}
       width="800px"
       modalProps={{

src/pages/customer/list/index.tsx

@@ -106,7 +106,7 @@ export default function Index({ title = '客户列表' }) {
             search: false,
           }),
           MyColumns.Option({
-            render: (_, item: any, index) => (
+            render: (_, item: any, index, action) => (
               <Space key={index}>
                 <MyButtons.View
                   title="查看"

src/pages/index/charts/FinancialAnalysisLine.tsx

@@ -1,48 +0,0 @@
-import { MyBetaModalFormProps } from '@/common';
-import { Line } from '@ant-design/plots';
-import { useEffect, useState } from 'react';
-export default function FinancialAnalysisLine(props: MyBetaModalFormProps) {
-  const [houseBillsCount, setHouseBillsCount] = useState<any>({});
-  const config = {
-    data: [],
-    xField: '月份',
-    yField: '金额',
-    colorField: 'name',
-    point: {
-      size: 7,
-    },
-    legend: {
-      position: 'top',
-    },
-    tooltip: {},
-    style: {
-      // 矩形四个方向的内边距
-      inset: 5,
-    },
-
-    // 使用双Y轴，因为两个指标数值范围差异大
-    yAxis: [
-      {
-        title: {
-          text: '月收款(万元)',
-        },
-      },
-      {
-        title: {
-          text: '收缴率(%)',
-        },
-        grid: null,
-      },
-    ],
-  };
-
-  useEffect(() => {
-    setHouseBillsCount({ ...config, data: props.item || [] });
-  }, [props.item]);
-
-  return (
-    <div style={{ height: 290 }}>
-      <Line {...houseBillsCount} />
-    </div>
-  );
-}

src/pages/index/charts/WorkOrderPie.tsx

@@ -1,95 +0,0 @@
-import { MyBetaModalFormProps } from '@/common';
-import { Pie } from '@ant-design/plots';
-import { Space } from 'antd';
-import { useEffect, useState } from 'react';
-export default function WorkOrderPie(props: MyBetaModalFormProps) {
-  const [getPieCount, setPieCount] = useState<any>({});
-  const config = {
-    data: [],
-    angleField: '数量',
-    colorField: 'name',
-    innerRadius: 0.8,
-    radius: 0.5,
-    style: {
-      width: '60px',
-    },
-    label: {
-      text: '数量',
-      style: {
-        fontWeight: 'bold',
-      },
-    },
-  };
-
-  useEffect(() => {
-    setPieCount({
-      ...config,
-      data: props?.item?.list || [],
-      legend: {
-        color: {
-          render: (legendItem: any, item: any) => {
-            console.log(legendItem, item, 'legendItem');
-            // 这里可以返回 React 节点或 HTML 字符串
-            return (
-              <Space
-                size="small"
-                style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  flexWrap: 'wrap',
-                  gap: '5px',
-                }}
-              >
-                {legendItem?.map((row: any, index: number) => {
-                  return (
-                    <div key={`item_${index}`}>
-                      <div
-                        style={{
-                          width: 8,
-                          height: 8,
-                          display: 'inline-block',
-                          backgroundColor: row?.color,
-                          borderRadius: 100,
-                          fontSize: 14,
-                          marginRight: 4,
-                        }}
-                      />
-                      {row?.label}：
-                      {
-                        props?.item?.list?.find(
-                          (i: any) => i.name === row?.label,
-                        )?.数量
-                      }
-                    </div>
-                  );
-                })}
-              </Space>
-            );
-          },
-          title: false,
-          position: 'top',
-          rowPadding: 5,
-        },
-      },
-      annotations: [
-        {
-          type: 'text',
-          style: {
-            text: `${props?.item?.total || ''}\n工单总数`,
-            x: '50%',
-            y: '50%',
-            textAlign: 'center',
-            fontSize: 20,
-            fontStyle: 'bold',
-          },
-        },
-      ],
-    });
-  }, [props?.item]);
-
-  return (
-    <div style={{ height: 400 }}>
-      <Pie {...getPieCount} />
-    </div>
-  );
-}

src/pages/index/components/LayoutLeft.tsx

@@ -1,270 +0,0 @@
-import { MyColumns, MyProTableProps, renderTextHelper } from '@/common';
-import { GetFromNow, ShowCurrentDayTime } from '@/common/utils/day';
-import { Apis } from '@/gen/Apis';
-import {
-  CompanyEmployeeBacklogsTypeEnum,
-  HouseBillsTypeEnum,
-} from '@/gen/Enums';
-import { ClockCircleOutlined, FundOutlined } from '@ant-design/icons';
-import { ProCard, ProTable } from '@ant-design/pro-components';
-import { Col, Row, Space } from 'antd';
-import { useEffect, useState } from 'react';
-import CountUp from 'react-countup';
-import MyFinancialAnalysisLine from '../charts/FinancialAnalysisLine';
-import './style_left.scss';
-const RealTimeDynamicsEmployeeBacklogsTypeEnum = {
-  ...HouseBillsTypeEnum,
-  ...CompanyEmployeeBacklogsTypeEnum,
-};
-export default function LayoutLeft() {
-  const [financialAnalysis, setFinancialAnalysis] = useState<any>({});
-  const [todayDynamics, setTodayDynamics] = useState<any>({});
-  const [currentTime, setCurrentTime] = useState<string>(ShowCurrentDayTime());
-  const getFinancialAnalysis = async () => {
-    let res = await Apis.Statistics.IndexCount.FinancialAnalysis();
-    setFinancialAnalysis(res?.data);
-  };
-  const getTodayDynamics = async () => {
-    let res = await Apis.Statistics.IndexCount.TodayDynamics();
-    setTodayDynamics(res?.data);
-  };
-
-  useEffect(() => {
-    getFinancialAnalysis();
-    getTodayDynamics();
-
-    // 每5分钟调用一次 getTodayDynamics()
-    const intervalId = setInterval(() => {
-      getFinancialAnalysis();
-      getTodayDynamics();
-    }, 5 * 60 * 1000); // 5分钟
-
-    return () => {
-      clearInterval(intervalId);
-    };
-  }, []);
-
-  // 每秒更新当前时间
-  useEffect(() => {
-    const intervalId = setInterval(() => {
-      setCurrentTime(ShowCurrentDayTime());
-    }, 1000);
-
-    return () => {
-      clearInterval(intervalId);
-    };
-  }, []);
-
-  return (
-    <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
-      <div style={{ display: 'flex', gap: '15px', flexWrap: 'wrap' }}>
-        <ProCard
-          title="财务分析"
-          className="finance_pro_card financial_analysis_card"
-          style={{ flex: '0.5 1 400px', minWidth: '300px' }}
-        >
-          <div className="finance_pro_card_content pt-15">
-            <Row>
-              <Col span={8}>
-                <div className="finance_pro_card_item">
-                  <div className="finance_pro_card_item_val">
-                    {financialAnalysis?.month_receivable}
-                    <span>元</span>
-                  </div>
-                  <div style={{ fontSize: '14px' }}>本月应收款</div>
-                </div>
-              </Col>
-              <Col span={8}>
-                <div className="finance_pro_card_item">
-                  <div className="finance_pro_card_item_val">
-                    {financialAnalysis?.month_received}
-                    <span>元</span>
-                  </div>
-                  <div style={{ fontSize: '14px' }}>本月实收款</div>
-                </div>
-              </Col>
-              <Col span={8}>
-                <div className="finance_pro_card_item">
-                  <div className="finance_pro_card_item_val">
-                    {financialAnalysis?.month_rate}%
-                  </div>
-                  <div style={{ fontSize: '14px' }}>本月收款率</div>
-                </div>
-              </Col>
-            </Row>
-          </div>
-          <div className="finance_pro_card_content">
-            <Row>
-              <Col span={8}>
-                <div className="finance_pro_card_item">
-                  <div className="finance_pro_card_item_val">
-                    {financialAnalysis?.year_receivable}
-                    <span>元</span>
-                  </div>
-                  <div style={{ fontSize: '14px' }}>年度应收款</div>
-                </div>
-              </Col>
-              <Col span={8}>
-                <div className="finance_pro_card_item">
-                  <div className="finance_pro_card_item_val">
-                    {financialAnalysis?.year_received}
-                    <span>元</span>
-                  </div>
-                  <div style={{ fontSize: '14px' }}>年度实收款</div>
-                </div>
-              </Col>
-              <Col span={8}>
-                <div className="finance_pro_card_item">
-                  <div className="finance_pro_card_item_val">
-                    {financialAnalysis?.year_rate}%
-                  </div>
-                  <div style={{ fontSize: '14px' }}>年度收款率</div>
-                </div>
-              </Col>
-            </Row>
-          </div>
-          <MyFinancialAnalysisLine item={financialAnalysis?.chart_data || []} />
-        </ProCard>
-        <ProCard
-          title="今日动态"
-          style={{ flex: '1.5 1 400px', minWidth: '300px' }}
-          className="finance_pro_card"
-          extra={
-            <Space align="center">
-              <ClockCircleOutlined />
-              {currentTime}
-              <div className="circle_content">
-                <div className="circle_center"></div>
-              </div>
-            </Space>
-          }
-        >
-          <Space
-            direction="vertical"
-            style={{
-              width: '100%',
-            }}
-          >
-            <ProCard
-              style={{
-                backgroundColor: '#F3F8FB',
-                width: '100%',
-                borderRadius: '8px',
-              }}
-              title="今日收款"
-              extra={
-                <div className="today_amount_contents">
-                  <span className="amount">
-                    <CountUp
-                      end={todayDynamics?.today_amount}
-                      duration={3}
-                      separator=","
-                      prefix="¥"
-                      decimals={2}
-                    />
-                  </span>
-                  <span className="unit">元</span>
-                </div>
-              }
-            >
-              <Row gutter={[15, 15]}>
-                {todayDynamics?.type_distribution?.map(
-                  (res: any, index: number) => {
-                    return (
-                      <Col span={6} key={`item_${index}`}>
-                        <div className="card_item">
-                          <div className="card_item_title">{res?.name}</div>
-                          <div>
-                            <CountUp
-                              end={res?.value}
-                              duration={3}
-                              separator=","
-                              prefix="¥"
-                              decimals={2}
-                            />
-                          </div>
-                        </div>
-                      </Col>
-                    );
-                  },
-                )}
-              </Row>
-            </ProCard>
-
-            <div>
-              <Space className="bi_min_title">
-                <FundOutlined />
-                <div className="title">实时动态</div>
-              </Space>
-              <div className="dynamics_contents">
-                {todayDynamics?.dynamics?.map((res: any, index: number) => {
-                  return (
-                    <div key={`item_${index}`} className="real_time_dynamics">
-                      <div className={`dynamics_type type_${res?.type}`}></div>
-                      <span>{GetFromNow(res?.time)}</span>
-                      {res?.type === 'WorkOrder' ? '提报' : '收到'}【
-                      {res?.target}】 【
-                      <renderTextHelper.Tag
-                        Enums={RealTimeDynamicsEmployeeBacklogsTypeEnum}
-                        value={res?.type}
-                        isColor={false}
-                        key="type"
-                      />
-                      】{res?.amount ? `${res?.amount}元` : ''}
-                    </div>
-                  );
-                })}
-              </div>
-            </div>
-          </Space>
-        </ProCard>
-      </div>
-      <div
-        style={{
-          flex: 1,
-          marginTop: '15px',
-        }}
-      >
-        <ProCard title="小区概括分析" className="finance_pro_card">
-          <ProTable
-            {...MyProTableProps.props}
-            request={async (params, sort) => {
-              return MyProTableProps.request(
-                params,
-                sort,
-                Apis.Statistics.IndexCount.CommunityOverview,
-              );
-            }}
-            search={false}
-            options={false}
-            columns={[
-              MyColumns.ID({
-                search: false,
-              }),
-              {
-                title: '项目名称',
-                dataIndex: 'name',
-              },
-              {
-                title: '房屋数',
-                dataIndex: 'house_count',
-              },
-              {
-                title: '车位数',
-                dataIndex: 'car_port_count',
-              },
-              {
-                title: '绑定客户数',
-                dataIndex: 'customer_count',
-              },
-              {
-                title: '收缴率',
-                dataIndex: 'collection_rate',
-              },
-            ]}
-          />
-        </ProCard>
-      </div>
-    </div>
-  );
-}

src/pages/index/components/LayoutRight.tsx

@@ -1,175 +0,0 @@
-import { Apis } from '@/gen/Apis';
-import { RightOutlined } from '@ant-design/icons';
-import { useNavigate } from '@umijs/max';
-import { Col, Progress, Row, Space } from 'antd';
-import { useEffect, useState } from 'react';
-import CountUp from 'react-countup';
-import WorkOrderPie from '../charts/WorkOrderPie';
-import './style_right.scss';
-export default function LayoutRight() {
-  const navigate = useNavigate();
-  const [workOrderAnalysis, setWorkOrderAnalysis] = useState<any>({});
-  const getWorkOrderAnalysis = () => {
-    Apis.Statistics.IndexCount.WorkOrderAnalysis().then((res) => {
-      setWorkOrderAnalysis(res.data);
-    });
-  };
-
-  useEffect(() => {
-    getWorkOrderAnalysis();
-  }, []);
-
-  return (
-    <div className="right_content">
-      <div
-        style={{
-          padding: '0 0 20px 0',
-          fontSize: 16,
-          fontWeight: 600,
-        }}
-      >
-        工单分析
-      </div>
-      <Space direction="vertical" style={{ width: '100%' }}>
-        <div
-          style={{ backgroundColor: '#F3FAFF', borderRadius: 8, padding: 20 }}
-        >
-          <div
-            style={{
-              padding: '0 0 15px 0',
-              fontSize: 16,
-              fontWeight: 600,
-            }}
-          >
-            待处理工单
-          </div>
-          <Row gutter={[12, 12]}>
-            <Col span={12}>
-              <div
-                className="work_card_title"
-                onClick={() => {
-                  navigate('/work_order/list');
-                }}
-              >
-                报修工单 <RightOutlined />
-              </div>
-              <div className="work_card_number">
-                {/* {workOrderAnalysis?.repair || 0} */}
-                <CountUp
-                  end={workOrderAnalysis?.repair}
-                  duration={3}
-                  separator=","
-                  prefix=""
-                />
-              </div>
-            </Col>
-            <Col span={12}>
-              <div
-                className="work_card_title"
-                onClick={() => {
-                  navigate('/work_order/list');
-                }}
-              >
-                报事工单 <RightOutlined />
-              </div>
-              <div className="work_card_number">
-                <CountUp
-                  end={workOrderAnalysis?.incident}
-                  duration={3}
-                  separator=","
-                  prefix=""
-                />
-              </div>
-            </Col>
-            <Col span={12}>
-              <div
-                className="work_card_title"
-                onClick={() => {
-                  navigate('/work_order/complaint');
-                }}
-              >
-                投诉工单 <RightOutlined size={12} />
-              </div>
-              <div className="work_card_number">
-                <CountUp
-                  end={workOrderAnalysis?.complaint}
-                  duration={3}
-                  separator=","
-                  prefix=""
-                />
-              </div>
-            </Col>
-          </Row>
-        </div>
-        <div>
-          <div
-            style={{
-              padding: '15px 0',
-              fontSize: 16,
-              fontWeight: 600,
-            }}
-          >
-            工单统计
-          </div>
-          <WorkOrderPie
-            item={{
-              list: workOrderAnalysis?.distribution || [],
-              total: workOrderAnalysis?.total || 0,
-            }}
-          />
-        </div>
-        <div>
-          <div
-            style={{
-              padding: '15px 0',
-              fontSize: 16,
-              fontWeight: 600,
-            }}
-          >
-            工单数据
-          </div>
-          <div className="work_order_data">
-            <div className="work_order_data_item">
-              <Progress
-                type="dashboard"
-                size={[160, 30]}
-                percent={workOrderAnalysis?.data?.completion_rate}
-                format={(percent) => {
-                  return (
-                    <div className="dashboard_progress">
-                      <div className="dashboard_value">{`${percent}%`}</div>
-                      <div className="dashboard_label">完成率</div>
-                    </div>
-                  );
-                }}
-              />
-              <div className="work_order_data_cell">
-                已完成：{workOrderAnalysis?.data?.completed_count || 0}
-              </div>
-              <div className="work_order_data_cell">已关闭：{0}</div>
-            </div>
-            <div className="work_order_data_item">
-              <Progress
-                type="dashboard"
-                size={[160, 30]}
-                percent={workOrderAnalysis?.data?.satisfaction_rate}
-                format={(percent) => {
-                  return (
-                    <div className="dashboard_progress">
-                      <div className="dashboard_value">{`${percent}%`}</div>
-                      <div className="dashboard_label">好评率</div>
-                    </div>
-                  );
-                }}
-              />
-              <div className="work_order_data_cell">
-                已评价：{workOrderAnalysis?.data?.evaluated_count || 0}
-              </div>
-              <div className="work_order_data_cell">已好评：{0}</div>
-            </div>
-          </div>
-        </div>
-      </Space>
-    </div>
-  );
-}

src/pages/index/components/style_left.scss

@@ -1,294 +0,0 @@
-.finance_pro_card {
-  border-radius: 8px;
-}
-.financial_analysis_card {
-  width: 470px;
-}
-.finance_pro_card_content {
-  background: linear-gradient(135deg, #6499ff 0%, #95b8ff 100%);
-  padding: 25px 0;
-  border-radius: 12px;
-  box-shadow: 0 10px 25px -5px rgba(42, 126, 251, 0.3);
-  transition: all 0.3s ease;
-
-  &:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 15px 30px -5px rgba(42, 126, 251, 0.4);
-  }
-
-  // animation: fadeInUp 0.6s ease-out forwards;
-  // opacity: 0;
-  // transform: translateY(20px);
-
-  // &.pt-15 {
-  //   animation-delay: 0.2s;
-  // }
-
-  .finance_pro_card_item {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    color: #fff;
-    animation: scaleIn 0.8s ease-out forwards;
-    opacity: 0;
-    transform: scale(0.9);
-
-    &:nth-child(1) {
-      animation-delay: 0.3s;
-    }
-    &:nth-child(2) {
-      animation-delay: 0.4s;
-    }
-    &:nth-child(3) {
-      animation-delay: 0.5s;
-    }
-  }
-
-  .finance_pro_card_item_val {
-    font-size: 20px;
-    font-weight: 700;
-    margin-bottom: 8px;
-    animation: textSlideUp 0.8s ease-out forwards;
-    opacity: 0;
-    transform: translateY(10px);
-    text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-
-    span {
-      font-weight: 500;
-      font-size: 14px;
-      margin-left: 4px;
-      opacity: 0.9;
-    }
-  }
-
-  .finance_pro_card_item > div:last-child {
-    font-size: 14px;
-    font-weight: 500;
-    animation: textFadeIn 1s ease-out forwards;
-    opacity: 0;
-    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
-  }
-
-  // 为每个子元素添加不同的动画延迟
-  .finance_pro_card_item {
-    &:nth-child(1) {
-      .finance_pro_card_item_val {
-        animation-delay: 0.5s;
-      }
-      > div:last-child {
-        animation-delay: 0.7s;
-      }
-    }
-    &:nth-child(2) {
-      .finance_pro_card_item_val {
-        animation-delay: 0.6s;
-      }
-      > div:last-child {
-        animation-delay: 0.8s;
-      }
-    }
-    &:nth-child(3) {
-      .finance_pro_card_item_val {
-        animation-delay: 0.7s;
-      }
-      > div:last-child {
-        animation-delay: 0.9s;
-      }
-    }
-  }
-}
-
-@keyframes fadeInUp {
-  0% {
-    opacity: 0;
-    transform: translateY(20px);
-  }
-  100% {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
-@keyframes scaleIn {
-  0% {
-    opacity: 0;
-    transform: scale(0.9);
-  }
-  100% {
-    opacity: 1;
-    transform: scale(1);
-  }
-}
-
-@keyframes textSlideUp {
-  0% {
-    opacity: 0;
-    transform: translateY(10px);
-  }
-  100% {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
-@keyframes textFadeIn {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}
-.pt-15 {
-  margin-bottom: 15px;
-}
-.card_item {
-  background-color: #fff;
-  padding: 25px 20px;
-  border-radius: 10px;
-  text-align: center;
-  color: #3d3d3d;
-  font-size: 16px;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
-  transition: all 0.3s ease;
-  border: 1px solid #f0f0f0;
-
-  &:hover {
-    transform: translateY(-3px);
-    box-shadow: 0 8px 20px rgba(0, 0, 0, 0.12);
-    border-color: #e0e7ff;
-  }
-
-  &_title {
-    font-weight: 600;
-    margin-bottom: 8px;
-    font-size: 16px;
-    color: #1f2937;
-  }
-
-  > div:last-child {
-    font-size: 18px;
-    color: #3d3d3d;
-  }
-}
-
-.bi_min_title {
-  display: flex;
-  align-items: center;
-  font-size: 16px;
-  font-weight: 500;
-  padding: 12px 0;
-  color: #2a7efb;
-  .title {
-    color: #333;
-  }
-}
-
-.dynamics_contents {
-  height: 170px;
-  overflow-y: auto;
-}
-
-.real_time_dynamics {
-  color: #333;
-  width: 100%;
-  font-size: 16px;
-  padding: 0 0 15px 0;
-  display: flex;
-  align-items: center;
-  .dynamics_type {
-    width: 7px;
-    height: 7px;
-    border-radius: 100px;
-    background-color: #eee;
-  }
-  span {
-    color: #666;
-    padding: 0 10px;
-  }
-  .type_WorkOrder {
-    background-color: #faad14;
-  }
-  .type_PropertyFee {
-    background-color: #00a154;
-  }
-  .type_MaintenanceFund {
-    background-color: #1bc0c4;
-  }
-  .type_WaterFee {
-    background-color: #007bff;
-  }
-  .type_ElectricityFee {
-    background-color: #f8860c;
-  }
-  .type_SharedWaterFee {
-    background-color: #60ffb2;
-  }
-  .type_SharedElectricityFee {
-    background-color: #7912ff;
-  }
-  .type_CarPortFee {
-    background-color: #ffb547;
-  }
-  .type_WorkOrderRepairFee {
-    background-color: #ff4141;
-  }
-}
-
-.today_amount_contents {
-  .amount {
-    font-size: 19px;
-    font-weight: 500;
-    color: #389e0d;
-  }
-  .unit {
-    font-size: 12px;
-    color: #666;
-  }
-}
-
-.circle_content {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background-color: #deffcb;
-  padding: 6px;
-  border-radius: 100px;
-  position: relative;
-  overflow: visible;
-
-  &::before,
-  &::after {
-    content: '';
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    background-color: rgba(73, 213, 13, 0.3);
-    animation: ripple 2.4s infinite;
-  }
-
-  &::after {
-    animation-delay: 1s;
-  }
-
-  .circle_center {
-    width: 9px;
-    height: 9px;
-    border-radius: 100px;
-    background-color: #389e0d;
-    position: relative;
-    z-index: 1;
-  }
-}
-
-@keyframes ripple {
-  0% {
-    transform: scale(1);
-    opacity: 1;
-  }
-  100% {
-    transform: scale(1.5);
-    opacity: 0;
-  }
-}

src/pages/index/components/style_right.scss

@@ -1,49 +0,0 @@
-.work_card_title {
-  color: #666666;
-  font-size: 16px;
-  cursor: pointer;
-}
-.right_content {
-  flex: 1;
-  background-color: #fff;
-  padding: 20px;
-  border-radius: 8px;
-  height: 92vh;
-}
-.work_card_number {
-  color: #333333;
-  font-size: 28px;
-  font-weight: 500;
-  padding-top: 5px;
-}
-.work_order_data {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding-top: 10px;
-  &_item {
-    width: 50%;
-    text-align: center;
-    color: #3d3d3d;
-    font-size: 16rpx;
-  }
-  &_cell {
-    padding-top: 10px;
-  }
-}
-.dashboard_progress {
-  width: 100%;
-  position: relative;
-  text-align: center;
-  // padding-top: 100px;
-  .dashboard_label {
-    font-size: 16px;
-    color: #3d3d3d;
-    width: 100%;
-    position: relative;
-    top: 50px;
-  }
-  .dashboard_value {
-    width: 100%;
-  }
-}

src/pages/index/index.tsx

@@ -1,28 +1,5 @@
 // import MyModalsMapLeaflet from '@/components/ModalsMapLeaflet';
-import { Apis } from '@/gen/Apis';
-import { FloatButton } from 'antd';
-import LayoutLeft from './components/LayoutLeft';
-import LayoutRight from './components/LayoutRight';
 import './style.scss';
 export default function Index() {
-  return (
+  return <div className="overview_content">2</div>;
-    <div className="overview_content">
-      <div className="overview_left">
-        <LayoutLeft />
-      </div>
-      <div className="overview_right">
-        <LayoutRight />
-      </div>
-      <FloatButton
-        // icon={<Loading3QuartersOutlined />}
-        description="刷新"
-        onClick={() => {
-          Apis.Statistics.IndexCount.ClearCache().then(() => {
-            // message.success('刷新成功');
-            window.location.reload();
-          });
-        }}
-      />
-    </div>
-  );
 }

src/pages/index/style.scss

@@ -6,11 +6,9 @@
   justify-content: space-between;
   gap: 15px;
 }
-.overview_left {
+.overview_left,
-  flex: 3;
-}
 .overview_right {
-  flex: 1;
+  width: 500px;
 }
 .overview_center {
   flex: 1;

src/pages/meter/readings/modals/CorrectReading.tsx

@@ -197,6 +197,7 @@ export default function Create(props: MyBetaModalFormProps) {
               value: 'value',
             },
             labelRender: (res: any) => {
+              console.log(res, '222');
               if (res?.label) {
                 return res?.label;
               } else {

src/pages/work_order/list/index.tsx

@@ -16,7 +16,7 @@ import {
 } from '@/gen/Enums';
 import { ProTable } from '@ant-design/pro-components';
 import { useSearchParams } from '@umijs/max';
-import { Dropdown, Space, Tooltip } from 'antd';
+import { Space, Tooltip } from 'antd';
 import WorkOrderAssign from './modals/WorkOrderAssign';
 import WorkOrderCreate from './modals/WorkOrderCreate';
 import WorkOrderShow from './modals/WorkOrderShow';
@@ -52,31 +52,40 @@ export default function Index({ title = '报修报事' }) {
     });
   };
   let tableRender = (item: any, action: any) => {
-    let permissions = getCurrentPermissions({
+    return getCurrentPermissions({
+      show: <WorkOrderShow item={item} title="详情" reload={action?.reload} />,
+      update: (
+        <>
+          {item.status === 'Pending' && (
+            <WorkOrderUpdate
+              item={item}
+              reload={action?.reload}
+              title={title}
+            />
+          )}
+        </>
+      ),
       assign: (
-        <WorkOrderAssign item={item} reload={action?.reload} title="指派" />
+        <>
+          {item.assign_status === 'Unassigned' &&
+            item.type !== 'SecurityInspection' &&
+            item.status !== 'Closed' && (
+              <WorkOrderAssign
+                item={item}
+                reload={action?.reload}
+                title="指派"
+              />
+            )}
+        </>
       ),
       completed: (
+        <>
+          {item.status === 'Completed' && item.is_visited === 0 && (
             <WorkOrderShow item={item} title="回访" reload={action?.reload} />
+          )}
+        </>
       ),
-    });
+      delete: (
-
-    let permissionsSpace = getCurrentPermissions({
-      show: {
-        key: '1',
-        label: (
-          <WorkOrderShow item={item} title="详情" reload={action?.reload} />
-        ),
-      },
-      update: {
-        key: '2',
-        label: (
-          <WorkOrderUpdate item={item} reload={action?.reload} title={title} />
-        ),
-      },
-      delete: {
-        key: '3',
-        label: (
         <MyButtons.Delete
           onConfirm={() =>
             Apis.WorkOrder.HouseWorkOrders.Delete({
@@ -85,15 +94,7 @@ export default function Index({ title = '报修报事' }) {
           }
         />
       ),
-      },
     });
-
-    let Others = (
-      <Dropdown menu={{ items: permissionsSpace }} trigger={['click']}>
-        <MyButtons.Default title="更多" />
-      </Dropdown>
-    );
-    return [...permissions, ...[Others]];
   };
 
   return (

src/pages/work_order/list/modals/WorkOrderAssign.tsx

@@ -33,15 +33,7 @@ export default function WorkOrderAssign(
       labelCol={{ span: 5 }}
       labelAlign="left"
       trigger={
-        <MyButtons.Default
+        <MyButtons.Default title={props.title || '指派'} type="primary" />
-          title={props.title || '指派'}
-          disabled={
-            props?.item.assign_status !== 'Unassigned' ||
-            props?.item.type === 'SecurityInspection' ||
-            props?.item.status === 'Closed'
-          }
-          type="primary"
-        />
       }
       key={new Date().getTime()}
       form={form}

src/pages/work_order/list/modals/WorkOrderShow.tsx

@@ -41,7 +41,7 @@ export default function WorkOrderShow({
     <>
       <MyButtons.Default
         onClick={handleOpen}
-        disabled={item?.is_visited || item.status !== 'Completed'}
+        disabled={item?.is_visited}
         type={'primary'}
         title={title}
       />

src/pages/work_order/list/modals/WorkOrderUpdate.tsx

@@ -27,7 +27,7 @@ export default function WorkOrderUpdate(
       width="600px"
       layout="horizontal"
       key={new Date().getTime()}
-      trigger={<MyButtons.Edit title={`编辑`} disabled={props.item?.status !== 'Pending'} />}
+      trigger={<MyButtons.Edit title={`编辑`} />}
       onOpenChange={(open: any) => {
         if (open && props.item) {
           const formValues = {

yarn.lock

@@ -4870,11 +4870,6 @@ cosmiconfig@^9.0.0:
     js-yaml "^4.1.0"
     parse-json "^5.2.0"
 
-countup.js@^2.8.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/countup.js/-/countup.js-2.9.0.tgz#599e6482e502e5e3f00f8816637120c9b21856ed"
-  integrity sha512-llqrvyXztRFPp6+i8jx25phHWcVWhrHO4Nlt0uAOSKHB8778zzQswa4MU3qKBvkXfJKftRYFJuVHez67lyKdHg==
-
 create-ecdh@^4.0.4:
   version "4.0.4"
   resolved "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz"
@@ -10589,13 +10584,6 @@ react-activation@^0.13.4:
     react-node-key "^0.4.0"
     szfe-tools "^0.0.0-beta.7"
 
-react-countup@^6.5.3:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/react-countup/-/react-countup-6.5.3.tgz#e892aa3eab2d6ba9c3cdba30bf4ed6764826d848"
-  integrity sha512-udnqVQitxC7QWADSPDOxVWULkLvKUWrDapn5i53HE4DPRVgs+Y5rr4bo25qEl8jSh+0l2cToJgGMx+clxPM3+w==
-  dependencies:
-    countup.js "^2.8.0"
-
 react-dom@18.3.1:
   version "18.3.1"
   resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz"
@@ -11647,7 +11635,16 @@ string-convert@^0.2.0:
   resolved "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz"
   integrity sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A==
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -11737,7 +11734,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -12641,7 +12645,16 @@ word-wrap@^1.2.5:
   resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==