From 9e2c304de2332f01195396a8ee5413ffb83b680b Mon Sep 17 00:00:00 2001
From: lijingqi <1437862981@qq.com>
Date: Tue, 14 Jan 2025 09:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modals/DyaPatrol/DyaPatrolList/index.tsx         |  4 ++--
 .../GlobalModalServices/modals/DyaPatrol/index.tsx   | 12 +++++++++---
 .../components/Advertisement/index.tsx               |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/pages/GlobalModalServices/modals/DyaPatrol/DyaPatrolList/index.tsx b/src/pages/GlobalModalServices/modals/DyaPatrol/DyaPatrolList/index.tsx
index d6fb9263..8343b0c1 100644
--- a/src/pages/GlobalModalServices/modals/DyaPatrol/DyaPatrolList/index.tsx
+++ b/src/pages/GlobalModalServices/modals/DyaPatrol/DyaPatrolList/index.tsx
@@ -24,7 +24,7 @@ const DyaPatrolList = (props:any) => {
           ...props?.search,
           ssqy:props?.ssqy,
           bm:props?.bm,
-          // ...props?.searchTime,
+          ...props?.searchTime,
           
         },
       }),
@@ -109,7 +109,7 @@ const DyaPatrolList = (props:any) => {
         //   dataSource={tableData?.data?.data?.records}
         dataSource={data?.data?.data?.records?.[0]?.list || []}
         columns={columns}
-        scroll={{ x: 1050, y: 550 }}
+        scroll={{ x: 1050, y: 600 }}
         pagination={{
           // total: tableData?.data?.data?.page?.total,
           total: data?.data?.data?.records?.[0]?.page?.total,
diff --git a/src/pages/GlobalModalServices/modals/DyaPatrol/index.tsx b/src/pages/GlobalModalServices/modals/DyaPatrol/index.tsx
index b527eb98..8d80ebf4 100644
--- a/src/pages/GlobalModalServices/modals/DyaPatrol/index.tsx
+++ b/src/pages/GlobalModalServices/modals/DyaPatrol/index.tsx
@@ -283,9 +283,12 @@ const DyaPatrol = (props: any) => {
           onClick={() => {
             dispatch.push('DyaPatrolList', {
               title: '巡查处置列表',
-              props: {},
+              props: {
+                searchTime
+              },
             });
           }}
+          style={{cursor:'pointer'}}
         >
           <div className={styles.title}>
             <div className={styles.tLeft}>
@@ -363,6 +366,7 @@ const DyaPatrol = (props: any) => {
                         title: '巡查处置列表',
                         props: {
                           search:param,
+                          searchTime
                         },
                       });
                     }}
@@ -509,7 +513,8 @@ const DyaPatrol = (props: any) => {
                       dispatch.push('DyaPatrolList', {
                         title: '巡查处置列表',
                         props: {
-                         ssqy:record?.ssqy
+                         ssqy:record?.ssqy,
+                         searchTime
                         },
                       });
                     }, // 点击行时触发
@@ -578,7 +583,8 @@ const DyaPatrol = (props: any) => {
                       dispatch.push('DyaPatrolList', {
                         title: '巡查处置列表',
                         props: {
-                          bm:record?.bm
+                          bm:record?.bm,
+                          searchTime
                         },
                       });
                     }, // 点击行时触发
diff --git a/src/pages/NewHome/NewRightContent/IndustryOperationV4/components/Advertisement/index.tsx b/src/pages/NewHome/NewRightContent/IndustryOperationV4/components/Advertisement/index.tsx
index c0b1a585..5d273cac 100644
--- a/src/pages/NewHome/NewRightContent/IndustryOperationV4/components/Advertisement/index.tsx
+++ b/src/pages/NewHome/NewRightContent/IndustryOperationV4/components/Advertisement/index.tsx
@@ -49,7 +49,7 @@ const Advertisement: React.FC = () => {
   const getData = () => {
     const params = {
       industry: '01',
-      dateType: 'today',
+      dateType: 'monthly',
       objectId: areaId,
     };
     services.Physicalsign.getNormalEventCountApi(params).then((res: any) => {
-- 
GitLab