diff --git a/src/pages/SecurityServiceOverview/SafetyMap/index.tsx b/src/pages/SecurityServiceOverview/SafetyMap/index.tsx index d0174d0846db6847ba8804b173109418595c128d..961be3e0269b7f855b29925981577b1c882f4ebb 100644 --- a/src/pages/SecurityServiceOverview/SafetyMap/index.tsx +++ b/src/pages/SecurityServiceOverview/SafetyMap/index.tsx @@ -210,6 +210,8 @@ const SafetyMap = () => { return {}; } }; + + return (
@@ -222,6 +224,8 @@ const SafetyMap = () => { {facility?.data?.records?.map((item: any, index: number) => { const point = [Number(item?.longitude), Number(item?.latitude)]; + + return ( { - console.log(data, '44'); - const MapRef = useRef(); - // const [searchParams, setSearchParams] = useState({ - // parentTypeCode: 'dlql', - // lat: 30.680193, - // lon: 104.075555, - // distance: 1000, - // page: 1, - // count: 100, - // }); - // // 事件详情弹窗 - // const [detailModalOpt, setDetailModalOpt] = useState({ - // open: false, - // title: '', - // eventId: '', - // }); - // const [wayModalOpt, setWayModalOpt] = useState<{ - // open: boolean; - // title: string; - // }>({ - // open: false, - // title: '道路桥梁情况', - // }); - useEffect(()=>{ - if(data){ + useEffect(() => { + if (data) { MapRef?.current?.flyTo({ destination: { x: Number(data?.longitude), y: Number(data?.latitude), z: 239, }, - + // orientation: { // heading: 6.283185307179586, // pitch: -1.568627330287271, @@ -46,40 +23,38 @@ const DetMap = ({ data }: { data: any }) => { // }, }); } - - },[data]) - + }, [data]); + if (!data) { + return; + } return (
- - - <> - { - // setDetailModalOpt({ - // open: true, - // eventId: item?.riskId, - // ...item, - // }); - }} - > - - - - - - + + <> + { + // setDetailModalOpt({ + // open: true, + // eventId: item?.riskId, + // ...item, + // }); + }} + > + + + +
); }; diff --git a/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx b/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx index cf8458a2712221a1eaf8e1860db4c30ab80b673f..974a00be35eda926523ba0060d9fea4d27826b17 100644 --- a/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx +++ b/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx @@ -139,7 +139,10 @@ const BaseInfo: React.FC<{ */}
+ + +
({