Merge remote-tracking branch 'origin/oldLogin' into city-zw

src/pages/SecurityServiceOverview/SecurityState/FacilityWarn/index.tsx

@@ -82,19 +82,19 @@ const FacilityWarn = ({ data }: { data: any }) => {
       typeCode: 'gl',
       typeName: '管廊',
       parentCode: null,
-      total: '8',
+      total: '--',
       children: [
         {
           typeCode: 'dl',
           typeName: '管廊设备',
           parentCode: 'dlql',
-          total: '4',
+          total: '--',
         },
         {
           typeCode: 'dl',
           typeName: '有限空间作业',
           parentCode: 'dlql',
-          total: '4',
+          total: '--',
         },
       ],
     };
@@ -106,19 +106,19 @@ const FacilityWarn = ({ data }: { data: any }) => {
       typeCode: 'yyrq',
       typeName: '油烟燃气',
       parentCode: null,
-      total: '8',
+      total: '--',
       children: [
         {
           typeCode: 'dl',
           typeName: '油烟检测点位',
           parentCode: 'dlql',
-          total: '4',
+          total: '--',
         },
         {
           typeCode: 'dl',
           typeName: '扬尘管控点位',
           parentCode: 'dlql',
-          total: '4',
+          total: '--',
         },
       ],
     };

src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx

@@ -24,13 +24,13 @@ const IndustryWarn = ({ data }: { data: any }) => {
       typeCode: 'dlql',
       typeName: '道路桥梁',
       parentCode: null,
-      total: 50,
+      total: '50',
       children: [
         {
           typeCode: 'dl',
           typeName: '道路',
           parentCode: 'dlql',
-          total: '1',
+          total: '0',
           children: [
             {
               typeCode: '342',
@@ -45,34 +45,34 @@ const IndustryWarn = ({ data }: { data: any }) => {
           typeCode: 'ql',
           typeName: '桥梁',
           parentCode: 'dlql',
-          total: '49',
+          total: '50',
           children: [
             {
               typeCode: '338',
               typeName: '跨河桥 ',
               parentCode: 'ql',
-              total: '37',
+              total: '--',
               children: [],
             },
             {
               typeCode: '339',
               typeName: ' 跨线桥',
               parentCode: 'ql',
-              total: '6',
+              total: '--',
               children: [],
             },
             {
               typeCode: '340',
               typeName: '互通式立交桥',
               parentCode: 'ql',
-              total: '5',
+              total: '--',
               children: [],
             },
             {
               typeCode: '341',
               typeName: '人行天桥',
               parentCode: 'ql',
-              total: '1',
+              total: '--',
               children: [],
             },
           ],
@@ -101,31 +101,31 @@ const IndustryWarn = ({ data }: { data: any }) => {
       typeCode: 'hw',
       typeName: '环卫',
       parentCode: null,
-      total: hwgf?.data?.records?.[0]?.fxys??'--',
+      total: hwgf?.data?.records?.[0]?.fxys ?? '--',
       children: [
         {
           typeCode: 'dl',
           typeName: '环卫设施',
           parentCode: 'dlql',
-          total: hwgf?.data?.records?.[0]?.hwss??'--',
+          total: hwgf?.data?.records?.[0]?.hwss ?? '--',
         },
         {
           typeCode: 'dl',
           typeName: '环卫公厕',
           parentCode: 'dlql',
-          total: hwgf?.data?.records?.[0]?.hwgc??'--',
+          total: hwgf?.data?.records?.[0]?.hwgc ?? '--',
         },
         {
           typeCode: 'dl',
           typeName: '环卫车辆',
           parentCode: 'dlql',
-          total: hwgf?.data?.records?.[0]?.hwcl??'--',
+          total: hwgf?.data?.records?.[0]?.hwcl ?? '--',
         },
         {
           typeCode: 'dl',
           typeName: '环卫车辆',
           parentCode: 'dlql',
-          total: hwgf?.data?.records?.[0]?.hwzl??'--',
+          total: hwgf?.data?.records?.[0]?.hwzl ?? '--',
         },
       ],
     };
@@ -137,19 +137,19 @@ const IndustryWarn = ({ data }: { data: any }) => {
       typeCode: 'gf',
       typeName: '固废',
       parentCode: null,
-      total: '20',
+      total: '--',
       children: [
         {
           typeCode: 'dl',
           typeName: '固废设备',
           parentCode: 'dlql',
-          total: '10',
+          total: '--',
         },
         {
           typeCode: 'dl',
           typeName: '生产作业',
           parentCode: 'dlql',
-          total: '10',
+          total: '--',
         },
       ],
     };
@@ -213,7 +213,11 @@ const IndustryWarn = ({ data }: { data: any }) => {
       count: 15,
     },
   ];
-
+  const { data:dlqlTotal } = useRequest(() => {
+    return services.CityRiskApi.getstatisticalEvent({
+      parentTypeCode: 'dlql',
+    });
+  });
   return (
     <div className={styles.container}>
       <CustomCard
@@ -246,7 +250,7 @@ const IndustryWarn = ({ data }: { data: any }) => {
             })}
           </div>
           <div>
-            <WarnWiget typeCode={dlql?.typeCode} />
+            <WarnWiget typeCode={dlql?.typeCode} yj={dlqlTotal?.monthEventTotal} cy={dlqlTotal?.yxcEventTotal} />
           </div>
         </div>
       </CustomCard>

src/pages/SecurityServiceOverview/components/EventPicList/index.tsx

@@ -59,7 +59,7 @@ const EventPicList: React.FC<EventPicListProps> = (
               <div className={styles.cardWrap}>
                 <Image
                   {...imageOptions}
-                  src={IMG_URL + item.disposePicPath}
+                  src={item?.photosZWW}
                   width={'100%'}
                   height={'160px'}
                   style={{ objectFit: 'cover' }}