From 2173cf81816a887fa2c8fcccaa477a964043a017 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Sat, 30 Jul 2022 22:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BB=E6=8A=A4=E5=88=A0=E9=99=A4=E5=90=8E?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fillion/components/maintenanceTable.js    | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/web/client/src/sections/fillion/components/maintenanceTable.js b/web/client/src/sections/fillion/components/maintenanceTable.js
index 07207b78..c26c6c8d 100644
--- a/web/client/src/sections/fillion/components/maintenanceTable.js
+++ b/web/client/src/sections/fillion/components/maintenanceTable.js
@@ -102,12 +102,12 @@ const DetailList = (props) => {
             align: 'center',
             render: (text, record) => {
                 let day = moment(record.time).format("YYYYMMDD")
-                if(!basicDate){
+                if (!basicDate) {
                     basicDate = day;
-                    counter +=1;
-                } else if(basicDate == day){
                     counter += 1;
-                } else if(basicDate != day){
+                } else if (basicDate == day) {
+                    counter += 1;
+                } else if (basicDate != day) {
                     basicDate = day;
                     counter = 1;
                 }
@@ -303,7 +303,11 @@ const MaintenanceTable = (props) => {
 
     useEffect(() => {
         if (record) {
-            let query = { userId: record.id, reportType: 'conserve' , asc: true}
+            let query = {
+                userId: record.id,
+                reportType: 'conserve',
+                asc: true
+            }
             if ((dateRange && dateRange instanceof Array && dateRange[0] != '')) {
                 query.startTime = moment(dateRange[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss')
                 query.endTime = moment(dateRange[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss')
@@ -320,7 +324,11 @@ const MaintenanceTable = (props) => {
     }
 
     const handelRefresh = () => {
-        let query = { userId: record.id, reportType: 'patrol', asc: true }
+        let query = {
+            userId: record.id,
+            reportType: 'conserve',
+            asc: true
+        }
         dispatch(getReportList(query));
     }
 
@@ -343,7 +351,10 @@ const MaintenanceTable = (props) => {
                     <Button style={{ marginLeft: 20 }} onClick={handleExport}>导出</Button>
                 </div>
                 <Card style={{ flex: 1 }}>
-                    <DetailList reportList={reportList} record={record} loading={reportListLoading} dispatch={dispatch} handleOpen={handleOpen} />
+                    <DetailList
+                        reportList={reportList} record={record} loading={reportListLoading} dispatch={dispatch} handleOpen={handleOpen}
+                        handelRefresh={handelRefresh}
+                    />
                 </Card>
                 <DetailForm
                     visible={detailVisible}