From 11260184c3c930d0d9ccd6b65e905c7828efd3cf Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 12 九月 2025 09:44:02 +0800
Subject: [PATCH] 1. 优化报警的查询功能 2. 插入设备表数据和单元表数据 3. 修复报警查询失败的问题

---
 SourceCode/Bond/Servo/CPanelMaster.cpp |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPanelMaster.cpp b/SourceCode/Bond/Servo/CPanelMaster.cpp
index d30a62a..82c5361 100644
--- a/SourceCode/Bond/Servo/CPanelMaster.cpp
+++ b/SourceCode/Bond/Servo/CPanelMaster.cpp
@@ -118,7 +118,7 @@
 	pItem->GetWindowRect(&rcItem);
 	pItem->MoveWindow(12, (rcClient.Height() - rcItem.Height()) / 2, rcClient.Width() - 24, rcItem.Height());
 
-	m_treeCtrl.MoveWindow(5, 5, rcClient.Width() - 13, rcClient.Height() - 10);
+	m_treeCtrl.MoveWindow(5, 5, rcClient.Width() - 8, rcClient.Height() - 10);
 }
 
 
@@ -211,3 +211,22 @@
 
 	return nLevel;
 }
+
+SERVO::CEquipment* CPanelMaster::GetActiveEquipment()
+{
+	HTREEITEM hItem = m_treeCtrl.GetSelectedItem();
+	if (hItem == nullptr) return nullptr;
+
+	int nLevel = GetTreeItemLevel(hItem);
+	if (nLevel == 2) {
+		return (SERVO::CEquipment*)m_treeCtrl.GetItemData(hItem);
+	}
+	else if (nLevel == 3) {
+		SERVO::CStep* pStep = (SERVO::CStep*)m_treeCtrl.GetItemData(hItem);
+		if (pStep != nullptr) {
+			return pStep->getEquipment();
+		}
+	}
+
+	return nullptr;
+}

--
Gitblit v1.9.3