diff --git a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/IndustryWiget/index.tsx index 92509c2448d91195a83802e8a27b049d288bae97..42c8f4742ad82f0ac0c6a51d5f3980fc36f2b44c 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 dbd81df3708f8dcd48b9895c61d406598df4d628..edb5c2fc583d0e39bd51ce9b3e34dcdc86bed518 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 2dc2515d38434573e3c5b050a0a36e1c88813fa1..111306219cde9055f3b965905189669161af7146 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 }) => { { - const [warnLevel, setWarnLevel] = useState(2); return ( {/* 左侧 */}
- - - + + +
{/* 地图 */}
diff --git a/src/pages/SecurityServiceOverview/components/RiskWarn/TopSearch/index.tsx b/src/pages/SecurityServiceOverview/components/RiskWarn/TopSearch/index.tsx index 5cf2f481a13203c66674c1d40b8bece3da461e15..79e370996add66d3e774e924839cc7ed2c25b9bb 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 (
diff --git a/src/pages/SecurityServiceOverview/components/RiskWarn/index.tsx b/src/pages/SecurityServiceOverview/components/RiskWarn/index.tsx index 9064a4e6963ffed943d63e123c0c04078854f5ae..727e1e58da901a782144d015be70688299b46514 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({ items: [], diff --git a/src/pages/TheOperationOfCityOverall/index.tsx b/src/pages/TheOperationOfCityOverall/index.tsx index 1cecf27e176d483dc66bf282c91fb74a17492dc9..6aa8262eadc735d7a43fe173885ceb68f52f6012 100644 --- a/src/pages/TheOperationOfCityOverall/index.tsx +++ b/src/pages/TheOperationOfCityOverall/index.tsx @@ -63,7 +63,7 @@ const TheOperationOfCityOverall: React.FC = () => {
城市运行总体情况
- {indutryIndexData?.data[0]?.time} 更新 + {indutryIndexData?.data?.[0]?.time} 更新
城市管理运行日报