From ea9970230a4371669c3d1a4beb45ad9c0893594e Mon Sep 17 00:00:00 2001
From: duanshengchao <519970194@qq.com>
Date: Mon, 27 Oct 2025 17:43:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=E8=BF=87=E6=BB=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/alarmEventDataView.h  |  6 ++++--
 source/alarmEventDataView.cpp | 13 ++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/include/alarmEventDataView.h b/include/alarmEventDataView.h
index c6d943c..ba5ff88 100644
--- a/include/alarmEventDataView.h
+++ b/include/alarmEventDataView.h
@@ -100,15 +100,17 @@ public:
     void setMaxRealTimeEvents(int value) {m_maxRealTimeEvents = value;}
     const int getMaxRealTimeEvents() const {return m_maxRealTimeEvents;}
     void setFilter(const AlarmEventDataFilter& filter);
-    void applyFilter();
     void refresh();
 
-private:
+    //void setPageSize(int);
+
+private slots:
     void onTimeoutSimulateData();
     void onRealTimeEventReceived(const EventData& event);
 
 private:
     void iniHeaderData();
+    void applyFilter();
     void updatePaginationInfo();
     int findEventDataIndexById(const QString& eventId);
     void updateEventData(int index, const EventData& updatedEvent);
diff --git a/source/alarmEventDataView.cpp b/source/alarmEventDataView.cpp
index d4784fc..740cd82 100644
--- a/source/alarmEventDataView.cpp
+++ b/source/alarmEventDataView.cpp
@@ -241,21 +241,24 @@ void AlarmEventDataModel::iniHeaderData()
 void AlarmEventDataModel::setFilter(const AlarmEventDataFilter& filter)
 {
     m_currentFilter = filter;
+    refresh();
 }
 
 void AlarmEventDataModel::applyFilter()
-{}
+{
+    m_filteredEvents.clear();
+
+    if(m_allEvents.size() > 0)
+        m_filteredEvents = m_currentFilter.apply(m_allEvents);
+}
 
 void AlarmEventDataModel::refresh()
 {
     m_allEvents.clear();
-    m_filteredEvents.clear();
-
     //1.通过服务获取当前时间段的所有事件-m_allEvents
 
     //2.过滤事件(时间区间作为服务请求参数，其它过滤在本地完成)-m_filteredEvents
-    if(m_allEvents.size() > 0)
-    {}
+    applyFilter();
     //3.更新页码数据
     updatePaginationInfo();
     //4.根据页码刷新当前页面数据()-m_displayEvents