From 85eb60bd4ba7a4444f4037b467bd981a30899130 Mon Sep 17 00:00:00 2001
From: Tyrone CT <chongtao@yeah.net>
Date: Tue, 8 Jul 2025 22:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=94=B9=E9=94=99=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E9=83=A8=E5=88=86=E9=87=8D=E6=96=B0=E5=A4=8D=E4=BD=8D?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CapMachine.Wpf/Models/CsvRecordModel.cs       |  20 +++++++++---------
 CapMachine.Wpf/Models/CsvRecordModelMap.cs    |  10 ++++-----
 .../Models/LightChart/ChartManager.cs         |  10 ++++-----
 CapMachine.Wpf/ReportFile/快速程序模版.xlsx   | Bin 12674 -> 12807 bytes
 CapMachine.Wpf/Services/DataRecordService.cs  |   6 +++---
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs
index 9950558..1376884 100644
--- a/CapMachine.Wpf/Models/CsvRecordModel.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModel.cs
@@ -56,21 +56,21 @@ namespace CapMachine.Wpf.Models
         public double InhTemp { get; set; }
 
         /// <summary>
-        /// COND1温度[℃] COND循环水温
+        /// COND1温度[℃]
         /// </summary>
-        [Name("COND循环水温[℃]")]
+        [Name("COND1温度[℃]")]
         public double Cond1Temp { get; set; }
 
         /// <summary>
-        /// 润滑油压力[BarA] SUBCOOL出口温度
+        /// 润滑油压力[BarA]
         /// </summary>
-        [Name("SUBCOOL出口温度[℃]")]
+        [Name("润滑油压力[BarA]")]
         public double LubePress { get; set; }
 
         /// <summary>
-        /// COND2压力[BarA] 吸气混合器出口温度
+        /// COND2压力[BarA]
         /// </summary>
-        [Name("吸气混合器出口温度[℃]")]
+        [Name("COND2压力[BarA]")]
         public double Cond2Press { get; set; }
 
         /// <summary>
@@ -128,15 +128,15 @@ namespace CapMachine.Wpf.Models
         public double OS1Temp { get; set; }
 
         /// <summary>
-        /// OS2温度[℃] H1出口温度
+        /// OS2温度[℃]
         /// </summary>
-        [Name("H1出口温度[℃]")]
+        [Name("OS2温度[℃]")]
         public double OS2Temp { get; set; }
 
         /// <summary>
-        /// COND2温度[℃] H5吸气混合器温度
+        /// COND2温度[℃]
         /// </summary>
-        [Name("H5吸气混合器温度[℃]")]
+        [Name("COND2温度[℃]")]
         public double Cond2Temp { get; set; }
 
         /// <summary>
diff --git a/CapMachine.Wpf/Models/CsvRecordModelMap.cs b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
index 14c4932..0c45509 100644
--- a/CapMachine.Wpf/Models/CsvRecordModelMap.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
@@ -22,9 +22,9 @@ namespace CapMachine.Wpf.Models
             Map(m => m.ExPress).Name("排气压力[BarA]");
             Map(m => m.InhPress).Name("吸气压力[BarA]");
             Map(m => m.InhTemp).Name("吸气温度[℃]");
-            Map(m => m.Cond1Temp).Name("COND循环水温[℃]");
-            Map(m => m.LubePress).Name("SUBCOOL出口温度[℃]");
-            Map(m => m.Cond2Press).Name("吸气混合器出口温度[℃]");
+            Map(m => m.Cond1Temp).Name("COND1温度[℃]");
+            Map(m => m.LubePress).Name("润滑油压力[BarA]");
+            Map(m => m.Cond2Press).Name("COND2压力[BarA]");
             Map(m => m.OCR).Name("OCR[%]");
             Map(m => m.HV).Name("HV[V]");
             Map(m => m.HVCur).Name("HV[A]");
@@ -34,8 +34,8 @@ namespace CapMachine.Wpf.Models
             Map(m => m.EnvTemp).Name("环境温度[℃]");
             Map(m => m.EnvRH).Name("环境湿度[%]");
             Map(m => m.OS1Temp).Name("OS1温度[℃]");
-            Map(m => m.OS2Temp).Name("H1出口温度[℃]");
-            Map(m => m.Cond2Temp).Name("H5吸气混合器温度[℃]");
+            Map(m => m.OS2Temp).Name("OS2温度[℃]");
+            Map(m => m.Cond2Temp).Name("COND2温度[℃]");
             Map(m => m.EVAPExpTemp).Name("EVAP出口温度[℃]");
             Map(m => m.VRV).Name("冷媒流量[L/min]");
             Map(m => m.LubeFlow).Name("润滑油流量[L/min]");
diff --git a/CapMachine.Wpf/Models/LightChart/ChartManager.cs b/CapMachine.Wpf/Models/LightChart/ChartManager.cs
index 2bf83c6..8e027b1 100644
--- a/CapMachine.Wpf/Models/LightChart/ChartManager.cs
+++ b/CapMachine.Wpf/Models/LightChart/ChartManager.cs
@@ -209,11 +209,11 @@ namespace CapMachine.Wpf.Models.LightChart
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.InhPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
                 case "吸气温度[℃]":
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.InhTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
-                case "COND循环水温[℃]":
+                case "COND1温度[℃]":
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond1Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
-                case "SUBCOOL出口温度[℃]":
+                case "润滑油压力[BarA]":
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.LubePress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
-                case "吸气混合器出口温度[℃]":
+                case "COND2压力[BarA]":
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond2Press, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
                 case "OCR[%]":
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.OCR, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
@@ -233,9 +233,9 @@ namespace CapMachine.Wpf.Models.LightChart
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.EnvRH, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
                 case "OS1温度[℃]":
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.OS1Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
-                case "H1出口温度[℃]":
+                case "OS2温度[℃]":
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.OS2Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
-                case "H5吸气混合器温度[℃]":
+                case "COND2温度[℃]":
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond2Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
                 case "EVAP出口温度[℃]":
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.EVAPExpTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
diff --git a/CapMachine.Wpf/ReportFile/快速程序模版.xlsx b/CapMachine.Wpf/ReportFile/快速程序模版.xlsx
index bb44b6630c4c09eb1fec6a85e22b1e24360bbe72..e1e02c9b14f7f097cdea02ce3fb9fa043b9c171b 100644
GIT binary patch
delta 4719
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
Ng_IEV5&9q9zW|=u)Z+jE

delta 4617
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

diff --git a/CapMachine.Wpf/Services/DataRecordService.cs b/CapMachine.Wpf/Services/DataRecordService.cs
index 177c642..7466e19 100644
--- a/CapMachine.Wpf/Services/DataRecordService.cs
+++ b/CapMachine.Wpf/Services/DataRecordService.cs
@@ -108,9 +108,9 @@ namespace CapMachine.Wpf.Services
                         new Columns(){ Name="排气压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
                         new Columns(){ Name="吸气压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
                         new Columns(){ Name="吸气温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
-                        new Columns(){ Name="COND循环水温[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
-                        new Columns(){ Name="SUBCOOL出口温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
-                        new Columns(){ Name="吸气混合器出口温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
+                        new Columns(){ Name="COND1温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
+                        new Columns(){ Name="润滑油压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
+                        new Columns(){ Name="COND2压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
                         new Columns(){ Name="OCR[%]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
                         new Columns(){ Name="HV[V]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
                         new Columns(){ Name="HV[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},