(*)解决冲突

web/client/src/sections/shouye/containers/shouye.js

@@ -92,17 +92,19 @@ const Information = (props) => {
                   <div>{xunjiandata.filter(i=>i?.alarm===true).length}</div>
                </div>
                <div className='shouyetopitem-right'>
-               <div>已处理：个</div>
-               <div>未处理：2个</div>
+                  <div>已处理：{shijiandata.filter(i => i?.patrolRecordIssueHandles[0]?.yanshoushijian && parseInt(moment(i?.patrolRecordIssueHandles[0]?.yanshoushijian).format('YYYYMMDD')) === parseInt(moment().format('YYYYMMDD'))).length}个</div>
+                  <div>未处理：{shijiandata.filter(i => i?.alarm === true && i?.patrolRecordIssueHandles[0]?.state === 1).length}个</div>
                </div>
             </div>
             <div className='shouyetopitem'>
                <div className='shouyetopitem-left' >
                   <div>今日预警</div>
-               <div>0</div>
+                  <div>{shijiandata.filter(i => i?.alarm === true && i?.patrolRecordIssueHandles[0]?.yujingshijian && moment(i?.patrolRecordIssueHandles[0]?.yujingshijian).format
+                     ('YYYYMMDD') === moment().format('YYYYMMDD') && i?.patrolRecordIssueHandles[0]?.isgaojing !== true).length}</div>
                </div>
                <div className='shouyetopitem-right'>
-               <div>已下发：2个</div>
+                  <div>已下发：{shijiandata.filter(i => i?.alarm === true && i?.patrolRecordIssueHandles[0]?.yujingshijian && moment(i?.patrolRecordIssueHandles[0]?.yujingshijian).format
+                     ('YYYYMMDD') === moment().format('YYYYMMDD') && i?.patrolRecordIssueHandles[0]?.isgaojing === true).length}个</div>
                </div>
             </div>
          </div>