From 8294c107676c18538c6e06fe8eab2d209604ac6a Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 19 一月 2026 18:34:06 +0800
Subject: [PATCH] 1.完善和优化界面显示，数据懒加载，等待光标等，修复启动时界面卡的问题。 2.SVData的Push的限制和检查，因发现Glass呆在机器中时，不管机台是否运行都在不停压入数据。

---
 SourceCode/Bond/Servo/CPageGlassList.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPageGlassList.h b/SourceCode/Bond/Servo/CPageGlassList.h
index 09e548a..38a35c7 100644
--- a/SourceCode/Bond/Servo/CPageGlassList.h
+++ b/SourceCode/Bond/Servo/CPageGlassList.h
@@ -1,6 +1,7 @@
 锘�#pragma once
 #include "CExpandableListCtrl.h"
 #include "GlassLogDb.h"
+#include <unordered_map>
 
 // ====== 缂栬瘧寮�鍏宠鏄� ======
 // USE_MOCK_SENSOR_DATA: 1=鍚敤妯℃嫙浼犳劅鍣ㄦ暟鎹敓鎴愶紱0=浣跨敤鐪熷疄鏁版嵁
@@ -65,7 +66,7 @@
 	void ExportBasicInfo(CString& csvContent, const GlassLogDb::Row& row);
 	void ExportProcessParams(CString& csvContent, const GlassLogDb::Row& row);
 	void ExportSensorData(CString& csvContent, const GlassLogDb::Row& row);
-	static std::vector<std::string> getMachineColumnOrder(int machineId);
+	static std::vector<std::string> getMachineColumnOrder(int machineId, const std::unordered_map<std::string, std::vector<SERVO::SVDataItem>>* actualData = nullptr);
 	static std::string timePointToString(const std::chrono::system_clock::time_point& tp);
 	static int64_t timePointToMs(const std::chrono::system_clock::time_point& tp);
 	void GenerateMockSVData(SERVO::CGlass& glass);

--
Gitblit v1.9.3