diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs
index 4e087cd..c981ed7 100644
--- a/CapMachine.Wpf/Models/CsvRecordModel.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModel.cs
@@ -66,23 +66,23 @@ namespace CapMachine.Wpf.Models
[Name("COND1温度[℃]")]
public double Cond1Temp { get; set; }
- ///
- /// 润滑油压力[BarA]
- ///
- [Name("润滑油压力[BarA]")]
- public double LubePress { get; set; }
+ /////
+ ///// 润滑油压力[BarA]
+ /////
+ //[Name("润滑油压力[BarA]")]
+ //public double LubePress { get; set; }
- ///
- /// COND2压力[BarA]
- ///
- [Name("COND2压力[BarA]")]
- public double Cond2Press { get; set; }
+ /////
+ ///// COND2压力[BarA]
+ /////
+ //[Name("COND2压力[BarA]")]
+ //public double Cond2Press { get; set; }
- ///
- /// OCR[%]
- ///
- [Name("OCR[%]")]
- public double OCR { get; set; }
+ /////
+ ///// OCR[%]
+ /////
+ //[Name("OCR[%]")]
+ //public double OCR { get; set; }
///
/// HV[V]
@@ -133,11 +133,11 @@ namespace CapMachine.Wpf.Models
[Name("环境湿度[%]")]
public double EnvRH { get; set; }
- ///
- /// OS1温度[℃]
- ///
- [Name("OS1温度[℃]")]
- public double OS1Temp { get; set; }
+ /////
+ ///// OS1温度[℃]
+ /////
+ //[Name("OS1温度[℃]")]
+ //public double OS1Temp { get; set; }
///
/// OS2温度[℃]
@@ -146,29 +146,29 @@ namespace CapMachine.Wpf.Models
[Name("OS2温度[℃]")]
public double OS2Temp { get; set; }
- ///
- /// COND2温度[℃]
- ///
- [Name("COND2温度[℃]")]
- public double Cond2Temp { get; set; }
+ /////
+ ///// COND2温度[℃]
+ /////
+ //[Name("COND2温度[℃]")]
+ //public double Cond2Temp { get; set; }
- ///
- /// EVAP出口温度[℃]
- ///
- [Name("EVAP出口温度[℃]")]
- public double EVAPExpTemp { get; set; }
+ /////
+ ///// EVAP出口温度[℃]
+ /////
+ //[Name("EVAP出口温度[℃]")]
+ //public double EVAPExpTemp { get; set; }
- ///
- /// 冷媒流量[L/min]
- ///
- [Name("冷媒流量[L/min]")]
- public double VRV { get; set; }
+ /////
+ ///// 冷媒流量[L/min]
+ /////
+ //[Name("冷媒流量[L/min]")]
+ //public double VRV { get; set; }
- ///
- /// 润滑油流量[L/min]
- ///
- [Name("润滑油流量[L/min]")]
- public double LubeFlow { get; set; }
+ /////
+ ///// 润滑油流量[L/min]
+ /////
+ //[Name("润滑油流量[L/min]")]
+ //public double LubeFlow { get; set; }
///
/// 排气温度[℃]
@@ -205,11 +205,11 @@ namespace CapMachine.Wpf.Models
[Name("冷凝器进口压力[BarA]")]
public double CondInPress { get; set; }
- ///
- /// EVAP出口压力[BarA]
- ///
- [Name("EVAP出口压力[BarA]")]
- public double EVAPExpPress { get; set; }
+ /////
+ ///// EVAP出口压力[BarA]
+ /////
+ //[Name("EVAP出口压力[BarA]")]
+ //public double EVAPExpPress { get; set; }
///
/// 水箱进水温度[℃]
@@ -246,35 +246,35 @@ namespace CapMachine.Wpf.Models
[Name("压缩机表面温度3[℃]")]
public double CapSurfTemp3 { get; set; }
- ///
- /// 腔内压力[BarA]
- ///
- [Name("腔内压力[BarA]")]
- public double IntrplPress { get; set; }
+ /////
+ ///// 腔内压力[BarA]
+ /////
+ //[Name("腔内压力[BarA]")]
+ //public double IntrplPress { get; set; }
- ///
- /// 压缩机表面温度[℃]
- ///
- [Name("压缩机表面温度[℃]")]
- public double CapSurfTemp { get; set; }
+ /////
+ ///// 压缩机表面温度[℃]
+ /////
+ //[Name("压缩机表面温度[℃]")]
+ //public double CapSurfTemp { get; set; }
- ///
- /// PTC流量[L/min]
- ///
- [Name("PTC流量[L/min]")]
- public double PTCFlow { get; set; }
+ /////
+ ///// PTC流量[L/min]
+ /////
+ //[Name("PTC流量[L/min]")]
+ //public double PTCFlow { get; set; }
- ///
- /// PTC入水温度[℃]
- ///
- [Name("PTC入水温度[℃]")]
- public double PTCEntTemp { get; set; }
+ /////
+ ///// PTC入水温度[℃]
+ /////
+ //[Name("PTC入水温度[℃]")]
+ //public double PTCEntTemp { get; set; }
- ///
- /// PTC出水温度[℃]
- ///
- [Name("PTC出水温度[℃]")]
- public double PTCExpTemp { get; set; }
+ /////
+ ///// PTC出水温度[℃]
+ /////
+ //[Name("PTC出水温度[℃]")]
+ //public double PTCExpTemp { get; set; }
///
/// 通讯Cmp母线电流[A]
@@ -290,11 +290,11 @@ namespace CapMachine.Wpf.Models
[Name("通讯Cmp母线电压[V]")]
public double ComCapBusVol { get; set; }
- ///
- /// 通讯Cmp逆变器温度[℃]
- ///
- [Name("通讯Cmp逆变器温度[℃]")]
- public double ComCapInvTemp { get; set; }
+ /////
+ ///// 通讯Cmp逆变器温度[℃]
+ /////
+ //[Name("通讯Cmp逆变器温度[℃]")]
+ //public double ComCapInvTemp { get; set; }
///
/// 通讯Cmp相电流[A]
@@ -317,41 +317,41 @@ namespace CapMachine.Wpf.Models
[Name("通讯Cmp芯片温度[℃]")]
public double ComCapChipTemp { get; set; }
- ///
- /// 通讯PTC入水温度[℃]
- ///
- [Name("通讯PTC入水温度[℃]")]
- public double ComPTCEntTemp { get; set; }
+ /////
+ ///// 通讯PTC入水温度[℃]
+ /////
+ //[Name("通讯PTC入水温度[℃]")]
+ //public double ComPTCEntTemp { get; set; }
- ///
- /// 通讯PTC出水温度[℃]
- ///
- [Name("通讯PTC出水温度[℃]")]
- public double ComPTCExpTemp { get; set; }
+ /////
+ ///// 通讯PTC出水温度[℃]
+ /////
+ //[Name("通讯PTC出水温度[℃]")]
+ //public double ComPTCExpTemp { get; set; }
- ///
- /// 通讯PTC峰值电流[A]
- ///
- [Name("通讯PTC峰值电流[A]")]
- public double ComPTCPeakCur { get; set; }
+ /////
+ ///// 通讯PTC峰值电流[A]
+ /////
+ //[Name("通讯PTC峰值电流[A]")]
+ //public double ComPTCPeakCur { get; set; }
- ///
- /// 通讯PTC母线电流[A]
- ///
- [Name("通讯PTC母线电流[A]")]
- public double ComPTCBusCur { get; set; }
+ /////
+ ///// 通讯PTC母线电流[A]
+ /////
+ //[Name("通讯PTC母线电流[A]")]
+ //public double ComPTCBusCur { get; set; }
- ///
- /// 通讯PTC膜温[℃]
- ///
- [Name("通讯PTC膜温[℃]")]
- public double ComPTCFlmTemp { get; set; }
+ /////
+ ///// 通讯PTC膜温[℃]
+ /////
+ //[Name("通讯PTC膜温[℃]")]
+ //public double ComPTCFlmTemp { get; set; }
- ///
- /// 通讯PTC模块温度[℃]
- ///
- [Name("通讯PTC模块温度[℃]")]
- public double ComPTCMdTemp { get; set; }
+ /////
+ ///// 通讯PTC模块温度[℃]
+ /////
+ //[Name("通讯PTC模块温度[℃]")]
+ //public double ComPTCMdTemp { get; set; }
///
/// 过冷度[K]
@@ -374,266 +374,6 @@ namespace CapMachine.Wpf.Models
public DateTime CreateTime { get; set; }
-
-
-
-
-
-
-
-
- /////
- ///// 转速
- /////
- //[Name("转速")]
- //public int Speed { get; set; }
-
- /////
- ///// 排气压力
- /////
- //[Name("排气压力")]
- //public double ExPress { get; set; }
-
- /////
- ///// 吸气压力
- /////
- //[Name("吸气压力")]
- //public double InhPress { get; set; }
-
- /////
- ///// 吸气温度
- /////
- //[Name("吸气温度")]
- //public double InhTemp { get; set; }
-
- /////
- ///// COND1温度
- /////
- //[Name("COND1温度")]
- //public double Cond1Temp { get; set; }
-
- /////
- ///// 润滑油压力
- /////
- //[Name("润滑油压力")]
- //public double LubePress { get; set; }
-
- /////
- ///// COND2压力
- /////
- //[Name("COND2压力")]
- //public double Cond2Press { get; set; }
-
- /////
- ///// OCR
- /////
- //[Name("OCR")]
- //public double OCR { get; set; }
-
- /////
- ///// HV
- /////
- //[Name("HV")]
- //public double HV { get; set; }
-
- /////
- ///// HV电流
- /////
- //[Name("HV电流")]
- //public double HVCur { get; set; }
-
- /////
- ///// HV功率
- /////
- //[Name("HV功率")]
- //public double HVPw { get; set; }
-
- /////
- ///// LV
- /////
- //[Name("LV")]
- //public double LV { get; set; }
-
- /////
- ///// LV电流
- /////
- //[Name("LV电流")]
- //public double LVCur { get; set; }
-
- /////
- ///// 环境温度
- /////
- //[Name("环境温度")]
- //public double EnvTemp { get; set; }
-
- /////
- ///// 环境湿度
- /////
- //[Name("环境湿度")]
- //public double EnvRH { get; set; }
-
- /////
- ///// OS1温度
- /////
- //[Name("OS1温度")]
- //public double OS1Temp { get; set; }
-
- /////
- ///// OS2温度
- /////
- //[Name("OS2温度")]
- //public double OS2Temp { get; set; }
-
- /////
- ///// COND2温度
- /////
- //[Name("COND2温度")]
- //public double Cond2Temp { get; set; }
-
- /////
- ///// EVAP出口温度
- /////
- //[Name("EVAP出口温度")]
- //public double EVAPExpTemp { get; set; }
-
- /////
- ///// 冷媒流量
- /////
- //[Name("冷媒流量")]
- //public double VRV { get; set; }
-
- /////
- ///// 润滑油流量
- /////
- //[Name("润滑油流量")]
- //public double LubeFlow { get; set; }
-
- /////
- ///// 排气温度
- /////
- //[Name("排气温度")]
- //public double ExTemp { get; set; }
-
- /////
- ///// 膨胀阀前压力
- /////
- //[Name("膨胀阀前压力")]
- //public double TxvFrPress { get; set; }
-
- /////
- ///// 膨胀阀前温度
- /////
- //[Name("膨胀阀前温度")]
- //public double TxvFrTemp { get; set; }
-
- /////
- ///// EVAP出口压力
- /////
- //[Name("EVAP出口压力")]
- //public double EVAPExpPress { get; set; }
-
- /////
- ///// 腔内压力
- /////
- //[Name("腔内压力")]
- //public double IntrplPress { get; set; }
-
- /////
- ///// 压缩机表面温度
- /////
- //[Name("压缩机表面温度")]
- //public double CapSurfTemp { get; set; }
-
- /////
- ///// PTC流量
- /////
- //[Name("PTC流量")]
- //public double PTCFlow { get; set; }
-
- /////
- ///// PTC入水温度
- /////
- //[Name("PTC入水温度")]
- //public double PTCEntTemp { get; set; }
-
- /////
- ///// PTC出水温度
- /////
- //[Name("PTC出水温度")]
- //public double PTCExpTemp { get; set; }
-
- /////
- ///// 通讯Cmp母线电流
- /////
- //[Name("通讯Cmp母线电流")]
- //public double ComCapBusCur { get; set; }
-
- /////
- ///// 通讯Cmp母线电压
- /////
- //[Name("通讯Cmp母线电压")]
- //public double ComCapBusVol { get; set; }
-
- /////
- ///// 通讯Cmp逆变器温度
- /////
- //[Name("通讯Cmp逆变器温度")]
- //public double ComCapInvTemp { get; set; }
-
- /////
- ///// 通讯Cmp相电流
- /////
- //[Name("通讯Cmp相电流")]
- //public double ComCapPhCur { get; set; }
-
- /////
- ///// 通讯Cmp功率
- /////
- //[Name("通讯Cmp功率")]
- //public double ComCapPw { get; set; }
-
- /////
- ///// 通讯Cmp芯片温度
- /////
- //[Name("通讯Cmp芯片温度")]
- //public double ComCapChipTemp { get; set; }
-
- /////
- ///// 通讯PTC入水温度
- /////
- //[Name("通讯PTC入水温度")]
- //public double ComPTCEntTemp { get; set; }
-
- /////
- ///// 通讯PTC出水温度
- /////
- //[Name("通讯PTC出水温度")]
- //public double ComPTCExpTemp { get; set; }
-
- /////
- ///// 通讯PTC峰值电流
- /////
- //[Name("通讯PTC峰值电流")]
- //public double ComPTCPeakCur { get; set; }
-
- /////
- ///// 通讯PTC母线电流
- /////
- //[Name("通讯PTC母线电流")]
- //public double ComPTCBusCur { get; set; }
-
- /////
- ///// 通讯PTC膜温
- /////
- //[Name("通讯PTC膜温")]
- //public double ComPTCFlmTemp { get; set; }
-
- /////
- ///// 通讯PTC模块温度
- /////
- //[Name("通讯PTC模块温度")]
- //public double ComPTCMdTemp { get; set; }
-
}
[AttributeUsage(AttributeTargets.Property)]
diff --git a/CapMachine.Wpf/Models/CsvRecordModelMap.cs b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
index 02ce2f7..1d48d42 100644
--- a/CapMachine.Wpf/Models/CsvRecordModelMap.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
@@ -68,9 +68,7 @@ namespace CapMachine.Wpf.Models
Map(m => m.InhPress).Name("吸气压力[BarA]");
Map(m => m.InhTemp).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.OS2Temp).Name("OS2温度[℃]");
Map(m => m.HV).Name("HV[V]");
Map(m => m.HVCur).Name("HV[A]");
Map(m => m.HVPw).Name("HV[W]");
@@ -78,33 +76,46 @@ namespace CapMachine.Wpf.Models
Map(m => m.LVCur).Name("LV[A]");
Map(m => m.EnvTemp).Name("环境温度[℃]");
Map(m => m.EnvRH).Name("环境湿度[%]");
- Map(m => m.OS1Temp).Name("OS1温度[℃]");
- 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]");
Map(m => m.ExTemp).Name("排气温度[℃]");
Map(m => m.TxvFrPress).Name("膨胀阀前压力[BarA]");
Map(m => m.TxvFrTemp).Name("膨胀阀前温度[℃]");
- Map(m => m.EVAPExpPress).Name("EVAP出口压力[BarA]");
- Map(m => m.IntrplPress).Name("腔内压力[BarA]");
- Map(m => m.CapSurfTemp).Name("压缩机表面温度[℃]");
- Map(m => m.PTCFlow).Name("PTC流量[L/min]");
- Map(m => m.PTCEntTemp).Name("PTC入水温度[℃]");
- Map(m => m.PTCExpTemp).Name("PTC出水温度[℃]");
+
+ Map(m => m.CondInTemp).Name("冷凝器进口温度[℃]");
+ Map(m => m.CondInPress).Name("冷凝器进口压力[BarA]");
+ Map(m => m.WaterTankInTemp).Name("水箱进水温度[℃]");
+ Map(m => m.WaterHeatTempH1).Name("水加热温度H1[℃]");
+ Map(m => m.CapSurfTemp1).Name("压缩机表面温度1[℃]");
+ Map(m => m.CapSurfTemp2).Name("压缩机表面温度2[℃]");
+ Map(m => m.CapSurfTemp3).Name("压缩机表面温度3[℃]");
+
+ //Map(m => m.LubePress).Name("润滑油压力[BarA]");
+ //Map(m => m.Cond2Press).Name("COND2压力[BarA]");
+ //Map(m => m.OCR).Name("OCR[%]");
+ //Map(m => m.OS1Temp).Name("OS1温度[℃]");
+ //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]");
+ //Map(m => m.EVAPExpPress).Name("EVAP出口压力[BarA]");
+ //Map(m => m.IntrplPress).Name("腔内压力[BarA]");
+ //Map(m => m.CapSurfTemp).Name("压缩机表面温度[℃]");
+ //Map(m => m.PTCFlow).Name("PTC流量[L/min]");
+ //Map(m => m.PTCEntTemp).Name("PTC入水温度[℃]");
+ //Map(m => m.PTCExpTemp).Name("PTC出水温度[℃]");
Map(m => m.ComCapBusCur).Name("通讯Cmp母线电流[A]");
Map(m => m.ComCapBusVol).Name("通讯Cmp母线电压[V]");
- Map(m => m.ComCapInvTemp).Name("通讯Cmp逆变器温度[℃]");
+ //Map(m => m.ComCapInvTemp).Name("通讯Cmp逆变器温度[℃]");
Map(m => m.ComCapPhCur).Name("通讯Cmp相电流[A]");
Map(m => m.ComCapPw).Name("通讯Cmp功率[W]");
Map(m => m.ComCapChipTemp).Name("通讯Cmp芯片温度[℃]");
- Map(m => m.ComPTCEntTemp).Name("通讯PTC入水温度[℃]");
- Map(m => m.ComPTCExpTemp).Name("通讯PTC出水温度[℃]");
- Map(m => m.ComPTCPeakCur).Name("通讯PTC峰值电流[A]");
- Map(m => m.ComPTCBusCur).Name("通讯PTC母线电流[A]");
- Map(m => m.ComPTCFlmTemp).Name("通讯PTC膜温[℃]");
- Map(m => m.ComPTCMdTemp).Name("通讯PTC模块温度[℃]");
+ Map(m => m.Subcooling).Name("过冷度[K]");
+ Map(m => m.Superheat).Name("过热度[K]");
+ //Map(m => m.ComPTCEntTemp).Name("通讯PTC入水温度[℃]");
+ //Map(m => m.ComPTCExpTemp).Name("通讯PTC出水温度[℃]");
+ //Map(m => m.ComPTCPeakCur).Name("通讯PTC峰值电流[A]");
+ //Map(m => m.ComPTCBusCur).Name("通讯PTC母线电流[A]");
+ //Map(m => m.ComPTCFlmTemp).Name("通讯PTC膜温[℃]");
+ //Map(m => m.ComPTCMdTemp).Name("通讯PTC模块温度[℃]");
Map(m => m.CreateTime).Name("时间");