下发告警排序

web/client/src/sections/shouye/components/alarm/alarmStatistics.js

@@ -28,15 +28,11 @@ class AlarmStatistics extends Component {
         const { patrolManage } = actions
         const times = [moment().subtract(70, 'years').format(format), moment().format(format)];
         const format = 'YYYY-MM-DD HH:mm:ss';
-        const res = await dispatch(patrolManage.records(`patrolRecord/all/${times[0]}/${times[1]}/true/null`));
+        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
+                return i?.patrolRecordIssueHandles[0]?.isgaojing===true&&i?.patrolRecordIssueHandles[0]?.yujingafchishu===null
-                &&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'))
-                ).length===0   
-        })
         const obj = {};
         data.map((i)=>{
             if(obj[i.pointId]){
@@ -54,7 +50,7 @@ class AlarmStatistics extends Component {
         })
         console.log(obj,'obj')
         this.setState({
-            alarmList:dd
+            alarmList:dd.sort((x,y)=>y.count-x.count)
         })
     }