From 431a39ef83b97851b4ed452fbfc1a5381e58dc88 Mon Sep 17 00:00:00 2001 From: duanshengchao <519970194@qq.com> Date: Tue, 2 Dec 2025 15:29:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DAlarmEventDataModel?= =?UTF-8?q?=E5=9C=A8=E4=B8=8D=E5=90=8C=E6=A8=A1=E5=BC=8F=E4=B8=8B(?= =?UTF-8?q?=E5=AE=9E=E6=97=B6/=E5=8E=86=E5=8F=B2)=E6=97=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BA=92=E7=9B=B8=E5=BD=B1=E5=93=8D=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/alarmEventDataView.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/source/alarmEventDataView.cpp b/source/alarmEventDataView.cpp index 1ab5d05..89ac410 100644 --- a/source/alarmEventDataView.cpp +++ b/source/alarmEventDataView.cpp @@ -19,10 +19,6 @@ AlarmEventDataModel::AlarmEventDataModel(AlarmDataMode mode, QObject* parent) m_paginationInfo.totalEntries = 0; iniHeaderData(); - connect(AlarmEventDataService::instance(), &AlarmEventDataService::realTimeEventReceived, this, &AlarmEventDataModel::onRealTimeEventReceived); - connect(AlarmEventDataService::instance(), &AlarmEventDataService::historicalQueryData, this, &AlarmEventDataModel::onHistoricalEventsReceived); - connect(AlarmEventDataService::instance(), &AlarmEventDataService::historicalQueryError, this, &AlarmEventDataModel::onHistoricalQueryError); - if(m_dataMode == RealTime) { for(int i = 0; i < m_maxRealTimeEvents; ++i)//创建几个“空事件”来初始化表格 @@ -33,13 +29,19 @@ AlarmEventDataModel::AlarmEventDataModel(AlarmDataMode mode, QObject* parent) m_displayEvents.append(event); } + connect(AlarmEventDataService::instance(), &AlarmEventDataService::realTimeEventReceived, this, &AlarmEventDataModel::onRealTimeEventReceived); AlarmEventDataService::instance()->start(); } + else + { + connect(AlarmEventDataService::instance(), &AlarmEventDataService::historicalQueryData, this, &AlarmEventDataModel::onHistoricalEventsReceived); + connect(AlarmEventDataService::instance(), &AlarmEventDataService::historicalQueryError, this, &AlarmEventDataModel::onHistoricalQueryError); + } //实时数据测试 - /*m_simulatedDataTimer = new QTimer(this); + m_simulatedDataTimer = new QTimer(this); connect(m_simulatedDataTimer, &QTimer::timeout, this, &AlarmEventDataModel::onTimeoutSimulateData); - m_simulatedDataTimer->start(3000);*/ + m_simulatedDataTimer->start(3000); } AlarmEventDataModel::~AlarmEventDataModel() @@ -358,6 +360,9 @@ void AlarmEventDataModel::onRealTimeEventReceived(const EventData& event) void AlarmEventDataModel::onHistoricalEventsReceived(const QList& events) { + if(m_dataMode == RealTime) + return; + m_allEvents.clear(); m_allEvents = events; @@ -373,6 +378,9 @@ void AlarmEventDataModel::onHistoricalEventsReceived(const QList& eve void AlarmEventDataModel::onHistoricalQueryError(const QString& error) { + if(m_dataMode == RealTime) + return; + emit loadDataError(error); }