diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs
index 1529660..2b5cadb 100644
--- a/CapMachine.Wpf/Models/CsvRecordModel.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModel.cs
@@ -60,10 +60,10 @@ namespace CapMachine.Wpf.Models
public double InhTemp { get; set; }
///
- /// COND1温度[℃]
- /// V
+ /// 冷凝器出口水温[℃]
+ /// V COND1水温
///
- [Name("COND1温度[℃]")]
+ [Name("冷凝器出口水温[℃]")]
public double Cond1Temp { get; set; }
/////
@@ -85,52 +85,52 @@ namespace CapMachine.Wpf.Models
//public double OCR { get; set; }
///
- /// HV[V]
+ ///HV_V[V] HV[V]
/// V
///
- [Name("HV[V]")]
+ [Name("HV_V[V]")]
public double HV { get; set; }
///
- /// HV[A]
+ /// HV_A[A] HV[A]
/// V
///
- [Name("HV[A]")]
+ [Name("HV_A[A]")]
public double HVCur { get; set; }
///
- /// HV[W]
+ ///HV_W[W] HV[W]
/// V
///
- [Name("HV[W]")]
+ [Name("HV_W[W]")]
public double HVPw { get; set; }
///
- /// LV[V]
+ ///LV_V[V] LV[V]
/// V
///
- [Name("LV[V]")]
+ [Name("LV_V[V]")]
public double LV { get; set; }
///
- /// LV[A]
+ ///LV_A[A] LV[A]
/// V
///
- [Name("LV[A]")]
+ [Name("LV_A[A]")]
public double LVCur { get; set; }
///
- /// 环境温度[℃]
+ /// 试验箱温度[℃] 环境温度[℃]
/// V
///
- [Name("环境温度[℃]")]
+ [Name("试验箱温度[℃]")]
public double EnvTemp { get; set; }
///
- /// 环境湿度[%]
+ /// 试验箱湿度[%] 环境湿度[%]
/// V
///
- [Name("环境湿度[%]")]
+ [Name("试验箱湿度[%]")]
public double EnvRH { get; set; }
/////
@@ -140,10 +140,10 @@ namespace CapMachine.Wpf.Models
//public double OS1Temp { get; set; }
///
- /// OS2温度[℃]
+ /// 吸气混合器温度[℃] OS2温度[℃]
/// V
///
- [Name("OS2温度[℃]")]
+ [Name("吸气混合器温度[℃]")]
public double OS2Temp { get; set; }
/////
@@ -277,17 +277,17 @@ namespace CapMachine.Wpf.Models
//public double PTCExpTemp { get; set; }
///
- /// 通讯Cmp母线电流[A]
+ /// 通讯母线电流[A] 通讯Cmp母线电流[A]
/// V
///
- [Name("通讯Cmp母线电流[A]")]
+ [Name("通讯母线电流[A]")]
public double ComCapBusCur { get; set; }
///
- /// 通讯Cmp母线电压[V]
+ /// 通讯母线电压[V] 通讯Cmp母线电压[V]
/// V
///
- [Name("通讯Cmp母线电压[V]")]
+ [Name("通讯母线电压[V]")]
public double ComCapBusVol { get; set; }
/////
@@ -297,24 +297,24 @@ namespace CapMachine.Wpf.Models
//public double ComCapInvTemp { get; set; }
///
- /// 通讯Cmp相电流[A]
+ /// 通讯相电流[A] 通讯Cmp相电流[A]
/// V
///
- [Name("通讯Cmp相电流[A]")]
+ [Name("通讯相电流[A]")]
public double ComCapPhCur { get; set; }
///
- /// 通讯Cmp功率[W]
+ /// 通讯功率[W] 通讯Cmp功率[W]
/// V
///
- [Name("通讯Cmp功率[W]")]
+ [Name("通讯功率[W]")]
public double ComCapPw { get; set; }
///
- /// 通讯Cmp芯片温度[℃]
+ /// 通讯芯片温度[℃] 通讯Cmp芯片温度[℃]
/// V
///
- [Name("通讯Cmp芯片温度[℃]")]
+ [Name("通讯芯片温度[℃]")]
public double ComCapChipTemp { get; set; }
/////
diff --git a/CapMachine.Wpf/Models/CsvRecordModelMap.cs b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
index 1a7f98d..e3007b0 100644
--- a/CapMachine.Wpf/Models/CsvRecordModelMap.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
@@ -67,15 +67,15 @@ namespace CapMachine.Wpf.Models
Map(m => m.ExPress).Name("排气压力[MpaA]");
Map(m => m.InhPress).Name("吸气压力[MpaA]");
Map(m => m.InhTemp).Name("吸气温度[℃]");
- Map(m => m.Cond1Temp).Name("COND1温度[℃]");
- 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]");
- 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.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.ExTemp).Name("排气温度[℃]");
Map(m => m.TxvFrPress).Name("膨胀阀前压力[MpaA]");
Map(m => m.TxvFrTemp).Name("膨胀阀前温度[℃]");
@@ -102,12 +102,12 @@ namespace CapMachine.Wpf.Models
//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.ComCapBusCur).Name("通讯母线电流[A]");
+ Map(m => m.ComCapBusVol).Name("通讯母线电压[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.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入水温度[℃]");
diff --git a/CapMachine.Wpf/Services/DataRecordService.cs b/CapMachine.Wpf/Services/DataRecordService.cs
index f7ed53f..a1ca925 100644
--- a/CapMachine.Wpf/Services/DataRecordService.cs
+++ b/CapMachine.Wpf/Services/DataRecordService.cs
@@ -343,6 +343,8 @@ namespace CapMachine.Wpf.Services
//转换到CSV的数据
var models = ConvertToCsvRecordModel(recordChannelData.Data);
+ //填充工况名称
+ models.WorkCond = ConfigService.CurExpInfo.Name;
//数据库保存
//zeroDbContext.Insert(Datas);
@@ -386,7 +388,9 @@ namespace CapMachine.Wpf.Services
//增加日期和时间两个列
model.WorkDay = model.CreateTime.ToString("yyyy-MM-dd");
model.Time = model.CreateTime.ToString("HH:mm:ss");
+
+
return model;
}
@@ -436,6 +440,7 @@ namespace CapMachine.Wpf.Services
var DataInfo = MachineRtDataService.TagManger.DicTags
.ToDictionary(kvp => kvp.Key, kvp => (object)kvp.Value.EngPvValue);
DataInfo.Add("创建时间", DateTime.Now);
+
var RecordData = new RecordChannelData()
{
diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs
index 89c7151..7d58be0 100644
--- a/CapMachine.Wpf/Services/MachineRtDataService.cs
+++ b/CapMachine.Wpf/Services/MachineRtDataService.cs
@@ -423,7 +423,7 @@ namespace CapMachine.Wpf.Services
});
TagManger.AddTag(new Tag(new ShortTagValue())
{
- Name = "试验箱湿度[℃]",//名称带单位
+ Name = "试验箱湿度[%]",//名称带单位
NameNoUnit = "试验箱湿度",//无单位名称
EnName = "EnvRH",//英文名称
Group = "程序",//分组
@@ -765,7 +765,7 @@ namespace CapMachine.Wpf.Services
Index = "",
});
- #region
+ #endregion
//TagManger.AddTag(new Tag("OCR", "OCR[%]", "OCR", "程序", "VW15014", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
//TagManger.AddTag(new Tag("HV[V]", "HV[V]", "HV", "程序", "VW15016", 100, 0, 10, "V", new ShortTagValue(), true) { DecimalPoint = 1 });
@@ -1112,27 +1112,27 @@ namespace CapMachine.Wpf.Services
TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.IsShow = IsValueShow;
- ////仿真数据
- //TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value = (short)Random.Next(1, 100);
- //TagManger.GetTagByName(itemTag.Value.Name).EngPvValue = (short)Random.Next(1, 100) * 1.0 / TagManger.GetTagByName(itemTag.Value.Name)!.Precision;
- //LinkState = false;
+ //仿真数据
+ TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value = (short)Random.Next(1, 100);
+ TagManger.GetTagByName(itemTag.Value.Name).EngPvValue = (short)Random.Next(1, 100) * 1.0 / TagManger.GetTagByName(itemTag.Value.Name)!.Precision;
+ LinkState = false;
- //PLC 数据
- if (!string.IsNullOrEmpty(itemTag.Value.PVAddress))
- {
- OperateResultShort = SiemensDrive.ReadInt16(itemTag.Value.PVAddress);
- if (OperateResultShort.IsSuccess)
- {
- TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value = SiemensDrive.ReadInt16(itemTag.Value.PVAddress).Content;
- TagManger.GetTagByName(itemTag.Value.Name)!.EngPvValue = TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName(itemTag.Value.Name)!.Precision;
- LinkState = true;
+ ////PLC 数据
+ //if (!string.IsNullOrEmpty(itemTag.Value.PVAddress))
+ //{
+ // OperateResultShort = SiemensDrive.ReadInt16(itemTag.Value.PVAddress);
+ // if (OperateResultShort.IsSuccess)
+ // {
+ // TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value = SiemensDrive.ReadInt16(itemTag.Value.PVAddress).Content;
+ // TagManger.GetTagByName(itemTag.Value.Name)!.EngPvValue = TagManger.GetTagInfoValueByName(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName(itemTag.Value.Name)!.Precision;
+ // LinkState = true;
- }
- else
- {
- LinkState = false;
- }
- }
+ // }
+ // else
+ // {
+ // LinkState = false;
+ // }
+ //}
if (!string.IsNullOrEmpty(itemTag.Value.SVAddress))
{