From 289f9a3b4f9b2ff61b3566d7e8e71fc3a5143008 Mon Sep 17 00:00:00 2001
From: lijingqi <1437862981@qq.com>
Date: Tue, 17 Dec 2024 18:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=B8=80=E5=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IndustryWarn/DisposeFlow/index.tsx        |  41 +++--
 .../SecurityState/IndustryWarn/index.tsx      |  73 ++++----
 .../RightLayout/RiskNotice/index.tsx          | 164 ++++++++++--------
 .../SecurityState/SecurityCqi/index.tsx       |  25 ++-
 .../components/BaseInfo/DetMap/index.tsx      |  26 +--
 .../components/BaseInfo/index.less            |   4 +-
 .../components/BaseInfo/index.tsx             |  41 +++--
 .../components/EventPicList/index.tsx         |   8 +-
 .../components/MapCantainer/index.less        |   3 +-
 .../components/RiskWarn/index.tsx             |  74 ++++++--
 src/utils/ui.ts                               |  13 +-
 11 files changed, 277 insertions(+), 195 deletions(-)

diff --git a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/DisposeFlow/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/DisposeFlow/index.tsx
index d33f1f58..c6a509c9 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/DisposeFlow/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/DisposeFlow/index.tsx
@@ -1,20 +1,34 @@
+import services from '@/services';
+import { getWarnTotal } from '@/utils/ui';
+import { useModel } from '@umijs/max';
 import { useRequest } from 'ahooks';
 import styles from './index.less';
-import services from '@/services';
 const DisposeFlow = ({
   countWidth,
-  typeCode,
+  industryCode,
 }: {
   countWidth?: number;
-  typeCode: string;
+
+  industryCode?: string;
 }) => {
-  const { data } = useRequest(() => {
-    return services.CityRiskApi.getstatisticalEvent({
-      parentTypeCode:typeCode,
-    });
-  });
-  console.log(data);
-  
+  const { selectAreaId } = useModel('safetyAreaId');
+
+  const { data } = useRequest(
+    () =>
+      services.DataBase.getSjdzInfoData({
+        typeCode: 'zzcc-aq-yjtj',
+        data: {
+          regionCode: selectAreaId,
+          industryCode: industryCode,
+        },
+      }),
+    {
+      refreshDeps: [selectAreaId],
+      ready: !!industryCode,
+    },
+  );
+  // console.log(data?.data?.data?.records?.[0]?.yjqktj);
+
   return (
     <div className={styles.container}>
       <div className={styles.item}>
@@ -25,7 +39,7 @@ const DisposeFlow = ({
         />
         <div>预警</div>
         <div className={styles.count} style={{ width: countWidth }}>
-         {data?.data?.monthEventTotal??'--'}
+          {getWarnTotal(data?.data?.data?.records?.[0]?.yjqktj)?.total ?? '--'}
         </div>
       </div>
 
@@ -42,8 +56,7 @@ const DisposeFlow = ({
         />
         <div>处置</div>
         <div className={styles.count} style={{ width: countWidth }}>
-       
-        {data?.data?.zgzEventTotal??'--'}
+          {getWarnTotal(data?.data?.data?.records?.[0]?.yjqktj)?.czz ?? '--'}
         </div>
       </div>
       <img
@@ -59,7 +72,7 @@ const DisposeFlow = ({
         />
         <div>办结</div>
         <div className={styles.count} style={{ width: countWidth }}>
-        {data?.data?.yxcEventTotal??'--'}
+          {getWarnTotal(data?.data?.data?.records?.[0]?.yjqktj)?.ycz ?? '--'}
         </div>
       </div>
     </div>
diff --git a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx
index 7942ff3e..fd87eaec 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx
@@ -13,21 +13,19 @@ const IndustryWarn = ({
   warnLevel: number;
   setWarnLevel: (val: number) => void;
 }) => {
-    //道路桥梁
-    const { data: dq } = useRequest(services.DataBase.getSjdzInfoData, {
-      defaultParams: [
-        {
-          typeCode: 'zzcc-aq-qldlsl',
-          
-        },
-      ],
-    });
+  //道路桥梁
+  const { data: dq } = useRequest(services.DataBase.getSjdzInfoData, {
+    defaultParams: [
+      {
+        typeCode: 'zzcc-aq-qldlsl',
+      },
+    ],
+  });
   //环卫
   const { data: hwgf } = useRequest(services.DataBase.getSjdzInfoData, {
     defaultParams: [
       {
         typeCode: 'zzcc-aq-hwgcsl',
-     
       },
     ],
   });
@@ -36,7 +34,6 @@ const IndustryWarn = ({
     defaultParams: [
       {
         typeCode: 'zzcc-aq-tmcfssl',
-        
       },
     ],
   });
@@ -53,23 +50,23 @@ const IndustryWarn = ({
           typeCode: 'zzcc-aq-dllxfz',
           typeName: '道路',
           parentCode: 'dlql',
-          typeField:'lb',
+          typeField: 'lb',
           total: dq?.data?.records?.[0]?.dl ?? '--',
           listTypeCode: 'zzcc-aq-dlmx',
-          columnsFields:{
-            name:'roadname',
-            type:'jishuguanlifenlei',
-            descgldw:'guanlidanwei',
-            address:'region_name',
-            status:'objstate'
-          }
+          columnsFields: {
+            name: 'roadname',
+            type: 'jishuguanlifenlei',
+            descgldw: 'guanlidanwei',
+            address: 'region_name',
+            status: 'objstate',
+          },
         },
         {
           listTypeCode: 'zzcc-aq-qlmxlb',
           typeName: '桥梁',
-          typeField:'lx',
+          typeField: 'lx',
           parentCode: 'dlql',
-          typeCode:'zzcc-aq-qllxfz',
+          typeCode: 'zzcc-aq-qllxfz',
           total: dq?.data?.records?.[0]?.ql ?? '--',
         },
       ],
@@ -86,26 +83,26 @@ const IndustryWarn = ({
       children: [
         {
           typeCode: 'dl',
-          listTypeCode:"zzcc-aq-ljzymx",
+          listTypeCode: 'zzcc-aq-ljzymx',
           typeName: '垃圾转运站',
           parentCode: 'dlql',
           total: hwgf?.data?.records?.[0]?.zyz ?? '--',
-          columnsFields:{
-            name:'objcode',
-            type:'industry_name',
-            descgldw:'deptname1',
-            address:'region_name',
-            status:'objstate'
-          }
+          columnsFields: {
+            name: 'objcode',
+            type: 'industry_name',
+            descgldw: 'deptname1',
+            address: 'region_name',
+            status: 'objstate',
+          },
         },
         {
           typeCode: 'dl',
-          listTypeCode:'zzcc-aq-hwgcmx',
+          listTypeCode: 'zzcc-aq-hwgcmx',
           typeName: '环卫公厕',
           parentCode: 'dlql',
-          columnsFields:{
-            address:'address',
-            descgldw:'yydw_name'
+          columnsFields: {
+            address: 'address',
+            descgldw: 'yydw_name',
           },
           total: hwgf?.data?.records?.[0]?.hwgc ?? '--',
         },
@@ -132,20 +129,20 @@ const IndustryWarn = ({
           typeCode: 'dl',
           typeName: '填埋场',
           parentCode: 'dlql',
-          total:gfcz?.data?.records?.[0]?.tmc?? '--',
+          total: gfcz?.data?.records?.[0]?.tmc ?? '--',
         },
         {
           typeCode: 'dl',
           typeName: '焚烧发电厂',
           parentCode: 'dlql',
-          total:gfcz?.data?.records?.[0]?.fsfdc?? '--',
+          total: gfcz?.data?.records?.[0]?.fsfdc ?? '--',
         },
         {
           listTypeCode: 'zzcc-aq-cccmx',
           typeCode: 'dl',
           typeName: '餐厨厂',
           parentCode: 'dlql',
-          total:gfcz?.data?.records?.[0]?.canchu?? '--',
+          total: gfcz?.data?.records?.[0]?.canchu ?? '--',
         },
       ],
     };
@@ -165,7 +162,7 @@ const IndustryWarn = ({
         extra={<StatusWiget status={'红色风险'} />}
       >
         <div className={styles.content}>
-          <div className={styles.warp}>
+          <div className={styles.warp} style={{display:'flex',alignItems:'flex-start',paddingTop:38}}>
             {dlql?.children?.map((item: any) => {
               return (
                 <IndustryWiget
@@ -182,7 +179,7 @@ const IndustryWarn = ({
             })}
           </div>
           <div className={styles.flow}>
-            <DisposeFlow typeCode={dlql?.typeCode} />
+            <DisposeFlow industryCode="0401" />
           </div>
         </div>
       </CustomCard>
diff --git a/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.tsx
index 0a630a82..cfca0c04 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.tsx
@@ -4,55 +4,56 @@ import orangeBg from '@/assets/images/SecurityServiceOverview/right/orangeBg.png
 import redBg from '@/assets/images/SecurityServiceOverview/right/redBg.png';
 import yellowBg from '@/assets/images/SecurityServiceOverview/right/yellowBg.png';
 import Modal from '@/components/HncyModal';
+import BaseInfo from '@/pages/SecurityServiceOverview/components/BaseInfo';
 import RiskWarn from '@/pages/SecurityServiceOverview/components/RiskWarn';
 import services from '@/services';
 import { DoubleRightOutlined } from '@ant-design/icons';
-import { useRequest } from '@umijs/max';
+import { useModel, useRequest } from '@umijs/max';
 import { Flex, Space } from 'antd';
 import classNames from 'classnames';
 import dayjs from 'dayjs';
 import { CSSProperties, useMemo, useState } from 'react';
 import styles from './index.less';
-import BaseInfo from '@/pages/SecurityServiceOverview/components/BaseInfo';
 type RiskLevelDto = {
   label: string;
   color: CSSProperties['color'];
   num: number;
 };
-export   const colorConfig: Record<
-string,
-{
-  color: CSSProperties['color'];
-  bg: string;
-  icon: string;
-}
+export const colorConfig: Record<
+  string,
+  {
+    color: CSSProperties['color'];
+    bg: string;
+    icon: string;
+  }
 > = {
-红色风险: {
-  //红色风险
-  color: '#FFBCBC',
-  bg: redBg,
-  icon: 'redIcon',
-},
-橙色风险: {
-  //橙色风险
-  color: '#FDDFCE',
-  bg: orangeBg,
-  icon: 'orangeIcon',
-},
-黄色风险: {
-  //黄色风险
-  color: '#FFE892',
-  bg: yellowBg,
-  icon: 'yellowIcon',
-},
-一般风险: {
-  //一般风险
-  color: '#BFE4FF',
-  bg: blueBg,
-  icon: 'blueIcon',
-},
+  红色预警: {
+    //红色风险
+    color: '#FFBCBC',
+    bg: redBg,
+    icon: 'redIcon',
+  },
+  橙色预警: {
+    //橙色风险
+    color: '#FDDFCE',
+    bg: orangeBg,
+    icon: 'orangeIcon',
+  },
+  黄色预警: {
+    //黄色风险
+    color: '#FFE892',
+    bg: yellowBg,
+    icon: 'yellowIcon',
+  },
+  一般预警: {
+    //一般风险
+    color: '#BFE4FF',
+    bg: blueBg,
+    icon: 'blueIcon',
+  },
 };
 const RiskNotice: React.FC = () => {
+  const { selectAreaId } = useModel('safetyAreaId');
   const [riskModalOpt, setRiskModalOpt] = useState<{
     open: boolean;
     title: string;
@@ -66,19 +67,35 @@ const RiskNotice: React.FC = () => {
   const { data: eventData } = useRequest(() =>
     services.CityRiskApi.getEventPage({ page: 1, count: 5 }),
   );
-    // 事件详情弹窗
-    const [detailModalOpt, setDetailModalOpt] = useState<{
-      open: boolean;
-      title: string;
-      eventId: string;
-      eventType?:string|undefined;
-      riskLevelName?:string;
-      position?:string
-    }>({
-      open: false,
-      title: '',
-      eventId: '',
-    });
+  const { data } = useRequest(
+    () =>
+      services.DataBase.getSjdzInfoData({
+        typeCode: 'zzcc-aq-yjxx',
+        data: {
+          regionCode: selectAreaId,
+          pageNo: 1,
+          pageSize: 5,
+        },
+      }),
+    {
+      refreshDeps: [selectAreaId],
+    },
+  );
+  // console.log(data);
+
+  // 事件详情弹窗zzcc-aq-yjxx
+  const [detailModalOpt, setDetailModalOpt] = useState<{
+    open: boolean;
+    title: string;
+    eventId: string;
+    eventType?: string | undefined;
+    riskLevelName?: string;
+    position?: string;
+  }>({
+    open: false,
+    title: '',
+    eventId: '',
+  });
   const riskLevel: RiskLevelDto[] = useMemo(() => {
     return [
       {
@@ -104,7 +121,6 @@ const RiskNotice: React.FC = () => {
     ];
   }, [levelData]);
 
-
   /** 标题渲染 */
   const titleRender = () => {
     return (
@@ -128,25 +144,21 @@ const RiskNotice: React.FC = () => {
 
   return (
     <div className={styles.riskwrap}>
-      <div className={styles.cardTitle}>
-      风险预警
-      </div>
+      <div className={styles.cardTitle}>风险预警</div>
       <div className={styles.levelCont}>
-      {riskLevel?.map((it) => (
-        <div
-         
-          className={styles.levelWrap}
-          key={it.label}
-          style={{ '--bg': it.color } as CSSProperties}
-        >
-          <span className={styles.name}>{it.label}</span>
-          <div className={styles.num}>{it.num}</div>
-        </div>
-      ))}
+        {riskLevel?.map((it) => (
+          <div
+            className={styles.levelWrap}
+            key={it.label}
+            style={{ '--bg': it.color } as CSSProperties}
+          >
+            <span className={styles.name}>{it.label}</span>
+            <div className={styles.num}>{it.num}</div>
+          </div>
+        ))}
       </div>
-   
 
-      {eventData?.items?.map((it:any, index:number) => (
+      {data?.data?.records?.map((it: any, index: number) => (
         <Flex
           className={styles.warnItem}
           justify="center"
@@ -154,39 +166,39 @@ const RiskNotice: React.FC = () => {
           key={index}
           style={
             {
-              '--color': colorConfig[it?.riskLevelName]?.color,
-              background: `url(${colorConfig[it?.riskLevelName]?.bg})`,
+              '--color': colorConfig[it?.risklevel]?.color,
+              background: `url(${colorConfig[it?.risklevel]?.bg})`,
               backgroundSize: '100% 100%',
             } as CSSProperties
           }
-          onClick={()=>{
+          onClick={() => {
             setDetailModalOpt({
               open: true,
-              eventId: it?.asriskId,
+              eventId: it?.riskid,
               ...it,
             });
           }}
         >
-          {colorConfig[it?.riskLevelName]?.icon && (
+          {colorConfig[it?.risklevel]?.icon && (
             <img
               src={require(`@/assets/images/SecurityServiceOverview/right/${
-                colorConfig[it?.riskLevelName]?.icon
+                colorConfig[it?.risklevel]?.icon
               }.png`)}
               className={styles.icon}
             />
           )}
           <div className={classNames(styles.title, 'textellipsis')}>
-            {it?.eventType}
+            {it?.riskdescription}
           </div>
           <Space align="start">
             <span className={classNames(styles.address, 'textellipsis')}>
-              {it?.position}
+              {it?.region_name}
             </span>
             <div
               className={styles.time}
-              title={dayjs().diff(it?.warningTime, 'm') + '分钟前'}
+              title={dayjs().diff(it?.risktime, 'h') + '小时前'}
             >
-              {dayjs().diff(it?.warningTime, 'm')}分钟前
+              {dayjs().diff(it?.risktime, 'h')}小时前
             </div>
           </Space>
         </Flex>
@@ -208,10 +220,10 @@ const RiskNotice: React.FC = () => {
         width={1500}
         height={846}
       >
-        <RiskWarn riskModalOpt={riskModalOpt}/>
+        <RiskWarn riskModalOpt={riskModalOpt} />
       </Modal>
-         {/* 事件详情 */}
-         <Modal
+      {/* 事件详情 */}
+      <Modal
         open={detailModalOpt?.open}
         titleRender={titleRender}
         onCancel={() => {
diff --git a/src/pages/SecurityServiceOverview/SecurityState/SecurityCqi/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/SecurityCqi/index.tsx
index 19bfb90c..326a9efb 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/SecurityCqi/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/SecurityCqi/index.tsx
@@ -63,14 +63,15 @@ const SecurityCqi = ({ warnLevel }: { warnLevel: number }) => {
         typeCode: 'zzcc-aq-yjtj',
         data: {
           regionCode: selectAreaId,
-          industryCode: '0401',
+          // industryCode: '0401',
         },
       }),
     {
       refreshDeps: [selectAreaId],
     },
   );
-  console.log(data);
+console.log(data);
+
 
   const { data: signData } = useRequest(() => {
     return services.Physicalsign.getComparisonIndexInstance({
@@ -210,17 +211,31 @@ const SecurityCqi = ({ warnLevel }: { warnLevel: number }) => {
       <div className={styles.warningWarp}>
         <div className={styles.warnItem}>
           <div className={styles.count}>
-            {statisticalEvent?.monthEventTotal}
+            { data?.data?.records?.[0]?.yjqktj?.find(
+                (item) => item?.status == '未处理',
+              )?.num+data?.data?.records?.[0]?.yjqktj?.find(
+                (item) => item?.status == '已解除',
+              )?.num}
           </div>
           <div className={styles.label}>监测预警</div>
         </div>
         <div className={styles.warnItem}>
-          <div className={styles.count}>{statisticalEvent?.zgzEventTotal}</div>
+          <div className={styles.count}>
+            {
+              data?.data?.records?.[0]?.yjqktj?.find(
+                (item) => item?.status == '未处理',
+              )?.num
+            }
+          </div>
           <div className={styles.label}>处置中</div>
         </div>
         <div className={styles.warnItem}>
           <div className={styles.count} style={{ color: 'rgb(35, 194, 255)' }}>
-            {statisticalEvent?.yxcEventTotal}
+            {
+              data?.data?.records?.[0]?.yjqktj?.find(
+                (item) => item?.status == '已解除',
+              )?.num
+            }
           </div>
           <div className={styles.label}>已处置</div>
         </div>
diff --git a/src/pages/SecurityServiceOverview/components/BaseInfo/DetMap/index.tsx b/src/pages/SecurityServiceOverview/components/BaseInfo/DetMap/index.tsx
index 1b90f72a..1a19d3e8 100644
--- a/src/pages/SecurityServiceOverview/components/BaseInfo/DetMap/index.tsx
+++ b/src/pages/SecurityServiceOverview/components/BaseInfo/DetMap/index.tsx
@@ -68,19 +68,19 @@ const DetMap = () => {
     open: false,
     title: '道路桥梁情况',
   });
-  const { data: mapMark } = useRequest(
-    () => services.CityRiskApi.findListForMap(searchParams),
-    {
-      refreshDeps: [searchParams],
-    },
-  );
-  //safetyRiskEventMap
-  const { data: warnMark } = useRequest(
-    () => services.CityRiskApi.safetyRiskEventMap(searchParams),
-    {
-      refreshDeps: [searchParams],
-    },
-  );
+  // const { data: mapMark } = useRequest(
+  //   () => services.CityRiskApi.findListForMap(searchParams),
+  //   {
+  //     refreshDeps: [searchParams],
+  //   },
+  // );
+  // //safetyRiskEventMap
+  // const { data: warnMark } = useRequest(
+  //   () => services.CityRiskApi.safetyRiskEventMap(searchParams),
+  //   {
+  //     refreshDeps: [searchParams],
+  //   },
+  // );
 
  
   return (
diff --git a/src/pages/SecurityServiceOverview/components/BaseInfo/index.less b/src/pages/SecurityServiceOverview/components/BaseInfo/index.less
index 6a6e4299..2ad80459 100644
--- a/src/pages/SecurityServiceOverview/components/BaseInfo/index.less
+++ b/src/pages/SecurityServiceOverview/components/BaseInfo/index.less
@@ -6,9 +6,7 @@
 }
 
 .imgWarp {
-  position: absolute;
-  left: -550px;
-  z-index: 9999;
+
 
   width: 504px;
 
diff --git a/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx b/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx
index 21956d5b..189b7ad9 100644
--- a/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx
+++ b/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx
@@ -4,7 +4,6 @@ import services from '@/services';
 import { imageOptions } from '@/utils/comm';
 import { useRequest } from '@umijs/max';
 import { Carousel, Image } from 'antd';
-import LineCharts from '../../SecurityState/SecurityCqi/LineCharts';
 import Casecirculation from './Casecirculation';
 import DetMap from './DetMap';
 import styles from './index.less';
@@ -39,29 +38,29 @@ const BaseInfo: React.FC<{
   };
   return (
     <div className={styles.baseInfoWrap}>
-      <div className={styles.imgWarp}>
-        <span className={styles.tag}>{data?.report_object}</span>
-        <Carousel autoplay autoplaySpeed={5000}>
-          {[data?.photosZWW]?.map((item) => {
-            return (
-              <div className={styles.eventImgWrap}>
-                <Image
-                  width="100%"
-                  height="100%"
-                  key={item}
-                  src={item}
-                  {...imageOptions}
-                  style={{ objectFit: 'cover' }}
-                />
-              </div>
-            );
-          })}
-        </Carousel>
-      </div>
       <div className={styles.left}>
-        <div className={styles.lineWarp}>
+        {/* <div className={styles.lineWarp}>
           <div className={styles.titleWarp}>感知源上报-东侧位移监测设备</div>
           <LineCharts></LineCharts>
+        </div> */}
+        <div className={styles.imgWarp}>
+          <span className={styles.tag}>{data?.report_object}</span>
+          <Carousel autoplay autoplaySpeed={5000}>
+            {[data?.photosZWW]?.map((item) => {
+              return (
+                <div className={styles.eventImgWrap}>
+                  <Image
+                    width="100%"
+                    height="100%"
+                    key={item}
+                    src={item}
+                    {...imageOptions}
+                    style={{ objectFit: 'cover' }}
+                  />
+                </div>
+              );
+            })}
+          </Carousel>
         </div>
         <div className={styles.info}>
           <LabelImgText
diff --git a/src/pages/SecurityServiceOverview/components/EventPicList/index.tsx b/src/pages/SecurityServiceOverview/components/EventPicList/index.tsx
index 7957ac73..ae4e99cc 100644
--- a/src/pages/SecurityServiceOverview/components/EventPicList/index.tsx
+++ b/src/pages/SecurityServiceOverview/components/EventPicList/index.tsx
@@ -72,9 +72,11 @@ const EventPicList: React.FC<EventPicListProps> = (
                   </p>
                   <Flex align="center">
                     <span className={styles.status}>{item.caseStatusText}</span>
-                    <span className={styles.type}>
-                      {item.collectionModeName || item.eventTypeName}
-                    </span>
+                    {(item.collectionModeName || item.eventTypeName) && (
+                      <span className={styles.type}>
+                        {item.collectionModeName || item.eventTypeName}
+                      </span>
+                    )}
                   </Flex>
                   <div>
                     <span>上报时间：</span>
diff --git a/src/pages/SecurityServiceOverview/components/MapCantainer/index.less b/src/pages/SecurityServiceOverview/components/MapCantainer/index.less
index 5ec0350a..ba1c2633 100644
--- a/src/pages/SecurityServiceOverview/components/MapCantainer/index.less
+++ b/src/pages/SecurityServiceOverview/components/MapCantainer/index.less
@@ -13,9 +13,10 @@
     }
 
     .botTabWarp {
-        width: 100%;
+      
         position: absolute;
         bottom: 20px;
+        left: 29%;
         display: flex;
         justify-content: center;
         z-index: 997;
diff --git a/src/pages/SecurityServiceOverview/components/RiskWarn/index.tsx b/src/pages/SecurityServiceOverview/components/RiskWarn/index.tsx
index 727e1e58..1be19601 100644
--- a/src/pages/SecurityServiceOverview/components/RiskWarn/index.tsx
+++ b/src/pages/SecurityServiceOverview/components/RiskWarn/index.tsx
@@ -1,6 +1,7 @@
 import Modal from '@/components/HncyModal';
 
 import services from '@/services';
+import { useModel } from '@umijs/max';
 import { useRequest } from 'ahooks';
 import { Flex } from 'antd';
 import { useRef, useState } from 'react';
@@ -22,10 +23,10 @@ const RiskWarn = ({ riskModalOpt }: { riskModalOpt: any }) => {
     eventId: '',
   });
   const params = {
-    page: 1,
-    count: 10,
-  
+    pageNo: 1,
+    pageSize: 10,
   };
+  const { selectAreaId } = useModel('safetyAreaId');
   const [listData, setListData] = useState<any>({
     items: [],
     loading: true,
@@ -34,25 +35,60 @@ const RiskWarn = ({ riskModalOpt }: { riskModalOpt: any }) => {
     hasNext: false,
   });
   const [fetchParams, setFetchParams] = useState<any>(params);
-  const { data: eventData } = useRequest(
-    () => services.CityRiskApi.getEventPage(fetchParams),
+  // const { data: eventData } = useRequest(
+  //   () => services.CityRiskApi.getEventPage(fetchParams),
+  //   {
+  //     refreshDeps: [fetchParams],
+  //     onSuccess: (res) => {
+  //       console.log(res);
+
+  //       setListData({
+  //         ...res?.data,
+  //         items: [
+  //           ...listData.items,
+  //           ...res?.data?.items?.map((item: any) => ({
+  //             ...item,
+  //             standardEventTitle: item?.eventType,
+  //             caseStatusText: item?.currentStatus,
+  //             reportTime: item?.warningTime,
+  //             collectionModeName: item?.sourceType,
+  //           })),
+  //         ],
+  //       });
+  //     },
+  //   },
+  // );
+  const { data } = useRequest(
+    () =>
+      services.DataBase.getSjdzInfoData({
+        typeCode: 'zzcc-aq-yjxx',
+        data: {
+          regionCode: selectAreaId,
+
+          ...fetchParams,
+        },
+      }),
     {
-      refreshDeps: [fetchParams],
+      refreshDeps: [selectAreaId, fetchParams],
       onSuccess: (res) => {
-        console.log(res);
-
+        console.log(res?.data?.data);
+        const data = res?.data?.data;
+        const list = [
+          ...listData?.items,
+          ...data?.records?.map((item: any) => ({
+            ...item,
+            standardEventTitle: item?.riskdescription,
+            caseStatusText: item?.status,
+            reportTime: item?.risktime,
+            collectionModeName: item?.sourceType,
+            position:item?.region_name+item?.name
+          })),
+        ];
+      
+        
         setListData({
-          ...res?.data,
-          items: [
-            ...listData.items,
-            ...res?.data?.items?.map((item: any) => ({
-              ...item,
-              standardEventTitle: item?.eventType,
-              caseStatusText: item?.currentStatus,
-              reportTime: item?.warningTime,
-              collectionModeName: item?.sourceType,
-            })),
-          ],
+          hasNext: list?.length < data?.page?.total,
+          items: list,
         });
       },
     },
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index fe3afaae..85caf120 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -95,8 +95,7 @@ export const getCqiLineChartStyles = (data: string | number) => {
     };
   }
   return style;
-}
-
+};
 
 const document: any = window.document;
 // 展开/全屏
@@ -130,3 +129,13 @@ export function isFullscreenElement() {
     document.mozFullScreenElement;
   return !!isFull;
 }
+export const getWarnTotal = (data: any) => {
+  if (!data) return;
+  const ycz = data?.find((item) => item?.status === '已解除')?.num;
+  const czz = data?.find((item) => item?.status === '未处理')?.num;
+  return {
+    ycz,
+    czz,
+    total: ycz + czz,
+  };
+};
-- 
GitLab