TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

变量改错了，部分重新复位变量

Browse Source
This commit is contained in:
Tyrone CT
2025-07-08 22:28:41 +08:00
parent d9b3c2d7ce
commit 85eb60bd4b
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CapMachine.Wpf/Models/CsvRecordModel.cs
View File

@@ -56,21 +56,21 @@ namespace CapMachine.Wpf.Models
public double InhTemp { get; set; } public double InhTemp { get; set; }
/// <summary> /// <summary>
/// COND1温度[℃] COND循环水温 /// COND1温度[℃]
/// </summary> /// </summary>
[Name("COND循环水温[℃]")] [Name("COND1温度[℃]")]
public double Cond1Temp { get; set; } public double Cond1Temp { get; set; }
/// <summary> /// <summary>
/// 润滑油压力[BarA] SUBCOOL出口温度 /// 润滑油压力[BarA]
/// </summary> /// </summary>
[Name("SUBCOOL出口温度[℃]")] [Name("润滑油压力[BarA]")]
public double LubePress { get; set; } public double LubePress { get; set; }
/// <summary> /// <summary>
/// COND2压力[BarA] 吸气混合器出口温度 /// COND2压力[BarA]
/// </summary> /// </summary>
[Name("吸气混合器出口温度[℃]")] [Name("COND2压力[BarA]")]
public double Cond2Press { get; set; } public double Cond2Press { get; set; }
/// <summary> /// <summary>
@@ -128,15 +128,15 @@ namespace CapMachine.Wpf.Models
public double OS1Temp { get; set; } public double OS1Temp { get; set; }
/// <summary> /// <summary>
/// OS2温度[℃] H1出口温度 /// OS2温度[℃]
/// </summary> /// </summary>
[Name("H1出口温度[℃]")] [Name("OS2温度[℃]")]
public double OS2Temp { get; set; } public double OS2Temp { get; set; }
/// <summary> /// <summary>
/// COND2温度[℃] H5吸气混合器温度 /// COND2温度[℃]
/// </summary> /// </summary>
[Name("H5吸气混合器温度[℃]")] [Name("COND2温度[℃]")]
public double Cond2Temp { get; set; } public double Cond2Temp { get; set; }
/// <summary> /// <summary>

10
CapMachine.Wpf/Models/CsvRecordModelMap.cs
View File

@@ -22,9 +22,9 @@ namespace CapMachine.Wpf.Models
Map(m => m.ExPress).Name("排气压力[BarA]"); Map(m => m.ExPress).Name("排气压力[BarA]");
Map(m => m.InhPress).Name("吸气压力[BarA]"); Map(m => m.InhPress).Name("吸气压力[BarA]");
Map(m => m.InhTemp).Name("吸气温度[℃]"); Map(m => m.InhTemp).Name("吸气温度[℃]");
Map(m => m.Cond1Temp).Name("COND循环水温[℃]"); Map(m => m.Cond1Temp).Name("COND1温度[℃]");
Map(m => m.LubePress).Name("SUBCOOL出口温度[℃]"); Map(m => m.LubePress).Name("润滑油压力[BarA]");
Map(m => m.Cond2Press).Name("吸气混合器出口温度[℃]"); Map(m => m.Cond2Press).Name("COND2压力[BarA]");
Map(m => m.OCR).Name("OCR[%]"); Map(m => m.OCR).Name("OCR[%]");
Map(m => m.HV).Name("HV[V]"); Map(m => m.HV).Name("HV[V]");
Map(m => m.HVCur).Name("HV[A]"); Map(m => m.HVCur).Name("HV[A]");
@@ -34,8 +34,8 @@ namespace CapMachine.Wpf.Models
Map(m => m.EnvTemp).Name("环境温度[℃]"); Map(m => m.EnvTemp).Name("环境温度[℃]");
Map(m => m.EnvRH).Name("环境湿度[%]"); Map(m => m.EnvRH).Name("环境湿度[%]");
Map(m => m.OS1Temp).Name("OS1温度[℃]"); Map(m => m.OS1Temp).Name("OS1温度[℃]");
Map(m => m.OS2Temp).Name("H1出口温度[℃]"); Map(m => m.OS2Temp).Name("OS2温度[℃]");
Map(m => m.Cond2Temp).Name("H5吸气混合器温度[℃]"); Map(m => m.Cond2Temp).Name("COND2温度[℃]");
Map(m => m.EVAPExpTemp).Name("EVAP出口温度[℃]"); Map(m => m.EVAPExpTemp).Name("EVAP出口温度[℃]");
Map(m => m.VRV).Name("冷媒流量[L/min]"); Map(m => m.VRV).Name("冷媒流量[L/min]");
Map(m => m.LubeFlow).Name("润滑油流量[L/min]"); Map(m => m.LubeFlow).Name("润滑油流量[L/min]");

10
CapMachine.Wpf/Models/LightChart/ChartManager.cs
View File

@@ -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(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.InhPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "吸气温度[℃]": case "吸气温度[℃]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.InhTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); 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(); 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(); 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(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond2Press, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "OCR[%]": case "OCR[%]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.OCR, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); 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(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.EnvRH, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "OS1温度[℃]": case "OS1温度[℃]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.OS1Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); 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(); 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(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond2Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "EVAP出口温度[℃]": case "EVAP出口温度[℃]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.EVAPExpTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); return CurHistoryData.Select(a => new ChartPoint() { Value = a.EVAPExpTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();

BIN
CapMachine.Wpf/ReportFile/快速程序模版.xlsx
View File

Binary file not shown.

6
CapMachine.Wpf/Services/DataRecordService.cs
View File

@@ -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="吸气压力[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="吸气温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="COND循环水温[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="COND1温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="SUBCOOL出口温度[℃]",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="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="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[V]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="HV[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="HV[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},