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/Servo/CEqProcessStep.cpp | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqProcessStep.cpp b/SourceCode/Bond/Servo/CEqProcessStep.cpp
index 4f08edc..b7d4b85 100644
--- a/SourceCode/Bond/Servo/CEqProcessStep.cpp
+++ b/SourceCode/Bond/Servo/CEqProcessStep.cpp
@@ -22,25 +22,26 @@
{
CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
attrubutes.addAttribute(new CAttribute("Glass ID",
- m_strGlassId.c_str(), ""));
+ m_strGlassId.c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Start Time",
- m_strStartTime.c_str(), ""));
+ m_strStartTime.c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("End Time",
- m_strEndTime.c_str(), ""));
+ m_strEndTime.c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Total Parameter",
- std::to_string(m_nTotalParameter).c_str(), ""));
+ std::to_string(m_nTotalParameter).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Total Group",
- std::to_string(m_nTotalGroup).c_str(), ""));
+ std::to_string(m_nTotalGroup).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Current Group",
- std::to_string(m_nCurrentGroup).c_str(), ""));
+ std::to_string(m_nCurrentGroup).c_str(), "", weight++));
char szName[256];
int index = 0;
for (auto item : m_params) {
sprintf_s(szName, 256, "Parameter %d", ++index);
attrubutes.addAttribute(new CAttribute(szName,
- item.c_str(), ""));
+ item.c_str(), "", weight++));
}
}
@@ -118,7 +119,7 @@
int CEqProcessStep::onTimeout()
{
CReadStep::onTimeout();
- LOGI("<CEqProcessStep> onTimeout.");
+ LOGE("<CEqProcessStep> onTimeout.");
return 0;
}
--
Gitblit v1.9.3