diff --git a/config/config.ts b/config/config.ts index 4997af405f5cccd15c54f0985167341f3b8f5b0a..c2f8a6ed28a70ad95b607051dd0ed55795251dd8 100644 --- a/config/config.ts +++ b/config/config.ts @@ -37,9 +37,9 @@ export default defineConfig({ ? 'http://10.1.214.174:8090/example/CooGL/CooGL.js' : 'http://123.157.223.158:30010/CooGL/version/v1.4/CooGL.js', }, - { - src: '//api.map.baidu.com/api?type=webgl&v=1.0&ak=U5XoaKW8QCNaROPQ96oh5a7NlVP9N4hW"', - }, + // { + // src: '//api.map.baidu.com/api?type=webgl&v=1.0&ak=U5XoaKW8QCNaROPQ96oh5a7NlVP9N4hW"', + // }, ], base: '/cd-comprehensive/', publicPath: '/cd-comprehensive/', diff --git a/src/components/BMapView/index.tsx b/src/components/BMapView/index.tsx index 4be926bd58b431da00c9b53166da39411e763c80..b8caf1ea6c819b04ca8f4db7ee58637d360ebe7e 100644 --- a/src/components/BMapView/index.tsx +++ b/src/components/BMapView/index.tsx @@ -1,23 +1,23 @@ -import { forwardRef, PropsWithChildren } from 'react'; -import { Map } from 'react-bmapgl'; -import type { MapProps } from 'react-bmapgl/dist/Map/Map'; -import mapStyle from './mapStyle.json'; +// import { forwardRef, PropsWithChildren } from 'react'; +// import { Map } from 'react-bmapgl'; +// import type { MapProps } from 'react-bmapgl/dist/Map/Map'; +// import mapStyle from './mapStyle.json'; -interface PropsType extends MapProps {} +// interface PropsType extends MapProps {} -/** 封装地图 */ -const MapView = forwardRef>((props, ref) => { - const { children, ...reset } = props; - return ( - - {children} - - ); -}); +// /** 封装地图 */ +// const MapView = forwardRef>((props, ref) => { +// const { children, ...reset } = props; +// return ( +// +// {children} +// +// ); +// }); -export default MapView; +// export default MapView; diff --git a/src/pages/GlobalModalServices/modals/DistrictIndex/StreetMap/index.tsx b/src/pages/GlobalModalServices/modals/DistrictIndex/StreetMap/index.tsx index be79867e2fd66a2c2c3191d43cbd4f0b8919dd7c..fc393c800223ffb78d028c2f6a59718abd7b00fb 100644 --- a/src/pages/GlobalModalServices/modals/DistrictIndex/StreetMap/index.tsx +++ b/src/pages/GlobalModalServices/modals/DistrictIndex/StreetMap/index.tsx @@ -16,7 +16,7 @@ import React, { useRef, useState, } from 'react'; -import { CustomOverlay, Polygon, Polyline } from 'react-bmapgl'; +// import { CustomOverlay, Polygon, Polyline } from 'react-bmapgl'; import PopoverCard from '../PopoverCard'; import styles from './index.less'; diff --git a/src/pages/TheOperationOfTheDistrictCityAndCounty/components/Map/index.tsx b/src/pages/TheOperationOfTheDistrictCityAndCounty/components/Map/index.tsx index 688d65d2c731b6c6cb753d1e2c6cf0008f6f14ff..0120dad28f3b625fb0c125189ef8f531339e5f80 100644 --- a/src/pages/TheOperationOfTheDistrictCityAndCounty/components/Map/index.tsx +++ b/src/pages/TheOperationOfTheDistrictCityAndCounty/components/Map/index.tsx @@ -1,11 +1,10 @@ -import BMapView from '@/components/BMapView'; +// import BMapView from '@/components/BMapView'; import CooglMap from '@/components/CooglMap'; import BMapService from '@/utils/mapService'; import { getColorByIndex } from '@/utils/ui'; import { useModel } from '@umijs/max'; import { Space, Switch } from 'antd'; import React, { CSSProperties, Fragment, useRef, useState } from 'react'; -import { CustomOverlay, Polygon } from 'react-bmapgl'; import DistrictDetailBar from '../DIstrictDetailBar'; import styles from './index.less'; @@ -37,7 +36,7 @@ const DistrictMap: React.FC = () => { return (
- {isBmap ? ( + {/* {isBmap ? ( { )} - ) : ( - - {!selectDistrict ? ( - - {areaListDto.map((item, index) => { - return ( - - ); - })} - {areaListDto.map((item, index) => { - const point = [Number(item.centerX), Number(item.centerY)]; + ) : ( */} + + {!selectDistrict ? ( + + {areaListDto.map((item, index) => { + return ( + + ); + })} + {areaListDto.map((item, index) => { + const point = [Number(item.centerX), Number(item.centerY)]; - return ( - -
- {Number(item.qualitySign)} -
-
- ); - })} -
- ) : ( - <> - +
+ {Number(item.qualitySign)} +
+ + ); + })} +
+ ) : ( + <> + + +
- -
- {Number(selectDistrict?.qualitySign)} -
-
- - )} - - )} + {Number(selectDistrict?.qualitySign)} +
+
+ + )} +
+ {/* )} */} {selectDistrict && (
{selectDistrict.objectName}