diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs
index 2b5cadb..8bdd772 100644
--- a/CapMachine.Wpf/Models/CsvRecordModel.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModel.cs
@@ -33,339 +33,255 @@ namespace CapMachine.Wpf.Models
///
/// 转速[rpm]
- /// V
///
[Name("转速[rpm]")]
public int Speed { get; set; }
///
- /// 排气压力[MpaA]
- /// V
+ /// 排气压力[BarA]
///
- [Name("排气压力[MpaA]")]
+ [Name("排气压力[BarA]")]
public double ExPress { get; set; }
///
- /// 吸气压力[MpaA]
- /// V
+ /// 吸气压力[BarA]
///
- [Name("吸气压力[MpaA]")]
+ [Name("吸气压力[BarA]")]
public double InhPress { get; set; }
///
/// 吸气温度[℃]
- /// V
///
[Name("吸气温度[℃]")]
public double InhTemp { get; set; }
///
- /// 冷凝器出口水温[℃]
- /// V COND1水温
+ /// COND1温度[℃]
///
- [Name("冷凝器出口水温[℃]")]
+ [Name("COND1温度[℃]")]
public double Cond1Temp { get; set; }
- /////
- ///// 润滑油压力[MpaA]
- /////
- //[Name("润滑油压力[MpaA]")]
- //public double LubePress { get; set; }
-
- /////
- ///// COND2压力[MpaA]
- /////
- //[Name("COND2压力[MpaA]")]
- //public double Cond2Press { get; set; }
-
- /////
- ///// OCR[%]
- /////
- //[Name("OCR[%]")]
- //public double OCR { get; set; }
+ ///
+ /// 润滑油压力[BarA]
+ ///
+ [Name("润滑油压力[BarA]")]
+ public double LubePress { get; set; }
///
- ///HV_V[V] HV[V]
- /// V
+ /// COND2压力[BarA]
///
- [Name("HV_V[V]")]
+ [Name("COND2压力[BarA]")]
+ public double Cond2Press { get; set; }
+
+ ///
+ /// OCR[%]
+ ///
+ [Name("OCR[%]")]
+ public double OCR { get; set; }
+
+ ///
+ /// HV[V]
+ ///
+ [Name("HV[V]")]
public double HV { get; set; }
///
- /// HV_A[A] HV[A]
- /// V
+ /// HV[A]
///
- [Name("HV_A[A]")]
+ [Name("HV[A]")]
public double HVCur { get; set; }
///
- ///HV_W[W] HV[W]
- /// V
+ /// HV[W]
///
- [Name("HV_W[W]")]
+ [Name("HV[W]")]
public double HVPw { get; set; }
///
- ///LV_V[V] LV[V]
- /// V
+ /// LV[V]
///
- [Name("LV_V[V]")]
+ [Name("LV[V]")]
public double LV { get; set; }
///
- ///LV_A[A] LV[A]
- /// V
+ /// LV[A]
///
- [Name("LV_A[A]")]
+ [Name("LV[A]")]
public double LVCur { get; set; }
///
- /// 试验箱温度[℃] 环境温度[℃]
- /// V
+ /// 环境温度[℃]
///
- [Name("试验箱温度[℃]")]
+ [Name("环境温度[℃]")]
public double EnvTemp { get; set; }
///
- /// 试验箱湿度[%] 环境湿度[%]
- /// V
+ /// 环境湿度[%]
///
- [Name("试验箱湿度[%]")]
+ [Name("环境湿度[%]")]
public double EnvRH { get; set; }
- /////
- ///// OS1温度[℃]
- /////
- //[Name("OS1温度[℃]")]
- //public double OS1Temp { get; set; }
+ ///
+ /// OS1温度[℃]
+ ///
+ [Name("OS1温度[℃]")]
+ public double OS1Temp { get; set; }
///
- /// 吸气混合器温度[℃] OS2温度[℃]
- /// V
+ /// OS2温度[℃]
///
- [Name("吸气混合器温度[℃]")]
+ [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; }
///
/// 排气温度[℃]
- /// V
///
[Name("排气温度[℃]")]
public double ExTemp { get; set; }
///
- /// 膨胀阀前压力[MpaA]
- /// V
+ /// 膨胀阀前压力[BarA]
///
- [Name("膨胀阀前压力[MpaA]")]
+ [Name("膨胀阀前压力[BarA]")]
public double TxvFrPress { get; set; }
///
/// 膨胀阀前温度[℃]
- /// V
///
[Name("膨胀阀前温度[℃]")]
public double TxvFrTemp { get; set; }
///
- /// 冷凝器进口温度[℃]
- /// V
+ /// EVAP出口压力[BarA]
///
- [Name("冷凝器进口温度[℃]")]
- public double CondInTemp { get; set; }
+ [Name("EVAP出口压力[BarA]")]
+ public double EVAPExpPress { get; set; }
///
- /// 冷凝器进口压力[MpaA]
- /// V
+ /// 腔内压力[BarA]
///
- [Name("冷凝器进口压力[MpaA]")]
- public double CondInPress { get; set; }
-
- /////
- ///// EVAP出口压力[MpaA]
- /////
- //[Name("EVAP出口压力[MpaA]")]
- //public double EVAPExpPress { get; set; }
+ [Name("腔内压力[BarA]")]
+ public double IntrplPress { get; set; }
///
- /// 水箱进水温度[℃]
- /// V
+ /// 压缩机表面温度[℃]
///
- [Name("水箱进水温度[℃]")]
- public double WaterTankInTemp { get; set; }
+ [Name("压缩机表面温度[℃]")]
+ public double CapSurfTemp { get; set; }
///
- /// 水加热温度H1[℃]
- /// V
+ /// PTC流量[L/min]
///
- [Name("水加热温度H1[℃]")]
- public double WaterHeatTempH1 { get; set; }
+ [Name("PTC流量[L/min]")]
+ public double PTCFlow { get; set; }
///
- /// 压缩机表面温度1[℃]
- /// V
+ /// PTC入水温度[℃]
///
- [Name("压缩机表面温度1[℃]")]
- public double CapSurfTemp1 { get; set; }
+ [Name("PTC入水温度[℃]")]
+ public double PTCEntTemp { get; set; }
///
- /// 压缩机表面温度2[℃]
- /// V
+ /// PTC出水温度[℃]
///
- [Name("压缩机表面温度2[℃]")]
- public double CapSurfTemp2 { get; set; }
+ [Name("PTC出水温度[℃]")]
+ public double PTCExpTemp { get; set; }
///
- /// 压缩机表面温度3[℃]
- /// V
+ /// 通讯Cmp母线电流[A]
///
- [Name("压缩机表面温度3[℃]")]
- public double CapSurfTemp3 { get; set; }
-
- /////
- ///// 腔内压力[MpaA]
- /////
- //[Name("腔内压力[MpaA]")]
- //public double IntrplPress { get; set; }
-
- /////
- ///// 压缩机表面温度[℃]
- /////
- //[Name("压缩机表面温度[℃]")]
- //public double CapSurfTemp { 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 PTCExpTemp { get; set; }
-
- ///
- /// 通讯母线电流[A] 通讯Cmp母线电流[A]
- /// V
- ///
- [Name("通讯母线电流[A]")]
+ [Name("通讯Cmp母线电流[A]")]
public double ComCapBusCur { get; set; }
///
- /// 通讯母线电压[V] 通讯Cmp母线电压[V]
- /// V
+ /// 通讯Cmp母线电压[V]
///
- [Name("通讯母线电压[V]")]
+ [Name("通讯Cmp母线电压[V]")]
public double ComCapBusVol { get; set; }
- /////
- ///// 通讯Cmp逆变器温度[℃]
- /////
- //[Name("通讯Cmp逆变器温度[℃]")]
- //public double ComCapInvTemp { get; set; }
+ ///
+ /// 通讯Cmp逆变器温度[℃]
+ ///
+ [Name("通讯Cmp逆变器温度[℃]")]
+ public double ComCapInvTemp { get; set; }
///
- /// 通讯相电流[A] 通讯Cmp相电流[A]
- /// V
+ /// 通讯Cmp相电流[A]
///
- [Name("通讯相电流[A]")]
+ [Name("通讯Cmp相电流[A]")]
public double ComCapPhCur { get; set; }
///
- /// 通讯功率[W] 通讯Cmp功率[W]
- /// V
+ /// 通讯Cmp功率[W]
///
- [Name("通讯功率[W]")]
+ [Name("通讯Cmp功率[W]")]
public double ComCapPw { get; set; }
///
- /// 通讯芯片温度[℃] 通讯Cmp芯片温度[℃]
- /// V
+ /// 通讯Cmp芯片温度[℃]
///
- [Name("通讯芯片温度[℃]")]
+ [Name("通讯Cmp芯片温度[℃]")]
public double ComCapChipTemp { get; set; }
- /////
- ///// 通讯PTC入水温度[℃]
- /////
- //[Name("通讯PTC入水温度[℃]")]
- //public double ComPTCEntTemp { 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 ComPTCBusCur { get; set; }
-
- /////
- ///// 通讯PTC膜温[℃]
- /////
- //[Name("通讯PTC膜温[℃]")]
- //public double ComPTCFlmTemp { get; set; }
-
- /////
- ///// 通讯PTC模块温度[℃]
- /////
- //[Name("通讯PTC模块温度[℃]")]
- //public double ComPTCMdTemp { get; set; }
+ ///
+ /// 通讯PTC入水温度[℃]
+ ///
+ [Name("通讯PTC入水温度[℃]")]
+ public double ComPTCEntTemp { get; set; }
///
- /// 过冷度[K]
- /// V
+ /// 通讯PTC出水温度[℃]
///
- [Name("过冷度[K]")]
- public double Subcooling { get; set; }
+ [Name("通讯PTC出水温度[℃]")]
+ public double ComPTCExpTemp { get; set; }
///
- /// 过热度[K]
- /// V
+ /// 通讯PTC峰值电流[A]
///
- [Name("过热度[K]")]
- public double Superheat { get; set; }
+ [Name("通讯PTC峰值电流[A]")]
+ public double ComPTCPeakCur { 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 ComPTCMdTemp { get; set; }
///
/// 创建时间
@@ -373,7 +289,6 @@ namespace CapMachine.Wpf.Models
[Name("创建时间")]
public DateTime CreateTime { get; set; }
-
}
[AttributeUsage(AttributeTargets.Property)]
diff --git a/CapMachine.Wpf/Models/CsvRecordModelMap.cs b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
index e3007b0..18feb2d 100644
--- a/CapMachine.Wpf/Models/CsvRecordModelMap.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
@@ -15,107 +15,51 @@ namespace CapMachine.Wpf.Models
{
public CsvRecordModelMap()
{
- //Map(m => m.WorkCond).Name("工况");
- //Map(m => m.Speed).Name("转速");
- //Map(m => m.ExPress).Name("排气压力");
- //Map(m => m.InhPress).Name("吸气压力");
- //Map(m => m.InhTemp).Name("吸气温度");
- //Map(m => m.Cond1Temp).Name("COND1温度");
- //Map(m => m.LubePress).Name("润滑油压力");
- //Map(m => m.Cond2Press).Name("COND2压力");
- //Map(m => m.OCR).Name("OCR");
- //Map(m => m.HV).Name("HV");
- //Map(m => m.HVCur).Name("HV电流");
- //Map(m => m.HVPw).Name("HV功率");
- //Map(m => m.LV).Name("LV");
- //Map(m => m.LVCur).Name("LV电流");
- //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("冷媒流量");
- //Map(m => m.LubeFlow).Name("润滑油流量");
- //Map(m => m.ExTemp).Name("排气温度");
- //Map(m => m.TxvFrPress).Name("膨胀阀前压力");
- //Map(m => m.TxvFrTemp).Name("膨胀阀前温度");
- //Map(m => m.EVAPExpPress).Name("EVAP出口压力");
- //Map(m => m.IntrplPress).Name("腔内压力");
- //Map(m => m.CapSurfTemp).Name("压缩机表面温度");
- //Map(m => m.PTCFlow).Name("PTC流量");
- //Map(m => m.PTCEntTemp).Name("PTC入水温度");
- //Map(m => m.PTCExpTemp).Name("PTC出水温度");
- //Map(m => m.ComCapBusCur).Name("通讯Cmp母线电流");
- //Map(m => m.ComCapBusVol).Name("通讯Cmp母线电压");
- //Map(m => m.ComCapInvTemp).Name("通讯Cmp逆变器温度");
- //Map(m => m.ComCapPhCur).Name("通讯Cmp相电流");
- //Map(m => m.ComCapPw).Name("通讯Cmp功率");
- //Map(m => m.ComCapChipTemp).Name("通讯Cmp芯片温度");
- //Map(m => m.ComPTCEntTemp).Name("通讯PTC入水温度");
- //Map(m => m.ComPTCExpTemp).Name("通讯PTC出水温度");
- //Map(m => m.ComPTCPeakCur).Name("通讯PTC峰值电流");
- //Map(m => m.ComPTCBusCur).Name("通讯PTC母线电流");
- //Map(m => m.ComPTCFlmTemp).Name("通讯PTC膜温");
- //Map(m => m.ComPTCMdTemp).Name("通讯PTC模块温度");
- //Map(m => m.CreateTime).Name("时间");
-
Map(m => m.WorkDay).Name("日期");
Map(m => m.Time).Name("时间");
Map(m => m.WorkCond).Name("工况");
Map(m => m.Speed).Name("转速[rpm]");
- Map(m => m.ExPress).Name("排气压力[MpaA]");
- Map(m => m.InhPress).Name("吸气压力[MpaA]");
+ Map(m => m.ExPress).Name("排气压力[BarA]");
+ Map(m => m.InhPress).Name("吸气压力[BarA]");
Map(m => m.InhTemp).Name("吸气温度[℃]");
- Map(m => m.Cond1Temp).Name("冷凝器出口水温[℃]");
- Map(m => m.OS2Temp).Name("吸气混合器温度[℃]");
- Map(m => m.HV).Name("HV_V[V]");
- Map(m => m.HVCur).Name("HV_A[A]");
- Map(m => m.HVPw).Name("HV_W[W]");
- Map(m => m.LV).Name("LV_V[V]");
- Map(m => m.LVCur).Name("LV_A[A]");
- Map(m => m.EnvTemp).Name("试验箱温度[℃]");
- Map(m => m.EnvRH).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]");
+ Map(m => m.HVPw).Name("HV[W]");
+ Map(m => m.LV).Name("LV[V]");
+ 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("膨胀阀前压力[MpaA]");
+ Map(m => m.TxvFrPress).Name("膨胀阀前压力[BarA]");
Map(m => m.TxvFrTemp).Name("膨胀阀前温度[℃]");
-
- Map(m => m.CondInTemp).Name("冷凝器进口温度[℃]");
- Map(m => m.CondInPress).Name("冷凝器进口压力[MpaA]");
- 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("润滑油压力[MpaA]");
- //Map(m => m.Cond2Press).Name("COND2压力[MpaA]");
- //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出口压力[MpaA]");
- //Map(m => m.IntrplPress).Name("腔内压力[MpaA]");
- //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("通讯母线电流[A]");
- Map(m => m.ComCapBusVol).Name("通讯母线电压[V]");
- //Map(m => m.ComCapInvTemp).Name("通讯Cmp逆变器温度[℃]");
- Map(m => m.ComCapPhCur).Name("通讯相电流[A]");
- Map(m => m.ComCapPw).Name("通讯功率[W]");
- Map(m => m.ComCapChipTemp).Name("通讯芯片温度[℃]");
- 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.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.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.CreateTime).Name("时间");