From 08e6d7ea389db86b88b5a6843a2ac28c0cd0687b Mon Sep 17 00:00:00 2001
From: LUCAS <zhang.feihong@free-sun.com.cn>
Date: Fri, 29 Jul 2022 17:33:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/sections/fillion/components/maintenanceTable.js     | 6 +++---
 web/client/src/sections/fillion/components/patrolTable.js   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/client/src/sections/fillion/components/maintenanceTable.js b/web/client/src/sections/fillion/components/maintenanceTable.js
index 297d6087..ef49add2 100644
--- a/web/client/src/sections/fillion/components/maintenanceTable.js
+++ b/web/client/src/sections/fillion/components/maintenanceTable.js
@@ -18,7 +18,7 @@ const DetailForm = (props) => {
         { key: '所在路段', name: 'road' },
         { key: '具体位置', name: 'address' },
         { key: '巡查内容', name: 'content' },
-        { key: '病害照片', name: 'scenePic' },
+        // { key: '病害照片', name: 'scenePic' },
         { key: '养护前', name: 'conserveBeforePic' },
         { key: '养护中', name: 'conserveUnderwayPic' },
         { key: '养护后', name: 'conserveAfterPic' },
@@ -56,7 +56,7 @@ const DetailForm = (props) => {
             visible={visible}
             footer={null}
             onCancel={handleClose}
-            title={'巡更详细'}
+            title={'养护管理详情'}
         >
             <Spin spinning={loading}>
                 {renderContent(data)}
@@ -269,7 +269,7 @@ const MaintenanceTable = (props) => {
     useEffect(() => {
         if (record) {
             let query = { userId: record.id, reportType: 'conserve' }
-            if ((dateRange && dateRange instanceof Array)) {
+            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')
             }
diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js
index c7b268bb..1f633d9e 100644
--- a/web/client/src/sections/fillion/components/patrolTable.js
+++ b/web/client/src/sections/fillion/components/patrolTable.js
@@ -57,7 +57,7 @@ const DetailForm = (props) => {
             visible={visible}
             footer={null}
             onCancel={handleClose}
-            title={'巡更详细'}
+            title={'巡更管理详情'}
         >
             <Spin spinning={loading}>
                 {renderContent(data)}
@@ -273,7 +273,7 @@ const PatrolTable = (props) => {
 
     const queryData = () => {
         let query = { userId: record.id, reportType: 'patrol' }
-        if ((dateRange && dateRange instanceof Array)) {
+        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')
         }