diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs index 1376884..10a37d9 100644 --- a/CapMachine.Wpf/Models/CsvRecordModel.cs +++ b/CapMachine.Wpf/Models/CsvRecordModel.cs @@ -295,6 +295,66 @@ namespace CapMachine.Wpf.Models [Name("通讯PTC模块温度[℃]")] public double ComPTCMdTemp { get; set; } + /// + /// 液冷媒流量[kg/h] + /// + [Name("液冷媒流量[kg/h]")] + public double LiqRefFlow { get; set; } + + /// + /// 干度流量[kg/h] + /// + [Name("干度流量[kg/h]")] + public double DryFlow { get; set; } + + /// + /// H5吸气混合器温度[℃] + /// + [Name("H5吸气混合器温度[℃]")] + public double H5InhMixTemp { get; set; } + + /// + /// COND循环水温[℃] + /// + [Name("COND循环水温[℃]")] + public double CONDCirWaterTemp { get; set; } + + /// + /// SUBCOOL出口温度[℃] + /// + [Name("SUBCOOL出口温度[℃]")] + public double SubcoolOutTemp { get; set; } + + /// + /// 吸气混合器出口温度[℃] + /// + [Name("吸气混合器出口温度[℃]")] + public double InhMixOutTemp { get; set; } + + /// + /// H1出口温度[℃] + /// + [Name("H1出口温度[℃]")] + public double H1OutTemp { get; set; } + + /// + /// S.C循环水温[℃] + /// + [Name("S.C循环水温[℃]")] + public double SCCirWaterTemp { get; set; } + + /// + /// EVAP循环水温[℃] + /// + [Name("EVAP循环水温[℃]")] + public double EvapCirWaterTemp { get; set; } + + /// + /// 吸气混合器出口压力[BarA] + /// + [Name("吸气混合器出口压力[BarA]")] + public double InhMixOutPress { get; set; } + /// /// 创建时间 /// diff --git a/CapMachine.Wpf/Models/CsvRecordModelMap.cs b/CapMachine.Wpf/Models/CsvRecordModelMap.cs index 0c45509..65b9433 100644 --- a/CapMachine.Wpf/Models/CsvRecordModelMap.cs +++ b/CapMachine.Wpf/Models/CsvRecordModelMap.cs @@ -62,6 +62,16 @@ namespace CapMachine.Wpf.Models Map(m => m.ComPTCBusCur).Name("通讯PTC母线电流[A]"); Map(m => m.ComPTCFlmTemp).Name("通讯PTC膜温[℃]"); Map(m => m.ComPTCMdTemp).Name("通讯PTC模块温度[℃]"); + Map(m => m.LiqRefFlow).Name("液冷媒流量[kg/h]"); + Map(m => m.DryFlow).Name("干度流量[kg/h]"); + Map(m => m.H5InhMixTemp).Name("H5吸气混合器温度[℃]"); + Map(m => m.CONDCirWaterTemp).Name("COND循环水温[℃]"); + Map(m => m.SubcoolOutTemp).Name("SUBCOOL出口温度[℃]"); + Map(m => m.InhMixOutTemp).Name("吸气混合器出口温度[℃]"); + Map(m => m.H1OutTemp).Name("H1出口温度[℃]"); + Map(m => m.SCCirWaterTemp).Name("S.C循环水温[℃]"); + Map(m => m.EvapCirWaterTemp).Name("EVAP循环水温[℃]"); + Map(m => m.InhMixOutPress).Name("吸气混合器出口压力[BarA]"); Map(m => m.CreateTime).Name("时间"); diff --git a/CapMachine.Wpf/Models/LightChart/ChartManager.cs b/CapMachine.Wpf/Models/LightChart/ChartManager.cs index 8e027b1..d995146 100644 --- a/CapMachine.Wpf/Models/LightChart/ChartManager.cs +++ b/CapMachine.Wpf/Models/LightChart/ChartManager.cs @@ -289,6 +289,26 @@ namespace CapMachine.Wpf.Models.LightChart return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComPTCFlmTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); case "通讯PTC模块温度[℃]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComPTCMdTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "液冷媒流量[kg/h]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.LiqRefFlow, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "干度流量[kg/h]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.DryFlow, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "H5吸气混合器温度[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.H5InhMixTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "COND循环水温[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.CONDCirWaterTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "SUBCOOL出口温度[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.SubcoolOutTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "吸气混合器出口温度[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.InhMixOutTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "H1出口温度[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.H1OutTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "S.C循环水温[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.SCCirWaterTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "EVAP循环水温[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.EvapCirWaterTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "吸气混合器出口压力[BarA]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.InhMixOutPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); default: return CurHistoryData.Select(a => new ChartPoint() { Value = a.Speed, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); break; diff --git a/CapMachine.Wpf/Services/DataRecordService.cs b/CapMachine.Wpf/Services/DataRecordService.cs index 7466e19..bd20512 100644 --- a/CapMachine.Wpf/Services/DataRecordService.cs +++ b/CapMachine.Wpf/Services/DataRecordService.cs @@ -148,6 +148,16 @@ namespace CapMachine.Wpf.Services new Columns(){ Name="通讯PTC母线电流[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="通讯PTC膜温[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="通讯PTC模块温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="液冷媒流量[kg/h]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="干度流量[kg/h]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="H5吸气混合器温度[℃]",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="H1出口温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="S.C循环水温[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="EVAP循环水温[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="吸气混合器出口压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="创建时间",MapType="System.DateTime",IsIdentity=false,IsPrimary=false},