diff --git a/src/models/safetyAreaId.ts b/src/models/safetyAreaId.ts
new file mode 100644
index 0000000000000000000000000000000000000000..51ec995ea10c3a89884ef2910e53eccc8484158a
--- /dev/null
+++ b/src/models/safetyAreaId.ts
@@ -0,0 +1,12 @@
+import { useState } from 'react';
+/**
+ * 安全一张图区域筛选
+ */
+export default () => {
+  const [selectAreaId, setSelectAreaId] = useState<string>();
+
+  return {
+    selectAreaId,
+    setSelectAreaId,
+  };
+};
diff --git a/src/pages/SecurityServiceOverview/RegionSelect/index.tsx b/src/pages/SecurityServiceOverview/RegionSelect/index.tsx
index 016e87c01fbe5cea2d47ae06aecca69c5cd39026..c7f0e55fe6c666554b80a952123e8dd43f8ecec7 100644
--- a/src/pages/SecurityServiceOverview/RegionSelect/index.tsx
+++ b/src/pages/SecurityServiceOverview/RegionSelect/index.tsx
@@ -1,11 +1,14 @@
 import { Select } from 'antd';
 import styles from './index.less';
 
+import { useModel } from '@umijs/max';
+
 /**
  * @description 区域选择
  */
 
 const RegionSelect = () => {
+  const { setSelectAreaId } = useModel('safetyAreaId');
   return (
     <div className={styles.regionSelectWrap}>
       <Select
@@ -104,6 +107,9 @@ const RegionSelect = () => {
             label: '双流区',
           },
         ]}
+        onChange={(e) => {
+          setSelectAreaId(e);
+        }}
       />
     </div>
   );
diff --git a/src/pages/SecurityServiceOverview/SafetyMap/index.tsx b/src/pages/SecurityServiceOverview/SafetyMap/index.tsx
index eee843dcd7c509357076399b803e56b540a53c6d..cdfb70c3f929e991701a6d7c850245112b68a0dd 100644
--- a/src/pages/SecurityServiceOverview/SafetyMap/index.tsx
+++ b/src/pages/SecurityServiceOverview/SafetyMap/index.tsx
@@ -88,7 +88,7 @@ const SafetyMap = () => {
       refreshDeps: [searchParams],
     },
   );
-
+//行业点位详情
   const { data, run } = useRequest(
     services.CityRiskApi.safetyMonitoringObjectInfo,
     {
diff --git a/src/pages/SecurityServiceOverview/SecurityState/FacilityWarn/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/FacilityWarn/index.tsx
index 5c7a10567bcc458a5ce96dc574a5227bbb6015d8..b867c0036d1742d21f25aed671c580d03ff5258e 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/FacilityWarn/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/FacilityWarn/index.tsx
@@ -32,16 +32,33 @@ const FacilityWarn = ({ data }: { data: any }) => {
       },
     ],
   });
-  const { data:zmTotal } = useRequest(() => {
+  //管廊
+  const { data: apgl } = useRequest(services.CityRiskApi.catalogData, {
+    defaultParams: [
+      {
+        typeCode: 'aq-gl',
+        id: '1864555586738450434',
+      },
+    ],
+  });
+  //照明预警数陈彭接口
+  const { data: zmTotal } = useRequest(() => {
     return services.CityRiskApi.getstatisticalEvent({
       parentTypeCode: 'zm',
     });
   });
-  const { data:ggzpTotal } = useRequest(() => {
+  //广告牌预警数陈彭接口
+  const { data: ggzpTotal } = useRequest(() => {
     return services.CityRiskApi.getstatisticalEvent({
       parentTypeCode: 'ggzp',
     });
   });
+  //管廊预警数陈彭接口
+  const { data: glTotal } = useRequest(() => {
+    return services.CityRiskApi.getstatisticalEvent({
+      parentTypeCode: 'gl',
+    });
+  });
   //照明
   const zm = useMemo(() => {
     // return data?.find((item: any) => item?.typeCode === 'zm');
@@ -49,19 +66,19 @@ const FacilityWarn = ({ data }: { data: any }) => {
       typeCode: 'zm',
       typeName: '照明',
       parentCode: null,
-      total: zmm?.data?.data?.records?.[0]?.fxys??'--',
+      total: zmm?.data?.data?.records?.[0]?.fxys ?? '--',
       children: [
         {
           typeCode: 'dl',
           typeName: '路灯设施',
           parentCode: 'dlql',
-          total: zmm?.data?.data?.records?.[0]?.ldss??'--',
+          total: zmm?.data?.data?.records?.[0]?.ldss ?? '--',
         },
         {
           typeCode: 'dl',
           typeName: '检修作业',
           parentCode: 'dlql',
-          total: zmm?.data?.data?.records?.[0]?.jxzy??'--',
+          total: zmm?.data?.data?.records?.[0]?.jxzy ?? '--',
         },
       ],
     };
@@ -73,13 +90,13 @@ const FacilityWarn = ({ data }: { data: any }) => {
       typeCode: 'ggzp',
       typeName: '广告招牌 ',
       parentCode: null,
-      total: gg?.data?.data?.records?.[0]?.fxys??'--',
+      total: gg?.data?.data?.records?.[0]?.fxys ?? '--',
       children: [
         {
           typeCode: 'dl',
           typeName: '广告招牌设备',
           parentCode: 'dlql',
-          total: gg?.data?.data?.records?.[0]?.ggzpss??'--',
+          total: gg?.data?.data?.records?.[0]?.ggzpss ?? '--',
         },
       ],
     };
@@ -91,23 +108,23 @@ const FacilityWarn = ({ data }: { data: any }) => {
       typeCode: 'gl',
       typeName: '管廊',
       parentCode: null,
-      total: '--',
+      total: apgl?.data?.data?.records?.[0]?.fxys ?? '--',
       children: [
         {
           typeCode: 'dl',
-          typeName: '管廊设备',
-          parentCode: 'dlql',
-          total: '--',
+          typeName: '管廊数',
+          parentCode: 'gl',
+          total: apgl?.data?.data?.records?.[0]?.glss ?? '--',
         },
         {
           typeCode: 'dl',
           typeName: '有限空间作业',
-          parentCode: 'dlql',
-          total: '--',
+          parentCode: 'gl',
+          total: apgl?.data?.data?.records?.[0]?.yxkjzy ?? '--',
         },
       ],
     };
-  }, [data]);
+  }, [data, apgl]);
   //油烟
   const yyrq = useMemo(() => {
     // return data?.find((item: any) => item?.typeCode === 'yyrq');
@@ -132,51 +149,7 @@ const FacilityWarn = ({ data }: { data: any }) => {
       ],
     };
   }, [data]);
-  console.log(zmTotal);
-  console.log(ggzpTotal);
-  // const zm = [
-  //   {
-  //     icon: require('@/assets/images/SecurityServiceOverview/ludeng.png'),
-  //     name: '路灯设施',
-  //     count: 15,
-  //   },
-  //   {
-  //     icon: require('@/assets/images/SecurityServiceOverview/jianxiu.png'),
-  //     name: '检修作业',
-  //     count: 15,
-  //   },
-  // ];
-  const advertisingList = [
-    {
-      icon: require('@/assets/images/SecurityServiceOverview/ggp.png'),
-      name: '广告招牌设施',
-      count: 15,
-    },
-  ];
-  const pipe = [
-    {
-      icon: require('@/assets/images/SecurityServiceOverview/guanlang.png'),
-      name: '管廊设施',
-      count: 15,
-    },
-    {
-      icon: require('@/assets/images/SecurityServiceOverview/jianxiu.png'),
-      name: '有限空间作业',
-      count: 15,
-    },
-  ];
-  const smoke = [
-    {
-      icon: require('@/assets/images/SecurityServiceOverview/smoke.png'),
-      name: '油烟检测点位',
-      count: 15,
-    },
-    {
-      icon: require('@/assets/images/SecurityServiceOverview/yc.png'),
-      name: '扬尘管控点位',
-      count: 15,
-    },
-  ];
+
   return (
     <div className={styles.container}>
       <CustomCard
@@ -189,7 +162,9 @@ const FacilityWarn = ({ data }: { data: any }) => {
           backgroundColor: 'rgba(63, 149, 229, 0.1)',
         }}
         extra={
-          <div className={styles.riskCount}   title={'风险源数' + zm?.total}>风险源数&nbsp;{zm?.total}</div>
+          <div className={styles.riskCount} title={'风险源数' + zm?.total}>
+            风险源数&nbsp;{zm?.total}
+          </div>
         }
       >
         <div className={styles.content}>
@@ -214,7 +189,8 @@ const FacilityWarn = ({ data }: { data: any }) => {
               verticalWarn={true}
               // yj={zmm?.data?.data?.records?.[0]?.yj}
               // cy={zmm?.data?.data?.records?.[0]?.ycz}
-              yj={zmTotal?.data?.monthEventTotal} cy={zmTotal?.data?.yxcEventTotal}
+              yj={zmTotal?.data?.monthEventTotal}
+              cy={zmTotal?.data?.yxcEventTotal}
             />
           </div>
         </div>
@@ -260,7 +236,8 @@ const FacilityWarn = ({ data }: { data: any }) => {
               verticalWarn={true}
               // yj={gg?.data?.data?.records?.[0]?.yj}
               // cy={gg?.data?.data?.records?.[0]?.ycz}
-              yj={ggzpTotal?.data?.monthEventTotal} cy={ggzpTotal?.data?.yxcEventTotal}
+              yj={ggzpTotal?.data?.monthEventTotal}
+              cy={ggzpTotal?.data?.yxcEventTotal}
             />
           </div>
         </div>
@@ -295,7 +272,12 @@ const FacilityWarn = ({ data }: { data: any }) => {
             })}
           </div>
           <div>
-            <WarnWiget typeCode={gl?.typeCode} verticalWarn={true} />
+            <WarnWiget
+              typeCode={gl?.typeCode}
+              verticalWarn={true}
+              yj={glTotal?.data?.monthEventTotal}
+              cy={glTotal?.data?.yxcEventTotal}
+            />
           </div>
         </div>
       </CustomCard>
diff --git a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/WarnWiget/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/WarnWiget/index.tsx
index 5b9269df9daad4ed3bbaf564a0ff4b1cdabec0b6..e89eaeef9bc5e5a6c6cb640e7ad78ad09cb027ec 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/WarnWiget/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/WarnWiget/index.tsx
@@ -15,19 +15,19 @@ const WarnWiget = ({
   yj:any,
   cy:any
 }) => {
-  const { data } = useRequest(
-    () => {
-      if (typeCode) {
-        return services.CityRiskApi.getstatisticalEvent({
-          parentTypeCode: typeCode,
-        });
+  // const { data } = useRequest(
+  //   () => {
+  //     if (typeCode) {
+  //       return services.CityRiskApi.getstatisticalEvent({
+  //         parentTypeCode: typeCode,
+  //       });
         
-      }
-    },
-    {
-      refreshDeps: [typeCode],
-    },
-  );
+  //     }
+  //   },
+  //   {
+  //     refreshDeps: [typeCode],
+  //   },
+  // );
 // console.log(data);
 
 
diff --git a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx
index 4d9efb78aad45db13d3135a3b8ddd11b80370d49..1c3647961eb92c3d3eb14ea03164b4f7df394f08 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx
@@ -163,12 +163,13 @@ const IndustryWarn = ({ data }: { data: any }) => {
       parentTypeCode: 'dlql',
     });
   });
+  
   const { data:hwTotal } = useRequest(() => {
     return services.CityRiskApi.getstatisticalEvent({
       parentTypeCode: 'hw',
     });
   });
-  console.log(hwTotal);
+
   
   return (
     <div className={styles.container}>
diff --git a/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx b/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx
index 82f47aa0ef66342af1d8a83dc90d8d26bee1be12..4ab84052756a1f3cdccc5e0e0f75cbc4d40e4ed0 100644
--- a/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx
+++ b/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx
@@ -40,7 +40,7 @@ const BaseInfo: React.FC<{
       <div className={styles.left}>
         <span className={styles.tag}>{data?.report_object}</span>
         <Carousel autoplay autoplaySpeed={5000}>
-          {[1, 2, 3]?.map((item) => {
+          {[data?.photosZWW]?.map((item) => {
             return (
               <div className={styles.eventImgWrap}>
                 <Image
@@ -97,7 +97,7 @@ const BaseInfo: React.FC<{
             circulationPersonName: item?.dealingPeople,
             circulationPersonId: item?.riskEventId,
             recordTime: item?.createTime,
-            eventAttachmentInfos: item?.eventPhotos,
+            // eventAttachmentInfos: item?.eventPhotos,
           }))}
         />
       </div>
diff --git a/src/pages/SecurityServiceOverview/index.tsx b/src/pages/SecurityServiceOverview/index.tsx
index 36b8f65aebb95e9a68050d707fce4e87097584e1..b3bea0814b6984c913ff2118a0152db803509159 100644
--- a/src/pages/SecurityServiceOverview/index.tsx
+++ b/src/pages/SecurityServiceOverview/index.tsx
@@ -13,14 +13,7 @@ import SecurityState from './SecurityState';
  */
 
 const SecurityServiceOverview = () => {
-  const [modalOpt, setModalOpt] = useState<{
-    open: boolean;
-    title: string;
-  }>({
-    open: false,
-    title: '安全指数溯源',
-  });
-  
+
  
  
   return (