diff --git a/config/config.ts b/config/config.ts index eecf7b26ee85fbb3dbd92e606e99f274bd41e02f..cfd223922a85218f92c7117c3834eff7892ea0bb 100644 --- a/config/config.ts +++ b/config/config.ts @@ -37,7 +37,6 @@ export default defineConfig({ ? 'https://10.1.174.34:13600/gis/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"', // }, diff --git a/config/routes.ts b/config/routes.ts index 3f90939d171108b3bf47ef6cda9a69ec510f1d54..6926c0413684843ef181df4b1969c3208389f4ef 100644 --- a/config/routes.ts +++ b/config/routes.ts @@ -10,46 +10,46 @@ type RouteType = Array<{ const router: RouteType = [ { path: '/', - redirect: '/home', - }, - { - path: '/home', - component: './Home', - routes: [ - { - path: '/home/industryOperation', - component: './IndustryOperation', - }, - { - path: '/home/urbanSituation', - component: './UrbanSituation', - }, - { - path: '/home/theOperationOfTheDistrictCityAndCounty', - component: './TheOperationOfTheDistrictCityAndCounty', - }, - { - path: '/home/urbanManagementOperationOverallSituation', - component: './TheOperationOfCityOverall', - }, - { - path: '/home/urbanSecuritySituation', - component: './UrbanSecuritySituation', - }, - { - path: '/home/peopleComplain', - component: './PeopleComplain', - }, - { - path: '/home/urbanManagementResourceElements', - component: './UrbanManagementResourceElements', - }, - { - path: '/home/4+4Service', - component: './4+4Service', - }, - ], + redirect: '/overview', }, + // { + // path: '/home', + // component: './Home', + // routes: [ + // { + // path: '/home/industryOperation', + // component: './IndustryOperation', + // }, + // { + // path: '/home/urbanSituation', + // component: './UrbanSituation', + // }, + // { + // path: '/home/theOperationOfTheDistrictCityAndCounty', + // component: './TheOperationOfTheDistrictCityAndCounty', + // }, + // { + // path: '/home/urbanManagementOperationOverallSituation', + // component: './TheOperationOfCityOverall', + // }, + // { + // path: '/home/urbanSecuritySituation', + // component: './UrbanSecuritySituation', + // }, + // { + // path: '/home/peopleComplain', + // component: './PeopleComplain', + // }, + // { + // path: '/home/urbanManagementResourceElements', + // component: './UrbanManagementResourceElements', + // }, + // { + // path: '/home/4+4Service', + // component: './4+4Service', + // }, + // ], + // }, { path: '/overview', component: './OverviewHome', diff --git a/package.json b/package.json index a69829e81cc8938a24c029b1154cfd2f274063df..6b7926b254f75a1080f1d8d50d4060bbdd046de7 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "js-base64": "^3.7.7", "js-cookie": "^3.0.5", "lodash": "^4.17.21", - "react-bmapgl": "^0.2.28", "react-countup": "^6.5.3", "react-infinite-scroll-component": "^6.1.0", "react-infinite-scroller": "^1.2.6" diff --git a/src/components/BMapView/index.tsx b/src/components/BMapView/index.tsx deleted file mode 100644 index b8caf1ea6c819b04ca8f4db7ee58637d360ebe7e..0000000000000000000000000000000000000000 --- a/src/components/BMapView/index.tsx +++ /dev/null @@ -1,23 +0,0 @@ -// 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 {} - -// /** 封装地图 */ -// const MapView = forwardRef>((props, ref) => { -// const { children, ...reset } = props; -// return ( -// -// {children} -// -// ); -// }); - -// export default MapView; diff --git a/src/components/BMapView/mapStyle.json b/src/components/BMapView/mapStyle.json deleted file mode 100644 index ec4143baa5ace1bb323c1fb7dd4df10fca1be9ca..0000000000000000000000000000000000000000 --- a/src/components/BMapView/mapStyle.json +++ /dev/null @@ -1,1323 +0,0 @@ -[ - { - "featureType": "land", - "elementType": "geometry", - "stylers": { - "color": "#1e588bff" - } - }, - { - "featureType": "water", - "elementType": "geometry", - "stylers": { - "color": "#3472c0ff", - "opacity": "3b" - } - }, - { - "featureType": "green", - "elementType": "geometry", - "stylers": { - "color": "#3bff65ff", - "opacity": "21" - } - }, - { - "featureType": "building", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "manmade", - "elementType": "geometry", - "stylers": { - "color": "#414a64ff", - "opacity": "14" - } - }, - { - "featureType": "local", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "subwaystation", - "elementType": "geometry", - "stylers": { - "color": "#113549ff" - } - }, - { - "featureType": "education", - "elementType": "geometry", - "stylers": { - "color": "#2ea1b9ff", - "opacity": "1a" - } - }, - { - "featureType": "road", - "elementType": "geometry.stroke", - "stylers": { - "color": "#1a3158ff", - "opacity": "14" - } - }, - { - "featureType": "railway", - "elementType": "geometry", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "poilabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "poilabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "highway", - "elementType": "geometry.fill", - "stylers": { - "color": "#87b0d4ff", - "opacity": "ed" - } - }, - { - "featureType": "cityhighway", - "elementType": "geometry.fill", - "stylers": { - "color": "#87b0d4ff", - "opacity": "82" - } - }, - { - "featureType": "road", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "districtlabel", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff" - } - }, - { - "featureType": "districtlabel", - "elementType": "labels.text.fill", - "stylers": { - "color": "#a4c2e2ff" - } - }, - { - "featureType": "manmade", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#102031ff", - "opacity": "7a" - } - }, - { - "featureType": "manmade", - "elementType": "labels.text.fill", - "stylers": { - "color": "#8ec1e6ff", - "opacity": "7a" - } - }, - { - "featureType": "shopping", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "road", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff", - "opacity": "ff", - "weight": "2" - } - }, - { - "featureType": "road", - "elementType": "labels.text.fill", - "stylers": { - "color": "#c2d9f1ff", - "opacity": "d9" - } - }, - { - "featureType": "entertainment", - "elementType": "geometry", - "stylers": { - "visibility": "on", - "color": "#ebaff8ff", - "opacity": "14" - } - }, - { - "featureType": "medical", - "elementType": "geometry", - "stylers": { - "color": "#ffa3b6ff", - "opacity": "1a" - } - }, - { - "featureType": "medical", - "elementType": "labels.text.fill", - "stylers": { - "color": "#ffcdcdff", - "opacity": "70" - } - }, - { - "featureType": "education", - "elementType": "labels.text.fill", - "stylers": { - "color": "#7ae8ffff", - "opacity": "70" - } - }, - { - "featureType": "water", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#102031ff" - } - }, - { - "featureType": "water", - "elementType": "labels.text.fill", - "stylers": { - "color": "#dfe8ffff" - } - }, - { - "featureType": "subwaylabel", - "elementType": "labels", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "subwaylabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "highrailway", - "elementType": "geometry", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "local", - "elementType": "labels.icon", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "local", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "arterial", - "elementType": "labels.icon", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "arterial", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "cityhighway", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "provincialway", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "nationalway", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "tertiaryway", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "tertiaryway", - "elementType": "labels.text", - "stylers": { - "fontsize": "30" - } - }, - { - "featureType": "nationalway", - "elementType": "labels.text", - "stylers": { - "fontsize": "30" - } - }, - { - "featureType": "provincialway", - "elementType": "labels.text", - "stylers": { - "fontsize": "30" - } - }, - { - "featureType": "cityhighway", - "elementType": "labels.text", - "stylers": { - "fontsize": "30" - } - }, - { - "featureType": "arterial", - "elementType": "labels.text", - "stylers": { - "fontsize": "30" - } - }, - { - "featureType": "fourlevelway", - "elementType": "labels.text", - "stylers": { - "fontsize": "30" - } - }, - { - "featureType": "road", - "elementType": "labels.text", - "stylers": { - "fontsize": "34" - } - }, - { - "featureType": "highway", - "elementType": "labels.text", - "stylers": { - "fontsize": "30" - } - }, - { - "featureType": "highwaysign", - "elementType": "labels.text.fill", - "stylers": { - "color": "#ffffffff" - } - }, - { - "featureType": "provincialwaysign", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff", - "opacity": "73", - "weight": "1" - } - }, - { - "featureType": "nationalwaysign", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff", - "opacity": "4f" - } - }, - { - "featureType": "nationalwaysign", - "elementType": "labels.text.fill", - "stylers": { - "color": "#fdfbfbff" - } - }, - { - "featureType": "provincialwaysign", - "elementType": "labels.text.fill", - "stylers": { - "color": "#fdfcfcff" - } - }, - { - "featureType": "subwaylabel", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff", - "opacity": "80" - } - }, - { - "featureType": "subwaylabel", - "elementType": "labels.text.fill", - "stylers": { - "color": "#ffffffff" - } - }, - { - "featureType": "tertiarywaysign", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff", - "opacity": "00" - } - }, - { - "featureType": "tertiarywaysign", - "elementType": "labels.text.fill", - "stylers": { - "color": "#112031ff" - } - }, - { - "featureType": "subway", - "elementType": "geometry.fill", - "stylers": { - "color": "#15be6cff", - "opacity": "80" - } - }, - { - "featureType": "transportation", - "elementType": "geometry", - "stylers": { - "visibility": "on", - "opacity": "14" - } - }, - { - "featureType": "nationalway", - "elementType": "geometry.fill", - "stylers": { - "color": "#87b0d4ff", - "opacity": "ff" - } - }, - { - "featureType": "provincialway", - "elementType": "geometry.fill", - "stylers": { - "color": "#87b0d4ff" - } - }, - { - "featureType": "subway", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "subway", - "elementType": "labels", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "highwaysign", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#141616ff", - "opacity": "4f" - } - }, - { - "featureType": "vacationway", - "elementType": "geometry", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "scenicspotsway", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "local", - "elementType": "geometry.fill", - "stylers": { - "color": "#a39999ff", - "opacity": "1c" - } - }, - { - "featureType": "fourlevelway", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "scenicspots", - "elementType": "geometry", - "stylers": { - "color": "#3bff65ff", - "opacity": "0f" - } - }, - { - "featureType": "scenicspots", - "elementType": "labels.text", - "stylers": { - "fontsize": "28" - } - }, - { - "featureType": "scenicspots", - "elementType": "labels.text.fill", - "stylers": { - "color": "#fffeeeff" - } - }, - { - "featureType": "scenicspots", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#14180aff", - "opacity": "4a" - } - }, - { - "featureType": "water", - "elementType": "labels.text", - "stylers": { - "fontsize": "26" - } - }, - { - "featureType": "manmade", - "elementType": "labels.text", - "stylers": { - "fontsize": "26" - } - }, - { - "featureType": "education", - "elementType": "labels.text", - "stylers": { - "fontsize": "26" - } - }, - { - "featureType": "HDLLCX", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "HDLLDX", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "HDLLSS", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "trafficlight", - "elementType": "labels.icon", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "HDLLSX", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "HDLLZSYX", - "elementType": "geometry", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "HDLLZXYS", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "HDLLDS", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "HDLLDD", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "roadarrow", - "elementType": "labels.icon", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "HDLLDS", - "elementType": "geometry.fill", - "stylers": { - "color": "#722c2cff", - "opacity": "0f" - } - }, - { - "featureType": "HDTEXTBUS", - "elementType": "labels.text.fill", - "stylers": { - "color": "#f3efa9ff" - } - }, - { - "featureType": "footbridge", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "highwaysign", - "elementType": "labels", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "highwaysign", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "nationalwaysign", - "elementType": "labels", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "nationalwaysign", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "provincialwaysign", - "elementType": "labels", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "provincialwaysign", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "tertiarywaysign", - "elementType": "labels", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "tertiarywaysign", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "local", - "stylers": { - "level": "18", - "curZoomRegionId": "0", - "curZoomRegion": "18-21" - } - }, - { - "featureType": "local", - "stylers": { - "level": "19", - "curZoomRegionId": "0", - "curZoomRegion": "18-21" - } - }, - { - "featureType": "local", - "stylers": { - "level": "20", - "curZoomRegionId": "0", - "curZoomRegion": "18-21" - } - }, - { - "featureType": "local", - "stylers": { - "level": "21", - "curZoomRegionId": "0", - "curZoomRegion": "18-21" - } - }, - { - "featureType": "local", - "stylers": { - "level": "16", - "curZoomRegionId": "1", - "curZoomRegion": "16-17" - } - }, - { - "featureType": "local", - "stylers": { - "level": "17", - "curZoomRegionId": "1", - "curZoomRegion": "16-17" - } - }, - { - "featureType": "local", - "elementType": "geometry", - "stylers": { - "visibility": "off", - "level": "16", - "curZoomRegionId": "1", - "curZoomRegion": "16-17" - } - }, - { - "featureType": "local", - "elementType": "geometry", - "stylers": { - "visibility": "off", - "level": "17", - "curZoomRegionId": "1", - "curZoomRegion": "16-17" - } - }, - { - "featureType": "local", - "elementType": "labels", - "stylers": { - "visibility": "off", - "level": "16", - "curZoomRegionId": "1", - "curZoomRegion": "16-17" - } - }, - { - "featureType": "local", - "elementType": "labels", - "stylers": { - "visibility": "off", - "level": "17", - "curZoomRegionId": "1", - "curZoomRegion": "16-17" - } - }, - { - "featureType": "local", - "elementType": "labels.icon", - "stylers": { - "visibility": "off", - "level": "16", - "curZoomRegionId": "1", - "curZoomRegion": "16-17" - } - }, - { - "featureType": "local", - "elementType": "labels.icon", - "stylers": { - "visibility": "off", - "level": "17", - "curZoomRegionId": "1", - "curZoomRegion": "16-17" - } - }, - { - "featureType": "local", - "elementType": "geometry.stroke", - "stylers": { - "opacity": "7a" - } - }, - { - "featureType": "subway", - "elementType": "geometry", - "stylers": { - "visibility": "off", - "weight": "6" - } - }, - { - "featureType": "road", - "elementType": "geometry.fill", - "stylers": { - "color": "#708fb6ff" - } - }, - { - "featureType": "education", - "elementType": "labels.text.stroke", - "stylers": { - "opacity": "75" - } - }, - { - "featureType": "medical", - "elementType": "labels.text.stroke", - "stylers": { - "opacity": "70" - } - }, - { - "featureType": "entertainmentlabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "estatelabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "businesstowerlabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "businesstowerlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "companylabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "restaurantlabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "restaurantlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "hotellabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "hotellabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "shoppinglabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "shoppinglabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "lifeservicelabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "lifeservicelabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "carservicelabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "carservicelabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "transportationlabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "transportationlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "trainstationlabel", - "elementType": "labels", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "trainstationlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "parklotinlabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "parklotinlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "parklotoutlabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "parklotoutlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "parklotlabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "parklotlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "subwaypoilabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "subwaypoilabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "transportationother", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "transportationother", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "financelabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "financelabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "INTERNATIONALIZEICONICON", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "INTERNATIONALIZEICONICON", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "airportlabel", - "elementType": "labels.text", - "stylers": { - "fontsize": "26" - } - }, - { - "featureType": "airportlabel", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff", - "opacity": "4f" - } - }, - { - "featureType": "airportlabel", - "elementType": "labels.text.fill", - "stylers": { - "color": "#f6f4f4ff" - } - }, - { - "featureType": "scenicspotslabel", - "elementType": "labels.text", - "stylers": { - "fontsize": "24" - } - }, - { - "featureType": "scenicspotslabel", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff", - "opacity": "5c" - } - }, - { - "featureType": "scenicspotslabel", - "elementType": "labels.text.fill", - "stylers": { - "color": "#fcfafaff", - "opacity": "7a" - } - }, - { - "featureType": "educationlabel", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff", - "opacity": "7a" - } - }, - { - "featureType": "educationlabel", - "elementType": "labels.text.fill", - "stylers": { - "color": "#fcfafaff", - "opacity": "7a" - } - }, - { - "featureType": "medicallabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "estatelabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "companylabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "governmentlabel", - "elementType": "labels.text.fill", - "stylers": { - "color": "#ffffffff", - "opacity": "73" - } - }, - { - "featureType": "governmentlabel", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff", - "opacity": "69" - } - }, - { - "featureType": "trainstationlabel", - "elementType": "labels.text.fill", - "stylers": { - "color": "#f8f1f1ff", - "opacity": "70" - } - }, - { - "featureType": "trainstationlabel", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff", - "opacity": "75" - } - }, - { - "featureType": "busstationlabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "busstationlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "medicallabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "poilabel", - "elementType": "labels.text.fill", - "stylers": { - "color": "#f8f7f7ff", - "opacity": "75" - } - }, - { - "featureType": "poilabel", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff", - "opacity": "6e" - } - }, - { - "featureType": "subwaypoilabel", - "elementType": "labels.text.fill", - "stylers": { - "color": "#ffffffff", - "opacity": "c9" - } - }, - { - "featureType": "subwaypoilabel", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#112031ff", - "opacity": "85" - } - }, - { - "featureType": "building", - "elementType": "geometry.topfill", - "stylers": { - "color": "#3a4658ff" - } - }, - { - "featureType": "building", - "elementType": "geometry.sidefill", - "stylers": { - "color": "#1c2431ff" - } - }, - { - "featureType": "highway", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "tertiaryway", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "entertainmentlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "educationlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "educationlabel", - "elementType": "labels", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "transportationother", - "elementType": "labels.text", - "stylers": { - "fontsize": "26" - } - }, - { - "featureType": "road", - "elementType": "geometry", - "stylers": { - "visibility": "on" - } - }, - { - "featureType": "scenicspotslabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "airportlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "governmentlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - } -] diff --git a/src/components/CooglMap b/src/components/CooglMap index a26f6005dde2d93231f1e4b1503694f53d1b2db0..46b1907102baf019b2fe553586698c787eb84976 160000 --- a/src/components/CooglMap +++ b/src/components/CooglMap @@ -1 +1 @@ -Subproject commit a26f6005dde2d93231f1e4b1503694f53d1b2db0 +Subproject commit 46b1907102baf019b2fe553586698c787eb84976 diff --git a/src/components/HncyModal/index.less b/src/components/HncyModal/index.less index 5796584f9f467d852f95a9135a537ed62cdb9766..eb9bf66d04e33e2f2d10df5382446c093368930b 100644 --- a/src/components/HncyModal/index.less +++ b/src/components/HncyModal/index.less @@ -1,26 +1,44 @@ .modalWrap { + position: relative; + // inset: 0; +} + +.otherContent { + position: relative; + z-index: 1; border-radius: 30px; + padding: 20px 30px; +} + +.blurBg { + position: absolute; + -webkit-backdrop-filter: blur(10px); backdrop-filter: blur(10px); - background: rgba(22, 85, 135, 0.6); - padding: 20px 30px; + inset: 0; border: 2px solid rgba(67, 131, 182, 0.7); - box-shadow: inset 0px 0px 20px rgba(0, 141, 255, 0.5), 0px 0px 20px rgba(0, 141, 255, 0.5),; + box-shadow: inset 0px 0px 20px rgba(0, 141, 255, 0.5), + 0px 0px 20px rgba(0, 141, 255, 0.5); + border-radius: 30px; + background: rgba(22, 85, 135, 0.6); + z-index: 0; } .head { width: 100%; height: 74px; border-radius: 15px; - background: linear-gradient(90deg, - rgba(119, 250, 255, 0.34), - rgba(76, 154, 228, 0.34) 30%, - transparent 50%, - transparent 100%); + background: linear-gradient( + 90deg, + rgba(119, 250, 255, 0.34), + rgba(76, 154, 228, 0.34) 30%, + transparent 50%, + transparent 100% + ); display: flex; align-items: center; padding-left: 30px; - >p { + > p { background: linear-gradient(180deg, rgb(255, 255, 255), rgb(181, 229, 255)); -webkit-background-clip: text; -webkit-text-fill-color: transparent; @@ -46,9 +64,11 @@ .ant-modal-close { border-radius: 32px; - background: linear-gradient(136.24deg, - rgba(128, 154, 255, 0.36) 14.51%, - rgba(45, 168, 255, 0.36) 84.656%); + background: linear-gradient( + 136.24deg, + rgba(128, 154, 255, 0.36) 14.51%, + rgba(45, 168, 255, 0.36) 84.656% + ); color: rgb(199, 243, 255); top: 37px; right: 30px; @@ -60,7 +80,7 @@ } } - .ant-modal { + .ant-modal { max-width: unset !important; } } @@ -68,4 +88,4 @@ .mask { background-color: rgba(0, 11, 25, 0.7) !important; -} \ No newline at end of file +} diff --git a/src/components/HncyModal/index.tsx b/src/components/HncyModal/index.tsx index 8a148c73a3ab51670b948d18d0d0a728db53e63f..f6372235d28c10532c0cd45b9249371b4a94a905 100644 --- a/src/components/HncyModal/index.tsx +++ b/src/components/HncyModal/index.tsx @@ -9,7 +9,7 @@ interface HncyModalProps extends ModalProps { bgColor?: React.CSSProperties; bodyStyle?: React.CSSProperties; titleRender?: () => JSX.Element; - showHeader?:boolean + showHeader?: boolean; } const HncyModal = (props: HncyModalProps) => { const { @@ -22,7 +22,8 @@ const HncyModal = (props: HncyModalProps) => { padding, titleRender, bodyStyle, - showHeader=true, + showHeader = true, + ...reset } = props; return ( @@ -42,16 +43,21 @@ const HncyModal = (props: HncyModalProps) => { className={styles.modalWrap} style={{ height, minHeight, padding, ...bodyStyle }} > - { showHeader&&
- {titleRender ? titleRender() : title &&

{title}

} -
} -
- {children} +
+
+ {showHeader && ( +
+ {titleRender ? titleRender() : title &&

{title}

} +
+ )} +
+ {children} +
diff --git a/src/layouts/Header/index.tsx b/src/layouts/Header/index.tsx index 268ef2cbbd99903313b9609791ce74f447241034..6f77d6f3ee869b39e9d7889406a3d68c702bb59d 100644 --- a/src/layouts/Header/index.tsx +++ b/src/layouts/Header/index.tsx @@ -1,4 +1,3 @@ -import ModeSwitch from '@/components/ModeSwitch'; import { useLocation, useNavigate } from '@umijs/max'; import { Flex, Popover, Space } from 'antd'; import classNames from 'classnames'; @@ -11,10 +10,10 @@ const Header = memo(() => { const location = useLocation(); const isOverviewMode = location.pathname === '/overview'; - const handleModeChange = (checked: boolean) => { - // true 为统览模式, false 为专题模式 - navigate(checked ? '/overview' : '/home/urbanSituation'); - }; + // const handleModeChange = (checked: boolean) => { + // // true 为统览模式, false 为专题模式 + // navigate(checked ? '/overview' : '/home/urbanSituation'); + // }; const handleJump = () => { const url = 'https://10.1.174.34:13000'; @@ -226,7 +225,7 @@ const Header = memo(() => {
- + {/* */}
{ + return ( + + ); +}; + +export default Overview; diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/PipeCorridorSensesTheSituation/index.less b/src/pages/GlobalModalServices/modals/PipelinePassage/PipeCorridorSensesTheSituation/index.less new file mode 100644 index 0000000000000000000000000000000000000000..485140808b9438d70cc409d91ba4a8d0fe090cde --- /dev/null +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/PipeCorridorSensesTheSituation/index.less @@ -0,0 +1,2 @@ +.container { +} diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/PipeCorridorSensesTheSituation/index.tsx b/src/pages/GlobalModalServices/modals/PipelinePassage/PipeCorridorSensesTheSituation/index.tsx new file mode 100644 index 0000000000000000000000000000000000000000..39a7bec72e70c7af53139a5338d8e71f7db5d3af --- /dev/null +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/PipeCorridorSensesTheSituation/index.tsx @@ -0,0 +1,9 @@ +import React from 'react'; +import BaseCard from '../components/BaseCard'; + +/** @name 管廊感知态势 */ +const PipeCorridorSensesTheSituation: React.FC = () => { + return ; +}; + +export default PipeCorridorSensesTheSituation; diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/PipeGalleryMaintenanceStatus/index.less b/src/pages/GlobalModalServices/modals/PipelinePassage/PipeGalleryMaintenanceStatus/index.less new file mode 100644 index 0000000000000000000000000000000000000000..485140808b9438d70cc409d91ba4a8d0fe090cde --- /dev/null +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/PipeGalleryMaintenanceStatus/index.less @@ -0,0 +1,2 @@ +.container { +} diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/PipeGalleryMaintenanceStatus/index.tsx b/src/pages/GlobalModalServices/modals/PipelinePassage/PipeGalleryMaintenanceStatus/index.tsx new file mode 100644 index 0000000000000000000000000000000000000000..88af4a13bddd842945ba09a9af97b0275ef7d4be --- /dev/null +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/PipeGalleryMaintenanceStatus/index.tsx @@ -0,0 +1,16 @@ +import React from 'react'; +import BaseCard from '../components/BaseCard'; + +/** @name 管廊维护情况 */ +const PipeGalleryMaintenanceStatus: React.FC = () => { + return ( + 2024年11月 21日 -2024年12月20日
} + title="管廊维护情况" + > + ); +}; + +export default PipeGalleryMaintenanceStatus; diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/PipeMap/index.less b/src/pages/GlobalModalServices/modals/PipelinePassage/PipeMap/index.less new file mode 100644 index 0000000000000000000000000000000000000000..a8e2242b1055229d583ffa1aa81c1094e8ca8dcc --- /dev/null +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/PipeMap/index.less @@ -0,0 +1,3 @@ +.container { + flex: 1; +} diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/PipeMap/index.tsx b/src/pages/GlobalModalServices/modals/PipelinePassage/PipeMap/index.tsx new file mode 100644 index 0000000000000000000000000000000000000000..f2522928efd3e8b8701bb969cb2713c0b87284a2 --- /dev/null +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/PipeMap/index.tsx @@ -0,0 +1,16 @@ +import CooglMap from '@/components/CooglMap'; +import React from 'react'; +import styles from './index.less'; + +const Map: React.FC = () => { + return ( +
+ +
+ ); +}; + +export default Map; diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/PipelineSituation/index.less b/src/pages/GlobalModalServices/modals/PipelinePassage/PipelineSituation/index.less new file mode 100644 index 0000000000000000000000000000000000000000..485140808b9438d70cc409d91ba4a8d0fe090cde --- /dev/null +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/PipelineSituation/index.less @@ -0,0 +1,2 @@ +.container { +} diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/PipelineSituation/index.tsx b/src/pages/GlobalModalServices/modals/PipelinePassage/PipelineSituation/index.tsx new file mode 100644 index 0000000000000000000000000000000000000000..766cc6a61ebee9f856ff05f3b6f6257ab5358c2d --- /dev/null +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/PipelineSituation/index.tsx @@ -0,0 +1,15 @@ +import React from 'react'; +import BaseCard from '../components/BaseCard'; + +/** @name 情况 */ +const PipelineSituation: React.FC = () => { + return ( + + ); +}; + +export default PipelineSituation; diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/components/BaseCard/index.less b/src/pages/GlobalModalServices/modals/PipelinePassage/components/BaseCard/index.less new file mode 100644 index 0000000000000000000000000000000000000000..cbf4150616276f40b43856023d70094068d69926 --- /dev/null +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/components/BaseCard/index.less @@ -0,0 +1,12 @@ +.title { + color: rgb(203, 237, 255); + font-family: DingTalk JinBuTi; + font-size: 22px; + font-weight: 400; +} + +.container { + border-radius: 20px; + background: rgba(57, 122, 183, 0.2); + padding: 20px; +} diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/components/BaseCard/index.tsx b/src/pages/GlobalModalServices/modals/PipelinePassage/components/BaseCard/index.tsx new file mode 100644 index 0000000000000000000000000000000000000000..c57e07579446b990630e75b03ab28757963b331b --- /dev/null +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/components/BaseCard/index.tsx @@ -0,0 +1,26 @@ +import { Flex } from 'antd'; +import React, { PropsWithChildren } from 'react'; +import styles from './index.less'; + +interface PropsType { + w?: any; + h?: any; + title?: string; + headerRight?: React.ReactNode; +} + +/** @name 基础卡片 */ +const BaseCard: React.FC> = (props) => { + const { w, h, title, children, headerRight } = props; + return ( +
+ + {title} + {headerRight} + + {children} +
+ ); +}; + +export default BaseCard; diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/index.less b/src/pages/GlobalModalServices/modals/PipelinePassage/index.less new file mode 100644 index 0000000000000000000000000000000000000000..a8e2242b1055229d583ffa1aa81c1094e8ca8dcc --- /dev/null +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/index.less @@ -0,0 +1,3 @@ +.container { + flex: 1; +} diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/index.tsx b/src/pages/GlobalModalServices/modals/PipelinePassage/index.tsx new file mode 100644 index 0000000000000000000000000000000000000000..90a3bf492ce6cafb331ed88c318e99f9dc73ec07 --- /dev/null +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/index.tsx @@ -0,0 +1,27 @@ +import { Flex } from 'antd'; +import React from 'react'; +import styles from './index.less'; +import Overview from './Overview'; +import PipeCorridorSensesTheSituation from './PipeCorridorSensesTheSituation'; +import PipeGalleryMaintenanceStatus from './PipeGalleryMaintenanceStatus'; +import PipelineSituation from './PipelineSituation'; +import PipeMap from './PipeMap'; + +/** @name 管廊 */ +const PipelinePassage: React.FC = () => { + return ( + + + + + + + + + + + + ); +}; + +export default PipelinePassage; diff --git a/src/pages/GlobalModalServices/registry.tsx b/src/pages/GlobalModalServices/registry.tsx index 0b76fa27124b082e7adb7dc7fa54a34f1026bcb5..2515e333c1371c7a5888dcaea7bb68ba6d96b3e5 100644 --- a/src/pages/GlobalModalServices/registry.tsx +++ b/src/pages/GlobalModalServices/registry.tsx @@ -23,6 +23,7 @@ import IndustrySystem from './modals/IndustrySystem'; import KeyArea from './modals/KeyArea'; import KeyAreaDetail from './modals/KeyAreaDetail'; import OtherEvent from './modals/OtherEvent'; +import PipelinePassage from './modals/PipelinePassage'; import SanitationDisp from './modals/SanitationDisp'; import SanitationEvent from './modals/SanitationEvent'; import SanitationResource from './modals/SanitationResource'; @@ -384,6 +385,20 @@ export default class Registry { defaultProps: {}, modal: SanitationResource, }, + /** + * 管廊柱特弹窗 + * @module IndustryOperationNew + * @see IndustryOperationNew.MunicipalFacilities + */ + PipelinePassage: { + defaultConfig: { + w: 3268, + h: 858, + title: '综合管廊', + }, + defaultProps: {}, + modal: PipelinePassage, + }, }; static get(modalKey: ModalKey) { diff --git a/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/LawEnforcement/index.tsx b/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/LawEnforcement/index.tsx index b32bc9b85f3528fa6a4e1a30651e19221c77835d..c6195c6f217d7fa7392504523485687dace76b05 100644 --- a/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/LawEnforcement/index.tsx +++ b/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/LawEnforcement/index.tsx @@ -46,9 +46,9 @@ const LawEnforcement: React.FC = () => {
{ - dispatch.push('AdministPunish',); + dispatch.push('AdministPunish'); }} > {
- {/*
- { - dispatch.push('AreaSynergy', { - headerLeft: () => { - return {}} />; - }, - // props: { - // data: selected, - // indexs: indexs, - // }, - }); - }} - > -
487
-
件
-
701.32
-
万元
- -
11月行政处罚信息公示
-
*/}
{ dispatch.push('DyaPatrol',); @@ -102,9 +80,9 @@ const LawEnforcement: React.FC = () => { />
{ - dispatch.push('AreaSynergy', ); + dispatch.push('AreaSynergy'); // dispatch.push('EquipResource') }} > diff --git a/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/MunicipalFacilities/index.tsx b/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/MunicipalFacilities/index.tsx index 72e24bec7dcac7ef01af683811fdd08c499baff4..e70914022eb4d9056b9312065f500b2f4cf5e14f 100644 --- a/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/MunicipalFacilities/index.tsx +++ b/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/MunicipalFacilities/index.tsx @@ -1,42 +1,44 @@ import DescriptionItem from '@/components/DescriptionItem'; +import { useGlobalModalServices } from '@/pages/GlobalModalServices/provider'; import { Flex, Space } from 'antd'; import React from 'react'; -import styles from './index.less'; import CountUp from 'react-countup'; import LineCharts from '../LineCharts'; +import styles from './index.less'; -const MunicipalFacilities: React.FC = () => { - const commonValueStyle = { - background: 'linear-gradient(180deg, #AAFFF6 0%, #25BBFF 100%)', - WebkitBackgroundClip: 'text', - WebkitTextFillColor: 'transparent', - fontFamily: 'D-DIN', - fontSize: '36px', - fontWeight: 700, - lineHeight: 1.1, - }; - - const commonLabelStyle = { - color: '#BCCEE9', - // fontFamily: '微软雅黑', - fontSize: '20px', - fontWeight: 400, - lineHeight: 1.1, - }; +const commonValueStyle = { + background: 'linear-gradient(180deg, #AAFFF6 0%, #25BBFF 100%)', + WebkitBackgroundClip: 'text', + WebkitTextFillColor: 'transparent', + fontFamily: 'D-DIN', + fontSize: '36px', + fontWeight: 700, + lineHeight: 1.1, +}; - const commonUnitStyle = { - color: '#BCCEE9', - // fontFamily: '微软雅黑', - fontSize: '20px', - fontWeight: 400, - lineHeight: 1.1, - }; +const commonLabelStyle = { + color: '#BCCEE9', + fontSize: '20px', + fontWeight: 400, + lineHeight: 1.1, +}; +const commonUnitStyle = { + color: '#BCCEE9', + // fontFamily: '微软雅黑', + fontSize: '20px', + fontWeight: 400, + lineHeight: 1.1, +}; +const MunicipalFacilities: React.FC = () => { + const { dispatch } = useGlobalModalServices(); return (
- 近七日发现道桥病害 + + 近七日发现道桥病害 + {
- + { unitStyle={commonUnitStyle} decimals={0} /> + + { + dispatch.push('PipelinePassage'); + }} + unit="条" + valueStyle={commonValueStyle} + labelStyle={commonLabelStyle} + unitStyle={commonUnitStyle} + decimals={0} + />