From 9543f2d581d05a0f98de787ab131e8d97e0291a2 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 三月 2025 11:35:14 +0800
Subject: [PATCH] 1.清除警告,更新数据库(待测);

---
 SourceCode/Bond/Servo/Model.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index da79320..5dce62e 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -152,8 +152,10 @@
 				}
 				else {
 					LOGE("<CAlarmDlg> i消除警告");
-					//alarmManager.updateAlarmEndTime(std::to_string(pEqAlarmStep->getAlarmId()), 
-					//	pEquipment->getName());
+					alarmManager.clearAlarmByAttributes(pEqAlarmStep->getAlarmId(),
+						pEqAlarmStep->getEquipment()->getID(),
+						pEqAlarmStep->getUnitId(),
+						CToolUnits::getCurrentTimeString());
 				}
 
 				m_hsmsPassive.requestAlarmReport(pEqAlarmStep->getAlarmState(),

--
Gitblit v1.9.3