From 5e1dbe2aefa614b3f228e7096e1160e189a78361 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 10 Mar 2023 10:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/sections/patrolManage/containers/yujingguanli.js   | 7 ++++---
 .../sections/shouye/components/alarm/alarmStatistics.js    | 2 +-
 web/client/src/sections/shouye/containers/shouye.js        | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/client/src/sections/patrolManage/containers/yujingguanli.js b/web/client/src/sections/patrolManage/containers/yujingguanli.js
index fc4d089..ee0476e 100644
--- a/web/client/src/sections/patrolManage/containers/yujingguanli.js
+++ b/web/client/src/sections/patrolManage/containers/yujingguanli.js
@@ -200,12 +200,13 @@ function YujingGuanli (props) {
             //     }
             // })
             const res = await dispatch(patrolManage.records(`patrolRecord/all/${times[0]}/${times[1]}/true/null`));
-            const data = res?.payload?.data?.filter(i=>{            
+            const data = res?.payload?.data?.filter(i=>{   
+               
                 return i?.patrolRecordIssueHandles[0]?.yanshoucishu>2&&i?.patrolRecordIssueHandles[0]?.isgaojing!==true
                     &&res?.payload?.data?.filter(j=>j?.pointId===i?.pointId&&j?.points?.project?.id===i?.points?.project?.id
                         &&j?.patrolRecordIssueHandles[0]?.yujingshijian
-                        &&i?.patrolRecordIssueHandles[0]?.yujingshijian&&
-                        parseInt(moment(i?.patrolRecordIssueHandles[0].yujingshijian).format('YYYYMMDDHHMMSS'))<parseInt(moment(j?.patrolRecordIssueHandles[0]?.yujingshijian).format('YYYYMMDDHHMMSS'))
+                        &&i?.patrolRecordIssueHandles[0]?.yujingshijian
+                         &&moment(i?.patrolRecordIssueHandles[0].yanshoushijian).valueOf()<moment(j?.patrolRecordIssueHandles[0]?.yanshoushijian).valueOf()
                     ).length===0   
             })
             console.log(res,'res')
diff --git a/web/client/src/sections/shouye/components/alarm/alarmStatistics.js b/web/client/src/sections/shouye/components/alarm/alarmStatistics.js
index 486ab3d..5aecbce 100644
--- a/web/client/src/sections/shouye/components/alarm/alarmStatistics.js
+++ b/web/client/src/sections/shouye/components/alarm/alarmStatistics.js
@@ -50,7 +50,7 @@ class AlarmStatistics extends Component {
         })
         console.log(obj,'obj')
         this.setState({
-            alarmList:dd.sort((x,y)=>y.count-x.count)
+            alarmList:dd.sort((x,y)=>y?.count-x?.count)
         })
     }
     
diff --git a/web/client/src/sections/shouye/containers/shouye.js b/web/client/src/sections/shouye/containers/shouye.js
index fc285cb..210cba7 100644
--- a/web/client/src/sections/shouye/containers/shouye.js
+++ b/web/client/src/sections/shouye/containers/shouye.js
@@ -132,8 +132,8 @@ const Information = (props) => {
                     &&shijiandata?.filter(j=>j?.pointId===i?.pointId&&j?.points?.project?.id===i?.points?.project?.id
                         &&j?.patrolRecordIssueHandles[0]?.yujingshijian
                         &&i?.patrolRecordIssueHandles[0]?.yujingshijian&&moment(i?.patrolRecordIssueHandles[0]?.yujingshijian).format
-                        ('YYYYMMDD') === moment().format('YYYYMMDD')&&
-                        parseInt(moment(i?.patrolRecordIssueHandles[0].yujingshijian).format('YYYYMMDDHHMMSS'))<parseInt(moment(j?.patrolRecordIssueHandles[0]?.yujingshijian).format('YYYYMMDDHHMMSS'))
+                        ('YYYYMMDD') === moment().format('YYYYMMDD')
+                        &&moment(i?.patrolRecordIssueHandles[0].yanshoushijian).valueOf()<moment(j?.patrolRecordIssueHandles[0]?.yanshoushijian).valueOf()
                     ).length===0   
             }).length}</div>
                </div>