diff --git a/CapMachine.Wpf/Dtos/QuickMeterStepDto.cs b/CapMachine.Wpf/Dtos/QuickMeterStepDto.cs index 20c83f9..b58fc96 100644 --- a/CapMachine.Wpf/Dtos/QuickMeterStepDto.cs +++ b/CapMachine.Wpf/Dtos/QuickMeterStepDto.cs @@ -134,9 +134,10 @@ namespace CapMachine.Wpf.Dtos private double _EVAPExpTemp; /// - /// 蒸发混合温度 信息 + /// --蒸发混合温度 信息 + /// 吸气电加热温度(℃) /// - [Column("蒸发混合温度(℃)")] + [Column("吸气电加热温度(℃)")] public double EVAPExpTemp { get { return _EVAPExpTemp; } @@ -244,9 +245,10 @@ namespace CapMachine.Wpf.Dtos private double _EnvRH; /// - /// 压缩机环境湿度 信息 + /// --压缩机环境湿度 信息 + /// 阀前温度(℃) /// - [Column("压缩机环境湿度(%)")] + [Column("阀前温度(℃)")] public double EnvRH { get { return _EnvRH; } diff --git a/CapMachine.Wpf/ProPars/ProParsHelperQuick.cs b/CapMachine.Wpf/ProPars/ProParsHelperQuick.cs index 08df451..d01fe16 100644 --- a/CapMachine.Wpf/ProPars/ProParsHelperQuick.cs +++ b/CapMachine.Wpf/ProPars/ProParsHelperQuick.cs @@ -25,7 +25,7 @@ namespace CapMachine.Wpf.ProPars new PlcParsDataQuick(){ Name="COND1温度 ",EnName="Cond1Temp",Step=100,Steps=new List(),Ratio=10,Unit="",ValueStartAddress=1014, }, new PlcParsDataQuick(){ Name="COND2温度",EnName="Cond2Temp",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1034, }, new PlcParsDataQuick(){ Name="COND2压力",EnName="Cond2Press",Step=100,Steps=new List(),Ratio=100,Unit="" ,ValueStartAddress=1018, }, - new PlcParsDataQuick(){ Name="蒸发混合温度",EnName="EVAPExpTemp",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1036, }, + new PlcParsDataQuick(){ Name="吸气电加热温度",EnName="EVAPExpTemp",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1036, }, new PlcParsDataQuick(){ Name="排气压力",EnName="ExPress",Step=100,Steps=new List(),Ratio=100,Unit="" ,ValueStartAddress=1008, }, new PlcParsDataQuick(){ Name="HV电压",EnName="HVVol",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1022, }, @@ -36,7 +36,7 @@ namespace CapMachine.Wpf.ProPars new PlcParsDataQuick(){ Name="润滑油压力",EnName="LubePress",Step=100,Steps=new List(),Ratio=100,Unit="" ,ValueStartAddress=1016, }, - new PlcParsDataQuick(){ Name="LV电压",EnName="LVVol",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1024, }, + new PlcParsDataQuick(){ Name="LV电压",EnName="LVVol",Step=100,Steps=new List(),Ratio=100,Unit="" ,ValueStartAddress=1024, }, new PlcParsDataQuick(){ Name="OCR",EnName="OCR",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1020, }, @@ -47,7 +47,7 @@ namespace CapMachine.Wpf.ProPars new PlcParsDataQuick(){ Name="PTC流量",EnName="PTCFlow",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1052, }, new PlcParsDataQuick(){ Name="PTC功率",EnName="PTCPw",Step=100,Steps=new List(),Ratio=1,Unit="" ,ValueStartAddress=1050, }, - new PlcParsDataQuick(){ Name="压缩机环境湿度",EnName="EnvRH",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1028, }, + new PlcParsDataQuick(){ Name="阀前温度",EnName="EnvRH",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1028, }, new PlcParsDataQuick(){ Name="压缩机环境温度",EnName="EnvTemp",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1026, }, new PlcParsDataQuick(){ Name="输出锁定",EnName="OutLock",Step=100,Steps=new List(),Ratio=1,Unit="" ,ValueStartAddress=1038, }, diff --git a/CapMachine.Wpf/ReportFile/快速程序模版.xlsx b/CapMachine.Wpf/ReportFile/快速程序模版.xlsx index d5742aa..9f77623 100644 Binary files a/CapMachine.Wpf/ReportFile/快速程序模版.xlsx and b/CapMachine.Wpf/ReportFile/快速程序模版.xlsx differ diff --git a/CapMachine.Wpf/ViewModels/MonitorViewModel.cs b/CapMachine.Wpf/ViewModels/MonitorViewModel.cs index adf4f7d..b2c949c 100644 --- a/CapMachine.Wpf/ViewModels/MonitorViewModel.cs +++ b/CapMachine.Wpf/ViewModels/MonitorViewModel.cs @@ -58,13 +58,15 @@ namespace CapMachine.Wpf.ViewModels InhTempTag = TagManager.DicTags.GetValueOrDefault("吸气温度[℃]"); ComCapBusVolTag = TagManager.DicTags.GetValueOrDefault("通讯Cmp母线电压[V]"); ComCapBusCurTag = TagManager.DicTags.GetValueOrDefault("通讯Cmp母线电流[A]"); - ComCapPwTag = TagManager.DicTags.GetValueOrDefault("通讯功率[W]"); + ComCapPwTag = TagManager.DicTags.GetValueOrDefault("通讯Cmp功率[W]"); OS2TempTag = TagManager.DicTags.GetValueOrDefault("吸气混合器温度[℃]"); TxvFrTempTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前温度[℃]"); TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[BarA]"); Cond1TempTag = TagManager.DicTags.GetValueOrDefault("COND1温度[℃]"); CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]"); - LubeFlowTag = TagManager.DicTags.GetValueOrDefault("润滑油流量[L/min]"); + + VRVTag = TagManager.DicTags.GetValueOrDefault("冷媒流量[kg/h]"); + LubeFlowTag = TagManager.DicTags.GetValueOrDefault("润滑油流量[kg/h]"); Cond2TempTag = TagManager.DicTags.GetValueOrDefault("COND2温度[℃]"); @@ -202,6 +204,12 @@ namespace CapMachine.Wpf.ViewModels /// public ITag LubeFlowTag { get; set; } + /// + /// 冷媒流量 + /// + public ITag VRVTag { get; set; } + + public ITag Cond2TempTag { get; set; } diff --git a/CapMachine.Wpf/Views/QuickMeterStepView.xaml b/CapMachine.Wpf/Views/QuickMeterStepView.xaml index 78e3f19..ccc7d9c 100644 --- a/CapMachine.Wpf/Views/QuickMeterStepView.xaml +++ b/CapMachine.Wpf/Views/QuickMeterStepView.xaml @@ -204,7 +204,7 @@ MappingName="LVVol" NumberDecimalDigits="1" />