From 50f3078f4efb3718e921b76567bd33d6c3640a44 Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期三, 21 一月 2026 22:20:31 +0800 Subject: [PATCH] 1.新增“读即已读”逻辑:CServoDlg::AckAlarm(int alarmId)记录已读并刷新角标;弹窗在显示任一告警时自动调用,导航上一条/下一条都会标记已读,工具条数量会同步更新。 --- SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h index 286767b..c94fd54 100644 --- a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h +++ b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h @@ -8,6 +8,7 @@ #include "CMainContainer.h" #include "CBaseView.h" #include "AlarmPopupDlg.h" +#include "CPageLogcat.h" // CBoounionPLCDlg 对话框 @@ -22,8 +23,8 @@ void Resize(); CBaseView* CreatePlcView(CPLC* pPlc); void CloseView(CBaseView* pView); - void AlarmOn(); - void AlarmOff(); + void AlarmOn(CPLC* pPlc); + void AlarmOff(CPLC* pPlc); private: COLORREF m_crBkgnd; @@ -33,6 +34,7 @@ CPagePlcList* m_pPagePlcList; CMainContainer* m_pMainContainer; CBaseView* m_pActiveView; + CPageLogcat* m_pPageLogcat; CAlarmPopupDlg* m_pAlarmWnd; @@ -48,6 +50,7 @@ // 实现 protected: HICON m_hIcon; + BOOL m_bShowLogWnd; // 生成的消息映射函数 virtual BOOL OnInitDialog(); @@ -62,6 +65,8 @@ afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu); afx_msg void OnMenuFileSettings(); afx_msg void OnUpdateMenuFileSettings(CCmdUI* pCmdUI); + afx_msg void OnMenuWndLog(); + afx_msg void OnUpdateMenuWndLog(CCmdUI* pCmdUI); afx_msg void OnMenuFileExit(); afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI); afx_msg void OnMenuHelpAbout(); -- Gitblit v1.9.3