From 7203ac92219156addaa0d4b6e6a9d81b5ffe8a13 Mon Sep 17 00:00:00 2001
From: Darker <mr.darker@163.com>
Date: 星期三, 26 二月 2025 09:56:59 +0800
Subject: [PATCH] 1. 添加报警对话框的按钮 2. 接受报警消息，并获取数据添加到数据库和显示在界面列表

---
 SourceCode/Bond/Servo/AlarmDlg.h |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/SourceCode/Bond/Servo/AlarmDlg.h b/SourceCode/Bond/Servo/AlarmDlg.h
index 44c82af..67aefe0 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.h
+++ b/SourceCode/Bond/Servo/AlarmDlg.h
@@ -14,14 +14,15 @@
 	virtual ~CAlarmDlg();
 
 private:
-	//void InitRxWindow();
-	//void Resize();
-	//void LoadAlarms();
+	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 UpdatePageData();
+	void UpdatePageControls();
+	void FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<std::vector<std::string>>& vecData);
+	void InsertAlarmData(CListCtrl* pListCtrl, const CString& alarmId, const CString& deviceName, const CString& description, const CString& startTime, const CString& endTime);
 
 private:
 	COLORREF m_crBkgnd;
@@ -29,6 +30,7 @@
 	IObserver* m_pObserver;
 
 	// 鍏抽敭瀛�
+	std::string m_strEqName;
 	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