From 91c4aca658ec32ffdc54e1c66db195717ffeff25 Mon Sep 17 00:00:00 2001 From: yms Date: Mon, 6 Jan 2025 18:52:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CooglMap | 2 +- .../modals/PipelinePassage/Overview/index.tsx | 22 ++++- .../MapCantainer/DistrictMap/index.tsx | 6 +- src/services/Physicalsign.ts | 83 ++++++++++--------- 4 files changed, 68 insertions(+), 45 deletions(-) diff --git a/src/components/CooglMap b/src/components/CooglMap index 46b19071..1f347f13 160000 --- a/src/components/CooglMap +++ b/src/components/CooglMap @@ -1 +1 @@ -Subproject commit 46b1907102baf019b2fe553586698c787eb84976 +Subproject commit 1f347f13165874d78c5ba358c071cfcfb792570a diff --git a/src/pages/GlobalModalServices/modals/PipelinePassage/Overview/index.tsx b/src/pages/GlobalModalServices/modals/PipelinePassage/Overview/index.tsx index 14b31175..0b58abf4 100644 --- a/src/pages/GlobalModalServices/modals/PipelinePassage/Overview/index.tsx +++ b/src/pages/GlobalModalServices/modals/PipelinePassage/Overview/index.tsx @@ -1,8 +1,28 @@ -import React from 'react'; +import React, { useMemo } from 'react'; import BaseCard from '../components/BaseCard'; /** @name 全市已移交纳入管理综合管廊概况 */ const Overview: React.FC = () => { + const INFO = useMemo(() => { + return [ + { + name: '管廊条数', + value: 82, + unit: '条', + }, + { + name: '管廊长度', + value: 42, + unit: '公里', + }, + { + name: '舱室总长度', + value: 40, + unit: '公里', + }, + ]; + }, []); + return ( ); diff --git a/src/pages/SecurityServiceOverview/components/MapCantainer/DistrictMap/index.tsx b/src/pages/SecurityServiceOverview/components/MapCantainer/DistrictMap/index.tsx index 540be017..a5df37c6 100644 --- a/src/pages/SecurityServiceOverview/components/MapCantainer/DistrictMap/index.tsx +++ b/src/pages/SecurityServiceOverview/components/MapCantainer/DistrictMap/index.tsx @@ -105,9 +105,10 @@ const DistrictMap: React.FC = () => { const [eventData, setEventData] = useState([]); useEffect(() => { - services.Physicalsign.getObjectPolygon({ + services.Physicalsign.getObjectPolygon2({ physicalSignType: 1, objectHierarchy: 1, + // objectId: 510107, }).then((res) => { setData(res.data); }); @@ -116,7 +117,6 @@ const DistrictMap: React.FC = () => { services.CityProblemApi.getUpToDateEvent({ page: 1, count: 10, - // protrudeFlag: '1', }).then((res: any) => { console.log('getUpToDateEvent', res); if (res.code === 200) { @@ -205,7 +205,7 @@ const DistrictMap: React.FC = () => { <> {/**区域 */} {data?.map((item, index) => { - return item?.multiPoints?.map((it, idx) => { + return JSON.parse(item?.multiPointStr)?.map((it, idx) => { return ( > { + return request(urlProxyApis(`/middlePhysicalSign/getObjectPolygon2`), { + params: params, + }); +} + //中观体征县区体征数据 export async function getGroupObjectPhysicalSignIndex( - params: any + params: any, ): Promise> { return request( - urlProxyApis( - `/middlePhysicalSign/getGroupObjectPhysicalSignIndex`, - ), + urlProxyApis(`/middlePhysicalSign/getGroupObjectPhysicalSignIndex`), { params, }, @@ -224,9 +231,11 @@ export async function getDepartIndustryPhysicalSignIndex( /** * @description 城市问题 */ -export async function getIndexDetailEventStatic( - data: any, -): Promise<{ noHandleEventCount: string; safetyWarningEventCount: string; lastMonthMinimumIndex: any }> { +export async function getIndexDetailEventStatic(data: any): Promise<{ + noHandleEventCount: string; + safetyWarningEventCount: string; + lastMonthMinimumIndex: any; +}> { return request(urlProxyApis(`/zhgl/getIndexDetailEventStatic`), { params: data, }); @@ -322,9 +331,7 @@ export async function TrendAnalysis( } //重点区域-事件列表 -export async function getNormalEventListForKeyAreas( - params: any, -): Promise { +export async function getNormalEventListForKeyAreas(params: any): Promise { return request(urlProxyApis(`/normalEvent/getNormalEventListForKeyAreas`), { method: 'GET', params, @@ -332,15 +339,12 @@ export async function getNormalEventListForKeyAreas( } // 重点区域-事件详情 -export async function getKeyAreaEventDetail( - id: string, -): Promise { +export async function getKeyAreaEventDetail(id: string): Promise { return request(urlProxyApis(`/normalEvent/getNormalEventInfo/${id}`), { method: 'GET', }); } - //重点区域-数据统计 export async function getNormalEventCountForKeyAreas( params: any, @@ -351,11 +355,8 @@ export async function getNormalEventCountForKeyAreas( }); } - //重点区域-疑难问题 -export async function getDifficultEventForKeyAreas( - params: any, -): Promise { +export async function getDifficultEventForKeyAreas(params: any): Promise { return request(urlProxyApis(`/difficultEvent/getDifficultEventForKeyAreas`), { method: 'GET', params, @@ -376,36 +377,42 @@ export async function getNormalEventTrendForKeyAreas( export async function getHighIncidenceTypeRoadCountForKeyAreas( params: any, ): Promise { - return request(urlProxyApis(`/normalEvent/getHighIncidenceTypeRoadCountForKeyAreas`), { - method: 'GET', - params, - }); + return request( + urlProxyApis(`/normalEvent/getHighIncidenceTypeRoadCountForKeyAreas`), + { + method: 'GET', + params, + }, + ); } // 重点区域-高发时段 export async function getHighIncidenceTimeCountForKeyAreas( params: any, ): Promise { - return request(urlProxyApis(`/normalEvent/getHighIncidenceTimeCountForKeyAreas`), { - method: 'GET', - params, - }); + return request( + urlProxyApis(`/normalEvent/getHighIncidenceTimeCountForKeyAreas`), + { + method: 'GET', + params, + }, + ); } // 重点区域-高发来源 export async function getHighIncidenceSourceCountForKeyAreas( params: any, ): Promise { - return request(urlProxyApis(`/normalEvent/getHighIncidenceSourceCountForKeyAreas`), { - method: 'GET', - params, - }); + return request( + urlProxyApis(`/normalEvent/getHighIncidenceSourceCountForKeyAreas`), + { + method: 'GET', + params, + }, + ); } - -export async function getTotalCountForKeyAreas( - params: any, -): Promise { +export async function getTotalCountForKeyAreas(params: any): Promise { return request(urlProxyApis(`/normalEvent/getTotalCountForKeyAreas`), { method: 'GET', params, @@ -413,9 +420,7 @@ export async function getTotalCountForKeyAreas( } // 统览模式-行业运行情况-事件统计 -export async function getNormalEventCountApi( - params: any, -): Promise { +export async function getNormalEventCountApi(params: any): Promise { return request(urlProxyApis(`/normalEvent/getNormalEventCount`), { method: 'GET', params, @@ -423,9 +428,7 @@ export async function getNormalEventCountApi( } // 统览模式-行业运行情况-事件统计趋势 -export async function getNormalEventTrendApi( - params: any, -): Promise { +export async function getNormalEventTrendApi(params: any): Promise { return request(urlProxyApis(`/normalEvent/getNormalEventTrend`), { method: 'GET', params, -- GitLab