diff --git a/src/pages/GlobalModalServices/modals/ConstructionWaste/components/DistributionChart/index.tsx b/src/pages/GlobalModalServices/modals/ConstructionWaste/components/DistributionChart/index.tsx index 06917703c7b3479fa27b08e426d5e6e51d495775..6fc8b7b907a9a2fd041cf6eaebf3f50acad63eef 100644 --- a/src/pages/GlobalModalServices/modals/ConstructionWaste/components/DistributionChart/index.tsx +++ b/src/pages/GlobalModalServices/modals/ConstructionWaste/components/DistributionChart/index.tsx @@ -184,6 +184,9 @@ const DistributionChart: React.FC = ({ barWidth: 20, z: 1, barGap: '-100%', + tooltip: { + show: false, + }, data: data.map((item) => ({ ...item, itemStyle: { @@ -198,6 +201,7 @@ const DistributionChart: React.FC = ({ barWidth: 20, z: 2, barGap: '-100%', + data: data.map((item) => ({ // value: activeTab === '1' ? item.wasteAmount : item.siteCount, ...item, diff --git a/src/pages/GlobalModalServices/modals/ConstructionWaste/components/StatisticsChart/index.tsx b/src/pages/GlobalModalServices/modals/ConstructionWaste/components/StatisticsChart/index.tsx index d814b8a6a372a0a6d88c928c6f71aa37345bb33b..2c2f4bfc26147c88cd05184aaf6f09864fcf733f 100644 --- a/src/pages/GlobalModalServices/modals/ConstructionWaste/components/StatisticsChart/index.tsx +++ b/src/pages/GlobalModalServices/modals/ConstructionWaste/components/StatisticsChart/index.tsx @@ -58,7 +58,7 @@ const StatisticsChart: React.FC = ({ searchTime }) => { const zxlj = charData?.find((item) => item.name === 'zxlj')?.num??0; const gclj = charData?.find((item) => item.name === 'gclj')?.num??0 const cclj = charData?.find((item) => item.name === 'cclj')?.num??0; -console.log(gczt); + return [ @@ -117,11 +117,12 @@ console.log(gczt); color: '#BCCEE9', }, }, + title: { text: isUsingValue ? total : '---.--', subtext: '共计(万方)', - left: '65px', // 根据需求调整位置 - top: '54px', // 根据需求调整位置 + left: '68px', // 根据需求调整位置 + top: '58px', // 根据需求调整位置 textStyle: { color: '#FFFFFF', fontSize: 24, @@ -137,8 +138,9 @@ console.log(gczt); series: [ { type: 'pie', + padAngle: 5, radius: ['50%', '70%'], - center: ['40%', '35%'], // 调整环形图位置 + center: ['40%', '38%'], // 调整环形图位置 data: data.map((item) => ({ name: item.name, value: item.value, diff --git a/src/pages/GlobalModalServices/modals/IndustrySystem/index.tsx b/src/pages/GlobalModalServices/modals/IndustrySystem/index.tsx index 1b193d03a5c8fcba9036c0a612d9c78e2fc1a7d0..4b7d2e28b0c8049d754fcc351adfc3ebe44bc46e 100644 --- a/src/pages/GlobalModalServices/modals/IndustrySystem/index.tsx +++ b/src/pages/GlobalModalServices/modals/IndustrySystem/index.tsx @@ -101,6 +101,7 @@ const IndustrySystem = () => { { name: '占用挖掘城市道路信息管理平台(一期)', url: 'https://gl.cdzdwj.com/', + targetAppCode: 'd3f4644a8a915f62a8c3e1437c054827' }, { name: '成都市城市道路桥梁监控中心综合应用平台', diff --git a/src/pages/GlobalModalServices/modals/LivingGarbage/index.less b/src/pages/GlobalModalServices/modals/LivingGarbage/index.less index 4f17b2a929ed9432af6e9dd867eb809a44137823..92938e12576672330e906407abbdf02e7a7a2ab6 100644 --- a/src/pages/GlobalModalServices/modals/LivingGarbage/index.less +++ b/src/pages/GlobalModalServices/modals/LivingGarbage/index.less @@ -259,7 +259,8 @@ left: 20px; top: 20px; z-index: 2; - width: 230px; + // width: 230px; + padding: 0 10px; height: 48px; background: rgb(30, 107, 180); border-radius: 10px; diff --git a/src/pages/GlobalModalServices/modals/LivingGarbage/index.tsx b/src/pages/GlobalModalServices/modals/LivingGarbage/index.tsx index 75d3d1f4f07d58fd00ccd5b6e5eb84f6080811e2..e2393cd19fb799c2f20357c1315391f0093238b7 100644 --- a/src/pages/GlobalModalServices/modals/LivingGarbage/index.tsx +++ b/src/pages/GlobalModalServices/modals/LivingGarbage/index.tsx @@ -62,9 +62,9 @@ const LivingGarbage: React.FC = () => { const { data: typeData } = useRequest(() => services.DataBase.getSjdzInfoData({ typeCode: 'zzcc-shlj-ljclslb', - params:{ + params: { ...searchTime, - } + }, }).then((res) => { if (res.code === 200) { return res?.data?.data?.records; @@ -142,6 +142,7 @@ const LivingGarbage: React.FC = () => { children: pointData?.filter((it: any) => item?.key === it.czclx), })); }, [pointData]); + // 定位功能 const handleLocation = async (location: { x: number; y: number }) => { @@ -160,7 +161,6 @@ const LivingGarbage: React.FC = () => { ...searchTime, }, }); - mapRef?.current?.flyTo({ destination: { @@ -322,7 +322,9 @@ const LivingGarbage: React.FC = () => { )} {/* 地图标题 - 移到地图内部 */} -
生活垃圾处置厂分布
+
+ 生活固体废弃物末端处置设施分布 +
图层图例
@@ -370,7 +372,7 @@ const LivingGarbage: React.FC = () => { >
- 生活垃圾处置厂列表 + 生活废弃物末端处置设施列表
diff --git a/src/pages/NewHome/MapCantainer/DistrictMap/index.tsx b/src/pages/NewHome/MapCantainer/DistrictMap/index.tsx index f8bd0a44e13e92a24fe7c6f8b279d8da77adfd63..f40d78e1e44b87ee13accb2a585466ff3f716273 100644 --- a/src/pages/NewHome/MapCantainer/DistrictMap/index.tsx +++ b/src/pages/NewHome/MapCantainer/DistrictMap/index.tsx @@ -116,7 +116,7 @@ const DistrictMap: React.FC = () => { }); //最新事件 - services.CityProblemApi.getUpToDateEvent({ + services.CityProblemApi.getUpToDateEventOther({ page: 1, count: 10, }).then((res: any) => { diff --git a/src/services/CityProblem.ts b/src/services/CityProblem.ts index 4f3a27362939d9dc1b0d7782589de92464948ad2..9b0320ca12af9bf780e356ec3d55e90b4d45a0a0 100644 --- a/src/services/CityProblem.ts +++ b/src/services/CityProblem.ts @@ -277,4 +277,18 @@ export async function getUpToDateEvent( method: 'POST', params, }); +} + +//获取最新事件 +export async function getUpToDateEventOther( + params: { + page: number; + count: number; + protrudeFlag?: string;//1待确认 2 已确认推送 3 不推送 + }, +): Promise> { + return request(urlProxyApis(`/comprehensiveDiscovery/getUpToDateEventOther`), { + method: 'POST', + params, + }); } \ No newline at end of file