From a81de20763b6dd37c08eaa5ac0fb8343c4c21239 Mon Sep 17 00:00:00 2001
From: lijingqi <1437862981@qq.com>
Date: Fri, 13 Dec 2024 16:13:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SecurityState/IndustryWarn/IndustryWiget/index.tsx   | 2 +-
 .../SecurityState/MeetSafeguard/index.tsx                | 2 +-
 .../SecurityState/SecurityCqi/index.tsx                  | 2 +-
 .../SecurityServiceOverview/SecurityState/index.tsx      | 9 +++------
 .../components/RiskWarn/TopSearch/index.tsx              | 5 +++--
 .../components/RiskWarn/index.tsx                        | 1 +
 src/pages/TheOperationOfCityOverall/index.tsx            | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.tsx
index 92509c24..42c8f474 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.tsx
@@ -24,7 +24,7 @@ const IndustryWiget = ({
         onClick={() => {
           setWayModalOpt({
             open: true,
-            title: data?.parentData?.typeName,
+            title: data?.typeName,
             ...data,
           });
         }}
diff --git a/src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.tsx
index dbd81df3..edb5c2fc 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.tsx
@@ -212,7 +212,7 @@ const MeetSafeguard = () => {
       key: 'name',
       width: 80,
       ellipsis: true,
-      render: (text, record, index) => {
+      render: (text:any, record:any, index:number) => {
         // 当前页码减1，乘以每页数量，再加上当前行的索引加1
         return `${(searchData?.page - 1) * dataSource?.length + (index + 1)}`;
       },
diff --git a/src/pages/SecurityServiceOverview/SecurityState/SecurityCqi/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/SecurityCqi/index.tsx
index 2dc2515d..11130621 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/SecurityCqi/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/SecurityCqi/index.tsx
@@ -127,7 +127,7 @@ const SecurityCqi = ({ warnLevel }: { warnLevel: number }) => {
               <ConfigProvider
                 theme={{
                   token: {
-                    /* 这里是你的全局 token */
+                    
                     colorBgElevated: '#163050',
                   },
                 }}
diff --git a/src/pages/SecurityServiceOverview/SecurityState/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/index.tsx
index c0c6130c..a0e74c41 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/index.tsx
@@ -1,5 +1,3 @@
-import services from '@/services';
-import { useRequest } from '@umijs/max';
 import { Flex } from 'antd';
 import { useState } from 'react';
 import SafetyMap from '../SafetyMap';
@@ -20,16 +18,15 @@ export const StateMap = {
 };
 
 const SecurityState = () => {
-
   const [warnLevel, setWarnLevel] = useState(2);
 
   return (
     <Flex className={styles.container} justify="space-between">
       {/* 左侧 */}
       <div className={styles.leftWrap}>
-        <SecurityCqi warnLevel={warnLevel}/>
-        <IndustryWarn  warnLevel={warnLevel} setWarnLevel={setWarnLevel}/>
-        <FacilityWarn warnLevel={warnLevel} setWarnLevel={setWarnLevel}/>
+        <SecurityCqi warnLevel={warnLevel} />
+        <IndustryWarn warnLevel={warnLevel} setWarnLevel={setWarnLevel} />
+        <FacilityWarn warnLevel={warnLevel} setWarnLevel={setWarnLevel} />
       </div>
       {/* 地图 */}
       <div className={styles.mapCenter}>
diff --git a/src/pages/SecurityServiceOverview/components/RiskWarn/TopSearch/index.tsx b/src/pages/SecurityServiceOverview/components/RiskWarn/TopSearch/index.tsx
index 5cf2f481..79e37099 100644
--- a/src/pages/SecurityServiceOverview/components/RiskWarn/TopSearch/index.tsx
+++ b/src/pages/SecurityServiceOverview/components/RiskWarn/TopSearch/index.tsx
@@ -1,5 +1,5 @@
 import services from '@/services';
-import { useRequest } from 'ahooks';
+import { useRequest, useUpdateEffect } from 'ahooks';
 import { ConfigProvider, Select } from 'antd';
 import classNames from 'classnames';
 import { useEffect, useMemo, useState } from 'react';
@@ -34,9 +34,10 @@ const TopSearch = ({ onSearch }: { onSearch: (val: any) => void }) => {
       },
     ];
   }, [data]);
-  useEffect(() => {
+  useUpdateEffect(() => {
     onSearch(searchParams);
   }, [searchParams]);
+
   return (
     <div className={styles.container}>
       <div className={styles.searchTab}>
diff --git a/src/pages/SecurityServiceOverview/components/RiskWarn/index.tsx b/src/pages/SecurityServiceOverview/components/RiskWarn/index.tsx
index 9064a4e6..727e1e58 100644
--- a/src/pages/SecurityServiceOverview/components/RiskWarn/index.tsx
+++ b/src/pages/SecurityServiceOverview/components/RiskWarn/index.tsx
@@ -24,6 +24,7 @@ const RiskWarn = ({ riskModalOpt }: { riskModalOpt: any }) => {
   const params = {
     page: 1,
     count: 10,
+  
   };
   const [listData, setListData] = useState<any>({
     items: [],
diff --git a/src/pages/TheOperationOfCityOverall/index.tsx b/src/pages/TheOperationOfCityOverall/index.tsx
index 1cecf27e..6aa8262e 100644
--- a/src/pages/TheOperationOfCityOverall/index.tsx
+++ b/src/pages/TheOperationOfCityOverall/index.tsx
@@ -63,7 +63,7 @@ const TheOperationOfCityOverall: React.FC = () => {
           <div>城市运行总体情况</div>
           <Space>
             <span className={styles.updateTime}>
-              {indutryIndexData?.data[0]?.time} 更新
+              {indutryIndexData?.data?.[0]?.time} 更新
             </span>
             <div className={styles.headerText}>城市管理运行日报</div>
             <DoubleRightOutlined className={styles.headerIcon} />
-- 
GitLab