From 45c2ffda81fa5a1005567bfa8d2f9536f49d79aa Mon Sep 17 00:00:00 2001 From: tangshaojian <63377964@qq.com> Date: Fri, 10 Jan 2025 12:42:45 +0800 Subject: [PATCH] =?UTF-8?q?tsj:=20=E5=85=AD=E5=A4=A7=E8=A1=8C=E4=B8=9A-?= =?UTF-8?q?=E9=81=93=E6=A1=A5=E7=9B=91=E7=AE=A1-main=20=E9=9D=99=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E9=81=93=E8=B7=AF=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modals/BridgeManage/context.tsx | 14 +++++++-- .../modals/BridgeManage/index.tsx | 29 +++++++------------ .../components/MunicipalFacilities/index.tsx | 15 +++++++++- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/src/pages/GlobalModalServices/modals/BridgeManage/context.tsx b/src/pages/GlobalModalServices/modals/BridgeManage/context.tsx index 4649bb8d..8db0c2c4 100644 --- a/src/pages/GlobalModalServices/modals/BridgeManage/context.tsx +++ b/src/pages/GlobalModalServices/modals/BridgeManage/context.tsx @@ -12,12 +12,20 @@ interface BridgeManageContextType { const BridgeManageContext = createContext({ viewType: 'bridge', setViewType: () => {}, - isUsingValue: true, + isUsingValue: false, setIsUsingValue: () => {} }); -export const BridgeManageProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => { - const [viewType, setViewType] = useState('bridge'); +interface BridgeManageProviderProps { + children: React.ReactNode; + initialViewType?: ViewType; +} + +export const BridgeManageProvider: React.FC = ({ + children, + initialViewType = 'bridge' +}) => { + const [viewType, setViewType] = useState(initialViewType); const [isUsingValue, setIsUsingValue] = useState(false); return ( diff --git a/src/pages/GlobalModalServices/modals/BridgeManage/index.tsx b/src/pages/GlobalModalServices/modals/BridgeManage/index.tsx index bec463a9..68403e5b 100644 --- a/src/pages/GlobalModalServices/modals/BridgeManage/index.tsx +++ b/src/pages/GlobalModalServices/modals/BridgeManage/index.tsx @@ -1,31 +1,22 @@ -import React, { useState } from 'react'; -import { Flex, Tabs, Switch } from 'antd'; +import React from 'react'; +import { Flex } from 'antd'; import styles from './index.less'; -import BridgeDistribution from './components/BridgeDistribution'; -import BridgeLocation from './components/BridgeLocation'; -import RoadDistribution from './components/RoadDistribution'; -import BridgeTrend from './components/BridgeTrend'; import BridgeTypeDistribution from './components/BridgeTypeDistribution'; import BridgeAreaDistribution from './components/BridgeAreaDistribution'; import BridgeMaintenance from './components/BridgeMaintenance'; +import BridgeTrend from './components/BridgeTrend'; import MapBase from './components/MapBase'; -import { BridgeManageProvider, useBridgeManage } from './context'; +import { BridgeManageProvider } from './context'; +import type { ViewType } from './context'; -const BridgeManage: React.FC = () => { - const { isUsingValue, setIsUsingValue } = useBridgeManage(); +interface BridgeManageProps { + defaultViewType?: ViewType; +} +const BridgeManage: React.FC = ({ defaultViewType = 'bridge' }) => { return ( - +
- {/*
- -
*/} -
diff --git a/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/MunicipalFacilities/index.tsx b/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/MunicipalFacilities/index.tsx index db32df18..7ee14418 100644 --- a/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/MunicipalFacilities/index.tsx +++ b/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/MunicipalFacilities/index.tsx @@ -34,7 +34,19 @@ const MunicipalFacilities: React.FC = () => { const { dispatch } = useGlobalModalServices(); const handleBridgeClick = () => { - dispatch.push('BridgeManage'); + dispatch.push('BridgeManage', { + props: { + defaultViewType: 'bridge' + } + }); + }; + + const handleRoadClick = () => { + dispatch.push('BridgeManage', { + props: { + defaultViewType: 'road' + } + }); }; return ( @@ -98,6 +110,7 @@ const MunicipalFacilities: React.FC = () => { { // dispatch.push('PipelinePassage'); // }} -- GitLab