From 1bc4fecb9cc1641ed3ad0a2fda30766fc06fb13e Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 01 四月 2025 16:05:07 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/AlarmDlg.h b/SourceCode/Bond/Servo/AlarmDlg.h
index 9ce2938..c1ef5dc 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.h
+++ b/SourceCode/Bond/Servo/AlarmDlg.h
@@ -1,7 +1,10 @@
 锘�#pragma once
 #include "afxdialogex.h"
-#include <vector>
-#include <string>
+#include "AlarmManager.h"
+#include "ListCtrlEx.h"
+
+
+#define ID_MSG_ALARMDLG_HIDE		WM_USER + 1024
 
 // CAlarmDlg 瀵硅瘽妗�
 
@@ -19,16 +22,19 @@
 	void LoadAlarms();
 	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);
+	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;
 
 	// 椤电爜
@@ -43,6 +49,7 @@
 	// 鎺т欢
 	CDateTimeCtrl m_dateTimeStart;
 	CDateTimeCtrl m_dateTimeEnd;
+	CListCtrlEx m_listCtrl;
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -52,9 +59,9 @@
 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 OnClose();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnCbnSelchangeComboDatetime();
 	afx_msg void OnBnClickedButtonSearch();

--
Gitblit v1.9.3