diff --git a/CapMachine.Shared/Controls/Meter.xaml b/CapMachine.Shared/Controls/Meter.xaml index 9c62f2d..33b9054 100644 --- a/CapMachine.Shared/Controls/Meter.xaml +++ b/CapMachine.Shared/Controls/Meter.xaml @@ -134,7 +134,7 @@ xml:space="preserve" FontSize="12" FontWeight="Bold" - Foreground="#404040" + Foreground="Gray" Text="{Binding ElementName=MeterInstance, Path=StepExeInfo}" TextAlignment="Center" /> diff --git a/CapMachine.Wpf/Assets/Images/CapMachineOutput1.png b/CapMachine.Wpf/Assets/Images/CapMachineOutput1.png index 70d7827..f4aacfa 100644 Binary files a/CapMachine.Wpf/Assets/Images/CapMachineOutput1.png and b/CapMachine.Wpf/Assets/Images/CapMachineOutput1.png differ diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs index 8bdd772..59b1267 100644 --- a/CapMachine.Wpf/Models/CsvRecordModel.cs +++ b/CapMachine.Wpf/Models/CsvRecordModel.cs @@ -163,35 +163,76 @@ namespace CapMachine.Wpf.Models [Name("排气温度[℃]")] public double ExTemp { get; set; } - /// - /// 膨胀阀前压力[BarA] - /// - [Name("膨胀阀前压力[BarA]")] - public double TxvFrPress { get; set; } + ///// + ///// 膨胀阀前压力[BarA] + ///// + //[Name("膨胀阀前压力[BarA]")] + //public double TxvFrPress { get; set; } + + /// - /// 膨胀阀前温度[℃] + /// 阀前压力P3[BarA] /// - [Name("膨胀阀前温度[℃]")] - public double TxvFrTemp { get; set; } + [Name("阀前压力P3[BarA]")] + public double TxvFrPressP3 { get; set; } /// - /// EVAP出口压力[BarA] + /// EVAP出口压力P6[BarA] /// - [Name("EVAP出口压力[BarA]")] - public double EVAPExpPress { get; set; } + [Name("EVAP出口压力P6[BarA]")] + public double EVAPExpPressP6 { get; set; } /// - /// 腔内压力[BarA] + /// 背压压力P8[BarA] /// - [Name("腔内压力[BarA]")] - public double IntrplPress { get; set; } + [Name("背压压力P8[BarA]")] + public double BackPressP8 { get; set; } /// - /// 压缩机表面温度[℃] + /// 阀前温度T3[℃] /// - [Name("压缩机表面温度[℃]")] - public double CapSurfTemp { get; set; } + [Name("阀前温度T3[℃]")] + public double TxvFrTempT3 { get; set; } + + /// + /// COND1入口温度T4[℃] + /// + [Name("COND1入口温度T4[℃]")] + public double Cond1TempT4 { get; set; } + + /// + /// EVAP出口温度T6[℃] + /// + [Name("EVAP出口温度T6[℃]")] + public double EVAPExpTempT6 { get; set; } + + /// + /// 压缩机表面温度T11[℃] + /// + [Name("压缩机表面温度T11[℃]")] + public double CapSurfTempT11 { get; set; } + + ///// + ///// 膨胀阀前温度[℃] + ///// + //[Name("膨胀阀前温度[℃]")] + //public double TxvFrTemp { get; set; } + + ///// + ///// EVAP出口压力[BarA] + ///// + //[Name("EVAP出口压力[BarA]")] + //public double EVAPExpPress { get; set; } + + ///// + ///// 腔内压力[BarA] + ///// + //[Name("腔内压力[BarA]")] + //public double IntrplPress { get; set; } + + + /// /// PTC流量[L/min] @@ -200,88 +241,157 @@ namespace CapMachine.Wpf.Models public double PTCFlow { get; set; } /// - /// PTC入水温度[℃] + /// PTC入口水温[℃] /// - [Name("PTC入水温度[℃]")] - public double PTCEntTemp { get; set; } + [Name("PTC入口水温[℃]")] + public double PTCInTemp { get; set; } /// - /// PTC出水温度[℃] + /// PTC功率[W] /// - [Name("PTC出水温度[℃]")] - public double PTCExpTemp { get; set; } + [Name("PTC功率[W]")] + public double PTCPw { get; set; } + + ///// + ///// PTC出水温度[℃] + ///// + //[Name("PTC出水温度[℃]")] + //public double PTCExpTemp { get; set; } + + + /// - /// 通讯Cmp母线电流[A] + /// 制冷量[W] /// - [Name("通讯Cmp母线电流[A]")] + [Name("制冷量[W]")] + public double Qcool { get; set; } + + /// + /// 制热量[W] + /// + [Name("制热量[W]")] + public double Qheat { get; set; } + + /// + /// 制冷性能系数[W] + /// + [Name("制冷性能系数[W]")] + public double COPCooling { get; set; } + + /// + /// 制热性能系数[W] + /// + [Name("制热性能系数[W]")] + public double COPHeating { get; set; } + + /// + /// 容积效率[%] + /// + [Name("容积效率[%]")] + public double VolumeEfficiency { get; set; } + + /// + /// 等熵效率[%] + /// + [Name("等熵效率[%]")] + public double IsentropyEfficiency { get; set; } + + /// + /// 过冷度[K] + /// + [Name("过冷度[K]")] + public double Subcooling { get; set; } + + /// + /// 过热度[K] + /// + [Name("过热度[K]")] + public double Superheat { get; set; } + + /// + /// 干度[%] + /// + [Name("干度[%]")] + public double Dryness { get; set; } + + + + + /// + /// 通讯母线电流[A] + /// + [Name("通讯母线电流[A]")] public double ComCapBusCur { get; set; } /// - /// 通讯Cmp母线电压[V] + /// 通讯母线电压[V] /// - [Name("通讯Cmp母线电压[V]")] + [Name("通讯母线电压[V]")] public double ComCapBusVol { get; set; } /// - /// 通讯Cmp逆变器温度[℃] + /// 通讯逆变器温度[℃] /// - [Name("通讯Cmp逆变器温度[℃]")] - public double ComCapInvTemp { get; set; } + [Name("通讯逆变器温度[℃]")] + public double ComCapInverterTemp { get; set; } /// - /// 通讯Cmp相电流[A] + /// 通讯相电流[A] /// - [Name("通讯Cmp相电流[A]")] + [Name("通讯相电流[A]")] public double ComCapPhCur { get; set; } /// - /// 通讯Cmp功率[W] + /// 通讯功率[W] /// - [Name("通讯Cmp功率[W]")] + [Name("通讯功率[W]")] public double ComCapPw { get; set; } /// - /// 通讯Cmp芯片温度[℃] + /// 通讯芯片温度[℃] /// - [Name("通讯Cmp芯片温度[℃]")] + [Name("通讯芯片温度[℃]")] public double ComCapChipTemp { get; set; } + + + /// /// 通讯PTC入水温度[℃] /// [Name("通讯PTC入水温度[℃]")] - public double ComPTCEntTemp { get; set; } + public double CapPTCInWaterTemp { get; set; } /// /// 通讯PTC出水温度[℃] /// [Name("通讯PTC出水温度[℃]")] - public double ComPTCExpTemp { get; set; } + public double CapPTCOutWaterTemp { get; set; } /// /// 通讯PTC峰值电流[A] /// [Name("通讯PTC峰值电流[A]")] - public double ComPTCPeakCur { get; set; } + public double CapPTCPeakCur { get; set; } /// /// 通讯PTC母线电流[A] /// [Name("通讯PTC母线电流[A]")] - public double ComPTCBusCur { get; set; } + public double CapPTCBusCur { get; set; } /// /// 通讯PTC膜温[℃] /// [Name("通讯PTC膜温[℃]")] - public double ComPTCFlmTemp { get; set; } + public double CapPTCFilmTemp { get; set; } /// - /// 通讯PTC模块温度[℃] + /// 通讯PTC功率模块温度[℃] /// - [Name("通讯PTC模块温度[℃]")] - public double ComPTCMdTemp { get; set; } + [Name("通讯PTC功率模块温度[℃]")] + public double CapPTCPwMdTemp { get; set; } /// /// 创建时间 diff --git a/CapMachine.Wpf/Models/CsvRecordModelMap.cs b/CapMachine.Wpf/Models/CsvRecordModelMap.cs index 18feb2d..405399a 100644 --- a/CapMachine.Wpf/Models/CsvRecordModelMap.cs +++ b/CapMachine.Wpf/Models/CsvRecordModelMap.cs @@ -40,26 +40,42 @@ namespace CapMachine.Wpf.Models Map(m => m.VRV).Name("冷媒流量[L/min]"); Map(m => m.LubeFlow).Name("润滑油流量[L/min]"); Map(m => m.ExTemp).Name("排气温度[℃]"); - Map(m => m.TxvFrPress).Name("膨胀阀前压力[BarA]"); - Map(m => m.TxvFrTemp).Name("膨胀阀前温度[℃]"); - Map(m => m.EVAPExpPress).Name("EVAP出口压力[BarA]"); - Map(m => m.IntrplPress).Name("腔内压力[BarA]"); - Map(m => m.CapSurfTemp).Name("压缩机表面温度[℃]"); + + Map(m => m.TxvFrPressP3).Name("阀前压力P3[BarA]"); + Map(m => m.EVAPExpPressP6).Name("EVAP出口压力P6[BarA]"); + Map(m => m.BackPressP8).Name("背压压力P8[BarA]"); + Map(m => m.TxvFrTempT3).Name("阀前温度T3[℃]"); + Map(m => m.Cond1TempT4).Name("COND1入口温度T4[℃]"); + Map(m => m.EVAPExpTempT6).Name("EVAP出口温度T6[℃]"); + Map(m => m.CapSurfTempT11).Name("压缩机表面温度T11[℃]"); + 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.PTCInTemp).Name("PTC入口水温[℃]"); + Map(m => m.PTCPw).Name("PTC功率[W]"); + + Map(m => m.Qcool).Name("制冷量[W]"); + Map(m => m.Qheat).Name("制热量[W]"); + Map(m => m.COPCooling).Name("制冷性能系数[W]"); + Map(m => m.COPHeating).Name("制热性能系数[W]"); + Map(m => m.VolumeEfficiency).Name("容积效率[%]"); + Map(m => m.IsentropyEfficiency).Name("等熵效率[%]"); + Map(m => m.Subcooling).Name("过冷度[K]"); + Map(m => m.Superheat).Name("过热度[K]"); + Map(m => m.Dryness).Name("干度[%]"); + + Map(m => m.ComCapBusCur).Name("通讯母线电流[A]"); + Map(m => m.ComCapBusVol).Name("通讯母线电压[V]"); + Map(m => m.ComCapInverterTemp).Name("通讯逆变器温度[℃]"); + Map(m => m.ComCapPhCur).Name("通讯相电流[A]"); + Map(m => m.ComCapPw).Name("通讯功率[W]"); + Map(m => m.ComCapChipTemp).Name("通讯芯片温度[℃]"); + + Map(m => m.CapPTCInWaterTemp).Name("通讯PTC入水温度[℃]"); + Map(m => m.CapPTCOutWaterTemp).Name("通讯PTC出水温度[℃]"); + Map(m => m.CapPTCPeakCur).Name("通讯PTC峰值电流[A]"); + Map(m => m.CapPTCBusCur).Name("通讯PTC母线电流[A]"); + Map(m => m.CapPTCFilmTemp).Name("通讯PTC膜温[℃]"); + Map(m => m.CapPTCPwMdTemp).Name("通讯PTC功率模块温度[℃]"); Map(m => m.CreateTime).Name("时间"); diff --git a/CapMachine.Wpf/Models/LightChart/ChartManager.cs b/CapMachine.Wpf/Models/LightChart/ChartManager.cs index 6b66f12..212c49d 100644 --- a/CapMachine.Wpf/Models/LightChart/ChartManager.cs +++ b/CapMachine.Wpf/Models/LightChart/ChartManager.cs @@ -245,46 +245,83 @@ namespace CapMachine.Wpf.Models.LightChart return CurHistoryData.Select(a => new ChartPoint() { Value = a.LubeFlow, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); case "排气温度[℃]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.ExTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "膨胀阀前压力[BarA]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.TxvFrPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "膨胀阀前温度[℃]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.TxvFrTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "EVAP出口压力[BarA]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.EVAPExpPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "腔内压力[BarA]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.IntrplPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "压缩机表面温度[℃]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapSurfTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + + //case "膨胀阀前压力[BarA]": + // return CurHistoryData.Select(a => new ChartPoint() { Value = a.TxvFrPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + //case "膨胀阀前温度[℃]": + // return CurHistoryData.Select(a => new ChartPoint() { Value = a.TxvFrTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + //case "EVAP出口压力[BarA]": + // return CurHistoryData.Select(a => new ChartPoint() { Value = a.EVAPExpPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + //case "腔内压力[BarA]": + // return CurHistoryData.Select(a => new ChartPoint() { Value = a.IntrplPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + //case "压缩机表面温度[℃]": + // return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapSurfTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + + case "阀前压力P3[BarA]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.TxvFrPressP3, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "EVAP出口压力P6[BarA]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.EVAPExpPressP6, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "背压压力P8[BarA]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.BackPressP8, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "阀前温度T3[BarA]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.TxvFrTempT3, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "COND1入口温度T4[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond1TempT4, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "EVAP出口温度T6[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.EVAPExpTempT6, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "压缩机表面温度T11[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapSurfTempT11, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "PTC流量[L/min]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.PTCFlow, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "PTC入水温度[℃]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.PTCEntTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "PTC出水温度[℃]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.PTCExpTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "通讯Cmp母线电流[A]": + case "PTC入口水温[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.PTCInTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "PTC功率[W]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.PTCPw, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + + case "制冷量[W]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.Qcool, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "制热量[W]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.Qheat, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "制冷性能系数[W]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.COPCooling, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "制热性能系数[W]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.COPHeating, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "容积效率[%]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.VolumeEfficiency, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "等熵效率[%]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.IsentropyEfficiency, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "过冷度[K]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.Subcooling, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "过热度[K]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.Superheat, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + + case "通讯母线电流[A]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComCapBusCur, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "通讯Cmp母线电压[V]": + case "通讯母线电压[V]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComCapBusVol, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "通讯Cmp逆变器温度[℃]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComCapInvTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "通讯Cmp相电流[A]": + case "通讯逆变器温度[℃]": + return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComCapInverterTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "通讯相电流[A]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComCapPhCur, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "通讯Cmp功率[W]": + case "通讯功率[W]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComCapPw, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "通讯Cmp芯片温度[℃]": + case "通讯芯片温度[℃]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComCapChipTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "通讯PTC入水温度[℃]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComPTCEntTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapPTCInWaterTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); case "通讯PTC出水温度[℃]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComPTCExpTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapPTCOutWaterTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); case "通讯PTC峰值电流[A]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComPTCPeakCur, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapPTCPeakCur, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); case "通讯PTC母线电流[A]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComPTCBusCur, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapPTCBusCur, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); case "通讯PTC膜温[℃]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComPTCFlmTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapPTCFilmTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); case "通讯PTC模块温度[℃]": - return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComPTCMdTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapPTCPwMdTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + default: return CurHistoryData.Select(a => new ChartPoint() { Value = a.Speed, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); break; diff --git a/CapMachine.Wpf/Services/DataRecordService.cs b/CapMachine.Wpf/Services/DataRecordService.cs index 9f66915..0353beb 100644 --- a/CapMachine.Wpf/Services/DataRecordService.cs +++ b/CapMachine.Wpf/Services/DataRecordService.cs @@ -462,14 +462,12 @@ namespace CapMachine.Wpf.Services } - - //CycleTimer.Start(); //执行完毕后再开启器 } catch (Exception ex) { //CycleTimer.Start(); //执行完毕后再开启器 - LogService.Error($"时间:{DateTime.Now.ToString()}-【PwAnalyze-CycleAction】-{ex.Message}"); + LogService.Error($"时间:{DateTime.Now.ToString()}-【DataRecordService-RecoredCycleAction】-{ex.Message}"); } } diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs index 2198c83..2590a33 100644 --- a/CapMachine.Wpf/Services/MachineRtDataService.cs +++ b/CapMachine.Wpf/Services/MachineRtDataService.cs @@ -969,7 +969,7 @@ namespace CapMachine.Wpf.Services Id = 27, Name = "EVAP出口压力P6[BarA]", NameNoUnit = "EVAP出口压力P6", - EnName = "EVAPExpTempP6", + EnName = "EVAPExpPressP6", Group = "采集", MinValue = 0, MaxValue = 40, @@ -1007,7 +1007,7 @@ namespace CapMachine.Wpf.Services Id = 29, Name = "阀前温度T3[℃]", NameNoUnit = "阀前温度T3", - EnName = "TxvFrPressT3", + EnName = "TxvFrTempT3", Group = "采集", MinValue = -50, MaxValue = 200, diff --git a/CapMachine.Wpf/ViewModels/MonitorViewModel.cs b/CapMachine.Wpf/ViewModels/MonitorViewModel.cs index d9ca4c9..919f39b 100644 --- a/CapMachine.Wpf/ViewModels/MonitorViewModel.cs +++ b/CapMachine.Wpf/ViewModels/MonitorViewModel.cs @@ -94,7 +94,7 @@ namespace CapMachine.Wpf.ViewModels }; - private List _FilterGroups = new List { "程序", "采集", "压缩机" }; + private List _FilterGroups = new List { "程序", "采集", "压缩机", "计算" }; /// /// 动态过滤（支持运行时更改过滤条件） /// @@ -486,6 +486,8 @@ namespace CapMachine.Wpf.ViewModels // var MeterControl = (Meter)Par; //Console.WriteLine($"{MeterControl.MeterName}-{MeterControl.AutoHandState}"); + if (!MeterControl.MeterName.Contains("PTC功率")) return; + //弹窗 DialogService.ShowDialog("DialogMeterExdView", new DialogParameters() { { "MeterCmdMsg", new MeterCmdMsg() {Name= MeterControl.MeterName,Par="SV2" } } }, (par) => { diff --git a/CapMachine.Wpf/Views/MonitorView.xaml b/CapMachine.Wpf/Views/MonitorView.xaml index a17f5a1..c07fcb3 100644 --- a/CapMachine.Wpf/Views/MonitorView.xaml +++ b/CapMachine.Wpf/Views/MonitorView.xaml @@ -949,34 +949,34 @@