From 620c5e81786362387fab744df5f48548e9b22f6f Mon Sep 17 00:00:00 2001 From: Tyrone CT Date: Tue, 7 Jan 2025 22:48:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9D=BE=E8=8A=9D=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E8=BD=AC=E6=8D=A2=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/LightChart/ChartManager.cs | 51 ++++++++++--------- .../ProPars/ProParsSongZhiHelper.cs | 24 ++++----- .../Services/MachineRtDataService.cs | 8 +-- .../ViewModels/CANConfigViewModel.cs | 2 +- 4 files changed, 43 insertions(+), 42 deletions(-) diff --git a/CapMachine.Wpf/Models/LightChart/ChartManager.cs b/CapMachine.Wpf/Models/LightChart/ChartManager.cs index 06a3abc..df02141 100644 --- a/CapMachine.Wpf/Models/LightChart/ChartManager.cs +++ b/CapMachine.Wpf/Models/LightChart/ChartManager.cs @@ -192,6 +192,7 @@ namespace CapMachine.Wpf.Models.LightChart stopwatch.Reset(); } + /// /// 根据名称获取Point数据 /// @@ -208,7 +209,7 @@ namespace CapMachine.Wpf.Models.LightChart return CurHistoryData.Select(a => new ChartPoint() { Value = a.InhPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); case "吸气温度[℃]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.InhTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "COND1温度[℃]": + case "冷凝器出口水温[℃]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond1Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); //case "润滑油压力[MpaA]": // return CurHistoryData.Select(a => new ChartPoint() { Value = a.LubePress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); @@ -216,32 +217,32 @@ namespace CapMachine.Wpf.Models.LightChart // return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond2Press, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); //case "OCR[%]": // return CurHistoryData.Select(a => new ChartPoint() { Value = a.OCR, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "HV[V]": + case "HV_V[V]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.HV, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "HV[A]": + case "HV_A[A]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.HVCur, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "HV[W]": + case "HV_W[W]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.HVPw, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "LV[V]": + case "LV_V[V]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.LV, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "LV[A]": + case "LV_A[A]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.LVCur, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "环境温度[℃]": + case "试验箱温度[℃]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.EnvTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "环境湿度[%]": + case "试验箱湿度[%]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.EnvRH, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "OS1温度[℃]": - //return CurHistoryData.Select(a => new ChartPoint() { Value = a.OS1Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "OS2温度[℃]": + //case "OS1温度[℃]": + //return CurHistoryData.Select(a => new ChartPoint() { Value = a.OS1Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + case "吸气混合器温度[℃]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.OS2Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "COND2温度[℃]": - //return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond2Temp, 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 "冷媒流量[L/min]": - //return CurHistoryData.Select(a => new ChartPoint() { Value = a.VRV, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "润滑油流量[L/min]": - //return CurHistoryData.Select(a => new ChartPoint() { Value = a.LubeFlow, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + //case "COND2温度[℃]": + //return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond2Temp, 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 "冷媒流量[L/min]": + //return CurHistoryData.Select(a => new ChartPoint() { Value = a.VRV, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); + //case "润滑油流量[L/min]": + //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 "膨胀阀前压力[MpaA]": @@ -260,17 +261,17 @@ namespace CapMachine.Wpf.Models.LightChart // 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 "通讯母线电流[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]": + //return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComCapInvTemp, 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(); diff --git a/CapMachine.Wpf/ProPars/ProParsSongZhiHelper.cs b/CapMachine.Wpf/ProPars/ProParsSongZhiHelper.cs index 515e2d4..96d37a1 100644 --- a/CapMachine.Wpf/ProPars/ProParsSongZhiHelper.cs +++ b/CapMachine.Wpf/ProPars/ProParsSongZhiHelper.cs @@ -33,14 +33,14 @@ namespace CapMachine.Wpf.ProPars ListPlcParsData = new List() { new PlcParsData(){ Name="速度",EnName="Speed",Step=150,SetAddressInfo=AddressInfo.OK,Steps=new List(),Ratio=1,Unit="",ValueStartAddress=1008,MinStartAddress=1000,SecStartAddress=1002,CycleStartAddress=1006,SlopConstAddress=1004 }, - new PlcParsData(){ Name="排气压力",EnName="ExPress",SetAddressInfo=AddressInfo.OK,Step=150,Steps=new List(),Ratio=100,Unit="" ,ValueStartAddress=1032,MinStartAddress=1024,SecStartAddress=1026,CycleStartAddress=1030,SlopConstAddress=1028 }, - new PlcParsData(){ Name="吸气压力",EnName="InhPress",SetAddressInfo=AddressInfo.OK,Step=150,Steps=new List(),Ratio=100,Unit="" ,ValueStartAddress=1046,MinStartAddress=1038,SecStartAddress=1040,CycleStartAddress=1044,SlopConstAddress=1042 }, + new PlcParsData(){ Name="排气压力",EnName="ExPress",SetAddressInfo=AddressInfo.OK,Step=150,Steps=new List(),Ratio=1000,Unit="" ,ValueStartAddress=1032,MinStartAddress=1024,SecStartAddress=1026,CycleStartAddress=1030,SlopConstAddress=1028 }, + new PlcParsData(){ Name="吸气压力",EnName="InhPress",SetAddressInfo=AddressInfo.OK,Step=150,Steps=new List(),Ratio=1000,Unit="" ,ValueStartAddress=1046,MinStartAddress=1038,SecStartAddress=1040,CycleStartAddress=1044,SlopConstAddress=1042 }, new PlcParsData(){ Name="吸气温度",EnName="InhTemp",SetAddressInfo=AddressInfo.OK,Step=150,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1060,MinStartAddress=1052,SecStartAddress=1054,CycleStartAddress=1058,SlopConstAddress=1056 }, new PlcParsData(){ Name="冷凝器出口水温",EnName="Cond1Temp",SetAddressInfo=AddressInfo.OK,Step=150,Steps=new List(),Ratio=10,Unit="",ValueStartAddress=1074,MinStartAddress=1066,SecStartAddress=1068,CycleStartAddress=1072,SlopConstAddress=1070 }, new PlcParsData(){ Name="吸气混合器温度",EnName="OS2Temp",Step=150,SetAddressInfo=AddressInfo.NoCycle,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1088,MinStartAddress=1080,SecStartAddress=1082 },//?? new PlcParsData(){ Name="HV电压",EnName="HVVol",Step=150,SetAddressInfo=AddressInfo.OK,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1102,MinStartAddress=1094,SecStartAddress=1096,CycleStartAddress=1100,SlopConstAddress=1198 }, new PlcParsData(){ Name="LV电压",EnName="LVVol",Step=150,SetAddressInfo=AddressInfo.NoCycle,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1114,MinStartAddress=1106,SecStartAddress=1108}, - new PlcParsData(){ Name="压缩机环境温度",EnName="EnvTemp",Step=150,SetAddressInfo=AddressInfo.OK,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1128,MinStartAddress=1120,SecStartAddress=1122,CycleStartAddress=1126,SlopConstAddress=1024 }, + new PlcParsData(){ Name="压缩机环境温度",EnName="EnvTemp",Step=150,SetAddressInfo=AddressInfo.OK,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1128,MinStartAddress=1120,SecStartAddress=1122,CycleStartAddress=1126,SlopConstAddress=1124 }, new PlcParsData(){ Name="压缩机环境湿度",EnName="EnvRH",Step=150,SetAddressInfo=AddressInfo.NoCycle,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1142,MinStartAddress=1134,SecStartAddress=1136}, @@ -66,7 +66,7 @@ namespace CapMachine.Wpf.ProPars new PlcParsData(){ Name="输出锁定",EnName="OutLock",Step=100,SetAddressInfo=AddressInfo.NoTimeAndCycle,Steps=new List(),Ratio=1,Unit="" ,ValueStartAddress=1016,MinStartAddress=0,SecStartAddress=0,CycleStartAddress=0 }, new PlcParsData(){ Name="参数编号",EnName="ParNo",Step=100,SetAddressInfo=AddressInfo.NoTimeAndCycle,Steps=new List(),Ratio=1,Unit="" ,ValueStartAddress=1018,MinStartAddress=0,SecStartAddress=0,CycleStartAddress=0 }, - new PlcParsData(){ Name="EV",EnName="EV",Step=100,SetAddressInfo=AddressInfo.NoTimeAndCycle,Steps=new List(),Ratio=1,Unit="" ,ValueStartAddress=0,MinStartAddress=0,SecStartAddress=0,CycleStartAddress=0 }, + new PlcParsData(){ Name="EV",EnName="EV",Step=100,SetAddressInfo=AddressInfo.NoTimeAndCycle,Steps=new List(),Ratio=1,Unit="" ,ValueStartAddress=1012,MinStartAddress=0,SecStartAddress=0,CycleStartAddress=0 }, new PlcParsData(){ Name="压缩机使能",EnName="CapEnable",Step=100,SetAddressInfo=AddressInfo.NoTimeAndCycle,Steps=new List(),Ratio=1,Unit="" ,ValueStartAddress=1010,MinStartAddress=0,SecStartAddress=0,CycleStartAddress=0 }, new PlcParsData(){ Name="吸排气阀",EnName="InhExhValve",Step=100,SetAddressInfo=AddressInfo.NoTimeAndCycle,Steps=new List(),Ratio=1,Unit="" ,ValueStartAddress=1014,MinStartAddress=0,SecStartAddress=0,CycleStartAddress=0 }, new PlcParsData(){ Name="PTC使能",EnName="PTCEnable",Step=100,SetAddressInfo=AddressInfo.NoTimeAndCycle,Steps=new List(),Ratio=1,Unit="" ,ValueStartAddress=0,MinStartAddress=0,SecStartAddress=0,CycleStartAddress=0 }, @@ -324,10 +324,10 @@ namespace CapMachine.Wpf.ProPars ParNoData.Value = Convert.ToDouble(item.ParNo); FindParNo.Steps.Add(ParNoData); - //var FindEV = ListPlcParsData.Find(a => a.Name.Equals("EV")); - //var EVData = plcMeterStepCell.DeepClone(); - //EVData.Value = Convert.ToDouble(item.Ev); - //FindEV.Steps.Add(EVData); + var FindEV = ListPlcParsData.Find(a => a.Name.Equals("EV")); + var EVData = plcMeterStepCell.DeepClone(); + EVData.Value = Convert.ToDouble(item.Ev); + FindEV.Steps.Add(EVData); var FindCapEnable = ListPlcParsData.Find(a => a.Name.Equals("压缩机使能")); var CapEnableData = plcMeterStepCell.DeepClone(); @@ -377,10 +377,10 @@ namespace CapMachine.Wpf.ProPars ParNoData.Value = Convert.ToDouble(Data.ParNo); FindParNo.Steps.Add(ParNoData); - //var FindEV = ListPlcParsData.Find(a => a.Name.Equals("EV")); - //var EVData = plcMeterStepCell.DeepClone(); - //EVData.Value = Convert.ToDouble(Data.Ev); - //FindEV.Steps.Add(EVData); + var FindEV = ListPlcParsData.Find(a => a.Name.Equals("EV")); + var EVData = plcMeterStepCell.DeepClone(); + EVData.Value = Convert.ToDouble(Data.Ev); + FindEV.Steps.Add(EVData); var FindCapEnable = ListPlcParsData.Find(a => a.Name.Equals("压缩机使能")); var CapEnableData = plcMeterStepCell.DeepClone(); diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs index 88f947f..0653605 100644 --- a/CapMachine.Wpf/Services/MachineRtDataService.cs +++ b/CapMachine.Wpf/Services/MachineRtDataService.cs @@ -339,7 +339,7 @@ namespace CapMachine.Wpf.Services MVAddress = "", IsMeter = false, Precision = 100, - DecimalPoint = 1, + DecimalPoint = 2, Samp = 1, ValueType = typeof(short), Index = "", @@ -358,7 +358,7 @@ namespace CapMachine.Wpf.Services MVAddress = "", IsMeter = false, Precision = 1, - DecimalPoint = 1, + DecimalPoint = 0, Samp = 1, ValueType = typeof(short), Index = "", @@ -397,7 +397,7 @@ namespace CapMachine.Wpf.Services MVAddress = "", IsMeter = false, Precision = 100, - DecimalPoint = 1, + DecimalPoint = 2, Samp = 1, ValueType = typeof(short), Index = "", @@ -703,7 +703,7 @@ namespace CapMachine.Wpf.Services MVAddress = "", IsMeter = false, Precision = 1, - DecimalPoint = 0, + DecimalPoint = 2, Samp = 1, ValueType = typeof(short), Index = "", diff --git a/CapMachine.Wpf/ViewModels/CANConfigViewModel.cs b/CapMachine.Wpf/ViewModels/CANConfigViewModel.cs index 4915069..3eb0359 100644 --- a/CapMachine.Wpf/ViewModels/CANConfigViewModel.cs +++ b/CapMachine.Wpf/ViewModels/CANConfigViewModel.cs @@ -65,7 +65,7 @@ namespace CapMachine.Wpf.ViewModels new CbxItems(){ Key="通讯母线电压",Text="通讯母线电压"}, new CbxItems(){ Key="通讯母线电流",Text="通讯母线电流"}, new CbxItems(){ Key="通讯相电流",Text="通讯相电流"}, - new CbxItems(){ Key="通信功率",Text="通信功率"}, + new CbxItems(){ Key="通讯功率",Text="通讯功率"}, new CbxItems(){ Key="通讯芯片温度",Text="通讯芯片温度"}, }; InitLoadCanConfigPro();