From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/CPageReport.cpp |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPageReport.cpp b/SourceCode/Bond/Servo/CPageReport.cpp
index d2900e3..0066c9b 100644
--- a/SourceCode/Bond/Servo/CPageReport.cpp
+++ b/SourceCode/Bond/Servo/CPageReport.cpp
@@ -64,7 +64,7 @@
 	m_listCtrl.InsertColumn(0, _T(""), LVCFMT_RIGHT, width[0]);
 	m_listCtrl.InsertColumn(1, _T("RPT ID"), LVCFMT_LEFT, width[1]);
 	m_listCtrl.InsertColumn(2, _T("VID"), LVCFMT_LEFT, width[2]);
-	// loadVariables();
+	loadReports();
 
 	return TRUE;  // return TRUE unless you set the focus to a control
 				  // 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
@@ -108,8 +108,18 @@
 	CHMPropertyPage::OnSize(nType, cx, cy);
 	if (GetDlgItem(IDC_LIST1) == nullptr) return;
 
-	CWnd* pItem;
 	CRect rcClient, rcItem;
 	GetClientRect(&rcClient);
 	m_listCtrl.MoveWindow(12, 12, rcClient.Width() - 24, rcClient.Height() - 24);
 }
+
+void CPageReport::loadReports()
+{
+	auto& reports = theApp.m_model.m_hsmsPassive.getReports();
+	for (auto item : reports) {
+		int index = m_listCtrl.InsertItem(m_listCtrl.GetItemCount(), _T(""));
+		m_listCtrl.SetItemData(index, (DWORD_PTR)item);
+		m_listCtrl.SetItemText(index, 1, std::to_string(item->getReportId()).c_str());
+		m_listCtrl.SetItemText(index, 2, item->getVariablesIdsText().c_str());
+	}
+}

--
Gitblit v1.9.3