diff --git a/CapMachine.Wpf/Assets/Images/CapMachineOutput1.png b/CapMachine.Wpf/Assets/Images/CapMachineOutput1.png index 70d7827..8341819 100644 Binary files a/CapMachine.Wpf/Assets/Images/CapMachineOutput1.png and b/CapMachine.Wpf/Assets/Images/CapMachineOutput1.png differ diff --git a/CapMachine.Wpf/CapMachine.Wpf.csproj b/CapMachine.Wpf/CapMachine.Wpf.csproj index 4346675..98c763e 100644 --- a/CapMachine.Wpf/CapMachine.Wpf.csproj +++ b/CapMachine.Wpf/CapMachine.Wpf.csproj @@ -11,6 +11,7 @@ + @@ -177,6 +178,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -720,9 +724,6 @@ - - PreserveNewest - Always diff --git a/CapMachine.Wpf/ViewModels/MonitorViewModel.cs b/CapMachine.Wpf/ViewModels/MonitorViewModel.cs index b283aaa..adf4f7d 100644 --- a/CapMachine.Wpf/ViewModels/MonitorViewModel.cs +++ b/CapMachine.Wpf/ViewModels/MonitorViewModel.cs @@ -56,15 +56,17 @@ namespace CapMachine.Wpf.ViewModels ExTempTag = TagManager.DicTags.GetValueOrDefault("排气温度[℃]"); InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[BarA]"); InhTempTag = TagManager.DicTags.GetValueOrDefault("吸气温度[℃]"); - ComCapBusVolTag = TagManager.DicTags.GetValueOrDefault("通讯母线电压[V]"); - ComCapBusCurTag = TagManager.DicTags.GetValueOrDefault("通讯母线电流[A]"); + ComCapBusVolTag = TagManager.DicTags.GetValueOrDefault("通讯Cmp母线电压[V]"); + ComCapBusCurTag = TagManager.DicTags.GetValueOrDefault("通讯Cmp母线电流[A]"); ComCapPwTag = TagManager.DicTags.GetValueOrDefault("通讯功率[W]"); OS2TempTag = TagManager.DicTags.GetValueOrDefault("吸气混合器温度[℃]"); TxvFrTempTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前温度[℃]"); TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[BarA]"); - Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]"); + Cond1TempTag = TagManager.DicTags.GetValueOrDefault("COND1温度[℃]"); CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]"); + LubeFlowTag = TagManager.DicTags.GetValueOrDefault("润滑油流量[L/min]"); + Cond2TempTag = TagManager.DicTags.GetValueOrDefault("COND2温度[℃]"); } @@ -195,6 +197,14 @@ namespace CapMachine.Wpf.ViewModels /// public ITag CondInTempTag { get; set; } + /// + /// 润滑油流量 + /// + public ITag LubeFlowTag { get; set; } + + public ITag Cond2TempTag { get; set; } + + #endregion private DelegateCommand _OperCmd; diff --git a/CapMachine.Wpf/Views/MonitorView.xaml b/CapMachine.Wpf/Views/MonitorView.xaml index 2cb4a27..053f082 100644 --- a/CapMachine.Wpf/Views/MonitorView.xaml +++ b/CapMachine.Wpf/Views/MonitorView.xaml @@ -874,206 +874,175 @@