diff --git a/src/pages/GlobalModalServices/modals/DyaPatrol/DyaPatrolList/index.tsx b/src/pages/GlobalModalServices/modals/DyaPatrol/DyaPatrolList/index.tsx index d6fb92633ca416b9f33f6fdd3c6d31f03678b640..8343b0c1efa295801534f90b962a08f49d82df00 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 b527eb986b0f29b97382e8bbcaadf2e489f048fd..8d80ebf4020b3e6db606f76c5fd3733ab53a356f 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'}} >
@@ -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 c0b1a58525f3639e8ff3484d3d04405488516286..5d273cace488e802565f1ae9c46884d774c4a643 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) => {