From 9b28bf6499e7647f5716cadf0576e347d8a0d6fa Mon Sep 17 00:00:00 2001 From: Tyrone CT Date: Wed, 18 Mar 2026 12:18:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CapMachine.Wpf/Models/CsvRecordModel.cs | 4 +-- CapMachine.Wpf/Models/CsvRecordModelMap.cs | 23 ++++++++------- .../Models/LightChart/ChartManager.cs | 2 +- CapMachine.Wpf/Services/DataRecordService.cs | 20 ++++++------- .../Services/MachineRtDataService.cs | 28 +++++++++---------- .../Services/NavigationMenuService.cs | 6 ++-- CapMachine.Wpf/Services/PPCService.cs | 4 +-- 7 files changed, 44 insertions(+), 43 deletions(-) diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs index 4046472..1296fdb 100644 --- a/CapMachine.Wpf/Models/CsvRecordModel.cs +++ b/CapMachine.Wpf/Models/CsvRecordModel.cs @@ -188,9 +188,9 @@ namespace CapMachine.Wpf.Models public double EVAPExpTemp { get; set; } /// - /// 腔内压力[BarA] + /// 背压压力[BarA] /// - [Name("腔内压力[BarA]")] + [Name("背压压力[BarA]")] public double IntrplPress { get; set; } /// diff --git a/CapMachine.Wpf/Models/CsvRecordModelMap.cs b/CapMachine.Wpf/Models/CsvRecordModelMap.cs index 45ba51d..26ab406 100644 --- a/CapMachine.Wpf/Models/CsvRecordModelMap.cs +++ b/CapMachine.Wpf/Models/CsvRecordModelMap.cs @@ -44,7 +44,7 @@ namespace CapMachine.Wpf.Models Map(m => m.TxvFrTemp).Name("膨胀阀前温度[℃]"); Map(m => m.EVAPExpPress).Name("EVAP出口压力[BarA]"); Map(m => m.EVAPExpTemp).Name("EVAP出口温度[℃]"); - Map(m => m.IntrplPress).Name("腔内压力[BarA]"); + Map(m => m.IntrplPress).Name("背压压力[BarA]"); Map(m => m.CapSurfTemp).Name("压缩机表面温度[℃]"); Map(m => m.CapSurfTemp).Name("液冷媒流量[kg/h]"); @@ -52,21 +52,24 @@ namespace CapMachine.Wpf.Models Map(m => m.CapSurfTemp).Name("过热度[K]"); Map(m => m.CapSurfTemp).Name("过冷度[K]"); - Map(m => m.PTCFlow).Name("PTC流量[L/min]"); - Map(m => m.PTCEntTemp).Name("PTC入水温度[℃]"); - Map(m => m.PTCExpTemp).Name("PTC出水温度[℃]"); + //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.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.CreateTime).Name("时间"); diff --git a/CapMachine.Wpf/Models/LightChart/ChartManager.cs b/CapMachine.Wpf/Models/LightChart/ChartManager.cs index a79f438..4651e05 100644 --- a/CapMachine.Wpf/Models/LightChart/ChartManager.cs +++ b/CapMachine.Wpf/Models/LightChart/ChartManager.cs @@ -253,7 +253,7 @@ namespace CapMachine.Wpf.Models.LightChart return CurHistoryData.Select(a => new ChartPoint() { Value = a.EVAPExpPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); case "EVAP出口温度[℃]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.EVAPExpTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "腔内压力[BarA]": + 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(); diff --git a/CapMachine.Wpf/Services/DataRecordService.cs b/CapMachine.Wpf/Services/DataRecordService.cs index 82c9592..c8eb4b7 100644 --- a/CapMachine.Wpf/Services/DataRecordService.cs +++ b/CapMachine.Wpf/Services/DataRecordService.cs @@ -130,7 +130,7 @@ namespace CapMachine.Wpf.Services new Columns(){ Name="膨胀阀前温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="EVAP出口压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="EVAP出口温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="腔内压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="背压压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="压缩机表面温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="液冷媒流量[kg/h]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, @@ -138,21 +138,21 @@ namespace CapMachine.Wpf.Services new Columns(){ Name="过热度[K]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="过冷度[K]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="PTC流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="PTC入水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="PTC出水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + //new Columns(){ Name="PTC流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + //new Columns(){ Name="PTC入水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + //new Columns(){ Name="PTC出水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="通讯Cmp母线电流[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="通讯Cmp母线电压[V]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="通讯Cmp逆变器温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="通讯Cmp相电流[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="通讯Cmp功率[W]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="通讯Cmp芯片温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="通讯PTC入水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="通讯PTC出水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="通讯PTC峰值电流[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="通讯PTC母线电流[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="通讯PTC膜温[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="通讯PTC模块温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + //new Columns(){ Name="通讯PTC入水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + //new Columns(){ Name="通讯PTC出水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + //new Columns(){ Name="通讯PTC峰值电流[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + //new Columns(){ Name="通讯PTC母线电流[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + //new Columns(){ Name="通讯PTC膜温[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + //new Columns(){ Name="通讯PTC模块温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="创建时间",MapType="System.DateTime",IsIdentity=false,IsPrimary=false}, diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs index fb17deb..11aefbf 100644 --- a/CapMachine.Wpf/Services/MachineRtDataService.cs +++ b/CapMachine.Wpf/Services/MachineRtDataService.cs @@ -141,11 +141,8 @@ namespace CapMachine.Wpf.Services #region 标签管理 - - - ////三电 Sample - TagManger.AddTag(new Tag("转速", "转速[rpm]", "Speed", "程序", "VW14002", 100, 0, 1, "rpm", new ShortTagValue(), true) { DecimalPoint = 0, SVAddress = "VW14002" }); + TagManger.AddTag(new Tag("转速", "转速[rpm]", "Speed", "程序", "VW14100", 100, 0, 1, "rpm", new ShortTagValue(), true) { DecimalPoint = 0, SVAddress = "VW14002" }); TagManger.AddTag(new Tag("排气压力", "排气压力[BarA]", "ExPress", "程序", "VW15000", 100, 0, 100, "BarA", new ShortTagValue(), true) { DecimalPoint = 2 }); TagManger.AddTag(new Tag("吸气压力", "吸气压力[BarA]", "InhPress", "程序", "VW15002", 100, 0, 100, "BarA", new ShortTagValue(), true) { DecimalPoint = 2 }); TagManger.AddTag(new Tag("吸气温度", "吸气温度[℃]", "InhTemp", "程序", "VW15004", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 }); @@ -174,12 +171,13 @@ namespace CapMachine.Wpf.Services TagManger.AddTag(new Tag("膨胀阀前温度", "膨胀阀前温度[℃]", "TxvFrTemp", "程序", "VW15026", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag("EVAP出口压力", "EVAP出口压力[BarA]", "EVAPExpPress", "程序", "VW15046", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 }); TagManger.AddTag(new Tag("EVAP出口温度", "EVAP出口温度[℃]", "EVAPExpTemp", "程序", "VW15048", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); - TagManger.AddTag(new Tag("腔内压力", "腔内压力[BarA]", "IntrplPress", "程序", "VW15050", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 }); + TagManger.AddTag(new Tag("背压压力", "背压压力[BarA]", "IntrplPress", "程序", "VW15050", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 }); TagManger.AddTag(new Tag("压缩机表面温度", "压缩机表面温度[℃]", "CapSurfTemp", "程序", "VW15052", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); - TagManger.AddTag(new Tag("绝缘电阻", "绝缘电阻[KΩ]", "InsRes", "程序", "VW15056", 100, 0, 10, "KΩ", new ShortTagValue(), false) { DecimalPoint = 1 }); - TagManger.AddTag(new Tag("PTC流量", "PTC流量[L/min]", "PTCFlow", "程序", "VW15054", 100, 0, 10, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); - TagManger.AddTag(new Tag("PTC入水温度", "PTC入水温度[℃]", "PTCEntTemp", "程序", "VW15056", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); - TagManger.AddTag(new Tag("PTC出水温度", "PTC出水温度[℃]", "PTCExpTemp", "程序", "VW15058", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); + TagManger.AddTag(new Tag("绝缘电阻", "绝缘电阻[KΩ]", "InsRes", "程序", "VW15056", 100, 0, 1, "KΩ", new ShortTagValue(), false) { DecimalPoint = 0 }); + + //TagManger.AddTag(new Tag("PTC流量", "PTC流量[L/min]", "PTCFlow", "程序", "VW15054", 100, 0, 10, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); + //TagManger.AddTag(new Tag("PTC入水温度", "PTC入水温度[℃]", "PTCEntTemp", "程序", "VW15056", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); + //TagManger.AddTag(new Tag("PTC出水温度", "PTC出水温度[℃]", "PTCExpTemp", "程序", "VW15058", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag("液冷媒流量", "液冷媒流量[kg/h]", "LiqRefFlow", "程序", "VW15042", 100, 0, 10, "kg/h", new ShortTagValue(), false) { DecimalPoint = 1 }); @@ -190,12 +188,12 @@ namespace CapMachine.Wpf.Services TagManger.AddTag(new Tag("通讯Cmp功率", "通讯Cmp功率[W]", "ComCapPw", "程序", "VW14110", 100, 0, 1, "W", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag("通讯Cmp芯片温度", "通讯Cmp芯片温度[℃]", "ComCapChipTemp", "程序", "VW14112", 100, 0, 1, "℃", new ShortTagValue(), false) { DecimalPoint = 0 }); - TagManger.AddTag(new Tag("通讯PTC入水温度", "通讯PTC入水温度[℃]", "ComPTCEntTemp", "程序", "VW14120", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); - TagManger.AddTag(new Tag("通讯PTC出水温度", "通讯PTC出水温度[℃]", "ComPTCExpTemp", "程序", "VW14122", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); - TagManger.AddTag(new Tag("通讯PTC峰值电流", "通讯PTC峰值电流[A]", "ComPTCPeakCur", "程序", "VW14124", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 }); - TagManger.AddTag(new Tag("通讯PTC母线电流", "通讯PTC母线电流[A]", "ComPTCBusCur", "程序", "VW14126", 100, 0, 100, "A", new ShortTagValue(), false) { DecimalPoint = 2 }); - TagManger.AddTag(new Tag("通讯PTC膜温", "通讯PTC膜温[℃]", "ComPTCFlmTemp", "程序", "VW14128", 100, 0, 1, "℃", new ShortTagValue(), false) { DecimalPoint = 0 }); - TagManger.AddTag(new Tag("通讯PTC模块温度", "通讯PTC模块温度[℃]", "ComPTCMdTemp", "程序", "VW14130", 100, 0, 1, "℃", new ShortTagValue(), false) { DecimalPoint = 0 }); + //TagManger.AddTag(new Tag("通讯PTC入水温度", "通讯PTC入水温度[℃]", "ComPTCEntTemp", "程序", "VW14120", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); + //TagManger.AddTag(new Tag("通讯PTC出水温度", "通讯PTC出水温度[℃]", "ComPTCExpTemp", "程序", "VW14122", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); + //TagManger.AddTag(new Tag("通讯PTC峰值电流", "通讯PTC峰值电流[A]", "ComPTCPeakCur", "程序", "VW14124", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 }); + //TagManger.AddTag(new Tag("通讯PTC母线电流", "通讯PTC母线电流[A]", "ComPTCBusCur", "程序", "VW14126", 100, 0, 100, "A", new ShortTagValue(), false) { DecimalPoint = 2 }); + //TagManger.AddTag(new Tag("通讯PTC膜温", "通讯PTC膜温[℃]", "ComPTCFlmTemp", "程序", "VW14128", 100, 0, 1, "℃", new ShortTagValue(), false) { DecimalPoint = 0 }); + //TagManger.AddTag(new Tag("通讯PTC模块温度", "通讯PTC模块温度[℃]", "ComPTCMdTemp", "程序", "VW14130", 100, 0, 1, "℃", new ShortTagValue(), false) { DecimalPoint = 0 }); TagManger.AddTag(new Tag("过热度", "过热度[K]", "Superheat", "程序", "", 100, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag("过冷度", "过冷度[K]", "Subcooling", "程序", "", 100, 0, 1, "K", new ShortTagValue(), false) { DecimalPoint = 1 }); diff --git a/CapMachine.Wpf/Services/NavigationMenuService.cs b/CapMachine.Wpf/Services/NavigationMenuService.cs index e78e371..716ea63 100644 --- a/CapMachine.Wpf/Services/NavigationMenuService.cs +++ b/CapMachine.Wpf/Services/NavigationMenuService.cs @@ -77,10 +77,10 @@ namespace CapMachine.Wpf.Services //})); MenuItems.Add(new NavigationItem("", "工艺过程", "MonitorView")); MenuItems.Add(new NavigationItem("", "CAN配置", "CANConfigView")); - MenuItems.Add(new NavigationItem("", "CANFD配置", "CANFDConfigView")); + //MenuItems.Add(new NavigationItem("", "CANFD配置", "CANFDConfigView")); MenuItems.Add(new NavigationItem("", "LIN配置", "LINConfigView")); - MenuItems.Add(new NavigationItem("", "ZLG CAN配置", "ZlgCanDriveConfigView")); - MenuItems.Add(new NavigationItem("", "ZLG LIN配置", "ZlgLinDriveConfigView")); + //MenuItems.Add(new NavigationItem("", "ZLG CAN配置", "ZlgCanDriveConfigView")); + //MenuItems.Add(new NavigationItem("", "ZLG LIN配置", "ZlgLinDriveConfigView")); MenuItems.Add(new NavigationItem("", "工艺参数", "ProConfigView")); MenuItems.Add(new NavigationItem("", "工艺曲线", "RealTimeChartView")); MenuItems.Add(new NavigationItem("", "动作日志", "ActionLogView")); diff --git a/CapMachine.Wpf/Services/PPCService.cs b/CapMachine.Wpf/Services/PPCService.cs index 7a689be..00341b4 100644 --- a/CapMachine.Wpf/Services/PPCService.cs +++ b/CapMachine.Wpf/Services/PPCService.cs @@ -306,7 +306,7 @@ namespace CapMachine.Wpf.Services } if (iErr == 0) - Superheat.EngPvValue = InhTempTag.EngPvValue - (te - 273.15); + Superheat.EngPvValue =Math.Abs(InhTempTag.EngPvValue - (te - 273.15)) ; else Superheat.EngPvValue = 0; @@ -316,7 +316,7 @@ namespace CapMachine.Wpf.Services IRefProp64.SATPdll(ref p1, x, ref kph, ref te1, ref Dl, ref Dv, xliq, xvap, ref iErr, ref herr, ref herrLen); } if (iErr == 0) - Subcool.EngPvValue = TxvFrTempTag.EngPvValue - (te1 - 273.15); + Subcool.EngPvValue = Math.Abs(TxvFrTempTag.EngPvValue - (te1 - 273.15)); else Subcool.EngPvValue = 0;