From 1e3e794eff1b15e42a9814f75146099d3067da08 Mon Sep 17 00:00:00 2001 From: Tyrone CT Date: Thu, 19 Mar 2026 16:20:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E5=B7=A5=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E5=B7=A5=E8=89=BA=E5=9B=BE=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CapMachine.Wpf/Dtos/QuickMeterStepDto.cs | 10 ++++++---- CapMachine.Wpf/ProPars/ProParsHelperQuick.cs | 6 +++--- CapMachine.Wpf/ReportFile/快速程序模版.xlsx | Bin 12490 -> 12570 bytes CapMachine.Wpf/ViewModels/MonitorViewModel.cs | 12 ++++++++++-- CapMachine.Wpf/Views/QuickMeterStepView.xaml | 4 ++-- 5 files changed, 21 insertions(+), 11 deletions(-) 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 d5742aaa1c986272d1d31e0ca9162e566a6e385c..9f77623f43b77c1c387b013e7ed41de9a5f9ae10 100644 GIT binary patch delta 6222 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 h@58sZd7$)(|5puKujP6Svmh57!`{U2Hvsq_E< 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" />