From 0275102b79ccf2c7fe1acf11117de8a89cca372f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 26 十二月 2025 15:27:03 +0800
Subject: [PATCH] 1.生产总览页面框架实现;

---
 SourceCode/Bond/Servo/CStep.cpp |   50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CStep.cpp b/SourceCode/Bond/Servo/CStep.cpp
index 7ffc65d..cf7dff5 100644
--- a/SourceCode/Bond/Servo/CStep.cpp
+++ b/SourceCode/Bond/Servo/CStep.cpp
@@ -53,11 +53,23 @@
 
 	void CStep::getAttributeVector(CAttributeVector& attrubutes)
 	{
+		unsigned int weight = 1;
 		attrubutes.clear();
 		attrubutes.addAttribute(new CAttribute("Network", 
-			std::to_string(m_station.nNetNo).c_str(), ""));
+			std::to_string(m_station.nNetNo).c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Station",
-			std::to_string(m_station.nStNo).c_str(), ""));
+			std::to_string(m_station.nStNo).c_str(), "", weight++));
+
+		auto as = m_attributeVector.getAttributes();
+		for (auto item : as) {
+			attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
+				item->getValue().c_str(), item->getDescription().c_str(), item->getWeight()));
+		}
+	}
+
+	CAttributeVector& CStep::attributeVector()
+	{
+		return m_attributeVector;
 	}
 
 	void CStep::init()
@@ -70,6 +82,40 @@
 
 	}
 
+	void CStep::setProp(const char* pszKey, void* pValue)
+	{
+		m_mapProp[pszKey] = pValue;
+	}
+
+	void* CStep::getProp(const char* pszKey)
+	{
+		auto iter = m_mapProp.find(pszKey);
+		if (iter == m_mapProp.end()) return nullptr;
+		return iter->second;
+	}
+
+	void CStep::addAttribute(CAttribute* pAttribute)
+	{
+		// 添加attribute时,要前删除存在的同名的attribute
+		m_attributeVector.addAttribute(pAttribute, TRUE);
+	}
+
+	void CStep::addAttributeVector(CAttributeVector& attributeVector)
+	{
+		// 添加attribute时,要前删除存在的同名的attribute
+		std::vector<CAttribute*>& srcs = attributeVector.getAttributes();
+		auto it = srcs.begin();
+		while (it != srcs.end()) {
+			BOOL bAdd = m_attributeVector.addAttribute((*it), TRUE);
+			if (bAdd) {
+				it = srcs.erase(it);
+			}
+			else {
+				++it;
+			}
+		}
+	}
+
 	void CStep::convertString(const char* pszBuffer, int size, std::string& strOut)
 	{
 		strOut.clear();

--
Gitblit v1.9.3