From 93782ae523667cd742c5a99e8df9a34dc503523b Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期二, 11 十一月 2025 09:12:36 +0800 Subject: [PATCH] 1.修复保存单条记录时未保存曲线数据的问题; --- 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