From 35eaad14dc01b2acfbd3a91e014453ce0dbca02f Mon Sep 17 00:00:00 2001
From: lijingqi <1437862981@qq.com>
Date: Wed, 22 Jan 2025 19:31:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DistributionChart/index.tsx           |  4 ++++
 .../components/StatisticsChart/index.tsx             | 10 ++++++----
 .../modals/LivingGarbage/index.less                  |  3 ++-
 .../modals/LivingGarbage/index.tsx                   | 12 +++++++-----
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/pages/GlobalModalServices/modals/ConstructionWaste/components/DistributionChart/index.tsx b/src/pages/GlobalModalServices/modals/ConstructionWaste/components/DistributionChart/index.tsx
index 06917703..6fc8b7b9 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<DistributionChartProps> = ({
           barWidth: 20,
           z: 1,
           barGap: '-100%',
+          tooltip: {
+            show: false,
+          },
           data: data.map((item) => ({
             ...item,
             itemStyle: {
@@ -198,6 +201,7 @@ const DistributionChart: React.FC<DistributionChartProps> = ({
           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 d814b8a6..2c2f4bfc 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<StatisticsChartProps> = ({ 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/LivingGarbage/index.less b/src/pages/GlobalModalServices/modals/LivingGarbage/index.less
index 4f17b2a9..92938e12 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 75d3d1f4..e2393cd1 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 = () => {
             )}
 
             {/* 地图标题 - 移到地图内部 */}
-            <div className={styles.mapTitle}>生活垃圾处置厂分布</div>
+            <div className={styles.mapTitle}>
+              生活固体废弃物末端处置设施分布
+            </div>
 
             <div className={styles.legend}>
               <div className={styles.legendTitle}>图层图例</div>
@@ -370,7 +372,7 @@ const LivingGarbage: React.FC = () => {
             >
               <div className={styles.listHeader}>
                 <div className={styles.listTitle}>
-                  <span>生活垃圾处置厂列表</span>
+                  <span> 生活废弃物末端处置设施列表</span>
                 </div>
               </div>
 
-- 
GitLab