From a25fffe157ee044e65318998827398941e7a42a4 Mon Sep 17 00:00:00 2001
From: Darker <mr.darker@163.com>
Date: 星期一, 03 三月 2025 18:13:48 +0800
Subject: [PATCH] 1.修改添加报警记录的方法 2.添加获取最后一次添加的事件id的方法

---
 SourceCode/Bond/Servo/AlarmDlg.h |   44 +++++++++++++++++++++++---------------------
 1 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/SourceCode/Bond/Servo/AlarmDlg.h b/SourceCode/Bond/Servo/AlarmDlg.h
index 44c82af..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 瀵硅瘽妗�
 
@@ -14,21 +13,24 @@
 	virtual ~CAlarmDlg();
 
 private:
-	//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 InitRxWindow();
+	void Resize();
+	void LoadAlarms();
+	void UpdatePageData();
+	void UpdatePageControls();
+	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;
 
-	// 鍏抽敭瀛�
+	// 鎼滅储鍏抽敭瀛�
+	int m_nSeverityLevel;
+	std::string m_strDeviceName;
+	std::string m_strUnitName;
 	std::string m_strKeyword;
 
 	// 椤电爜
@@ -51,15 +53,15 @@
 
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 鏀寔
-	//virtual BOOL OnInitDialog();
-	//virtual BOOL DestroyWindow();
-	//afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
-	//afx_msg void OnDestroy();
-	//afx_msg void OnSize(UINT nType, int cx, int cy);
-	//afx_msg void OnCbnSelchangeComboDatetime();
-	//afx_msg void OnBnClickedButtonSearch();
-	//afx_msg void OnBnClickedButtonExport();
-	//afx_msg void OnBnClickedButtonPrevPage();
-	//afx_msg void OnBnClickedButtonNextPage();
+	virtual BOOL OnInitDialog();
+	virtual BOOL DestroyWindow();
+	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+	afx_msg void OnDestroy();
+	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnCbnSelchangeComboDatetime();
+	afx_msg void OnBnClickedButtonSearch();
+	afx_msg void OnBnClickedButtonExport();
+	afx_msg void OnBnClickedButtonPrevPage();
+	afx_msg void OnBnClickedButtonNextPage();
 	DECLARE_MESSAGE_MAP()
 };

--
Gitblit v1.9.3