From f0e9c7745f0f01e93b00306c2ba64b0586e70b9d Mon Sep 17 00:00:00 2001
From: Darker <mr.darker@163.com>
Date: 星期二, 04 三月 2025 10:56:41 +0800
Subject: [PATCH] 1. 添加通过 alarm_event_id 解除报警（更新结束时间） 2. 通过多个属性查找并解除报警（更新结束时间）

---
 SourceCode/Bond/Servo/AlarmDlg.h |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/SourceCode/Bond/Servo/AlarmDlg.h b/SourceCode/Bond/Servo/AlarmDlg.h
index 7b305cb..4fbfc43 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.h
+++ b/SourceCode/Bond/Servo/AlarmDlg.h
@@ -1,7 +1,6 @@
 锘�#pragma once
 #include "afxdialogex.h"
-#include <vector>
-#include <string>
+#include "AlarmManager.h"
 
 // CAlarmDlg 瀵硅瘽妗�
 
@@ -17,19 +16,21 @@
 	void InitRxWindow();
 	void Resize();
 	void LoadAlarms();
-	//void AddAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm);
-	//void UpdateAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm);
 	void UpdatePageData();
 	void UpdatePageControls();
-	void FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<std::vector<std::string>>& vecData);
+	void FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData);
+	void InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData);
+	std::string getCurrentTimeString();
 
 private:
 	COLORREF m_crBkgnd;
 	HBRUSH m_hbrBkgnd;
 	IObserver* m_pObserver;
 
-	// 鍏抽敭瀛�
-	std::string m_strEqName;
+	// 鎼滅储鍏抽敭瀛�
+	int m_nSeverityLevel;
+	std::string m_strDeviceName;
+	std::string m_strUnitName;
 	std::string m_strKeyword;
 
 	// 椤电爜

--
Gitblit v1.9.3