From 7181643cb837fc205f3a37a06d80dce4e2e2016b Mon Sep 17 00:00:00 2001 From: Tyrone CT Date: Mon, 6 Jan 2025 23:27:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=8E=8B=E5=8A=9B?= =?UTF-8?q?=E7=9A=84=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CapMachine.Wpf/Dtos/QuickMeterStepDto.cs | 8 ++--- CapMachine.Wpf/Models/CsvRecordModel.cs | 32 +++++++++---------- CapMachine.Wpf/Models/CsvRecordModelMap.cs | 16 +++++----- .../Models/LightChart/ChartManager.cs | 16 +++++----- CapMachine.Wpf/Models/SeekData.cs | 2 +- CapMachine.Wpf/Services/DataRecordService.cs | 28 ++++++++-------- .../Services/MachineRtDataService.cs | 20 ++++++------ CapMachine.Wpf/Views/QuickMeterStepView.xaml | 8 ++--- 8 files changed, 65 insertions(+), 65 deletions(-) diff --git a/CapMachine.Wpf/Dtos/QuickMeterStepDto.cs b/CapMachine.Wpf/Dtos/QuickMeterStepDto.cs index 4becada..139ee01 100644 --- a/CapMachine.Wpf/Dtos/QuickMeterStepDto.cs +++ b/CapMachine.Wpf/Dtos/QuickMeterStepDto.cs @@ -70,7 +70,7 @@ namespace CapMachine.Wpf.Dtos /// /// 吸气压力 信息 /// - [Column("吸气压力(BarA)")] + [Column("吸气压力(MpaA)")] public double InhPress { get { return _InhPress; } @@ -81,7 +81,7 @@ namespace CapMachine.Wpf.Dtos /// /// 排气压力 信息 /// - [Column("排气压力(BarA)")] + [Column("排气压力(MpaA)")] public double ExPress { get { return _ExPress; } @@ -125,7 +125,7 @@ namespace CapMachine.Wpf.Dtos /// /// COND2压力 信息 /// - [Column("COND2压力(BarA)")] + [Column("COND2压力(MpaA)")] public double Cond2Press { get { return _Cond2Press; } @@ -158,7 +158,7 @@ namespace CapMachine.Wpf.Dtos /// /// 润滑油压力 信息 /// - [Column("润滑油压力(BarA)")] + [Column("润滑油压力(MpaA)")] public double LubePress { get { return _LubePress; } diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs index c981ed7..1529660 100644 --- a/CapMachine.Wpf/Models/CsvRecordModel.cs +++ b/CapMachine.Wpf/Models/CsvRecordModel.cs @@ -39,17 +39,17 @@ namespace CapMachine.Wpf.Models public int Speed { get; set; } /// - /// 排气压力[BarA] + /// 排气压力[MpaA] /// V /// - [Name("排气压力[BarA]")] + [Name("排气压力[MpaA]")] public double ExPress { get; set; } /// - /// 吸气压力[BarA] + /// 吸气压力[MpaA] /// V /// - [Name("吸气压力[BarA]")] + [Name("吸气压力[MpaA]")] public double InhPress { get; set; } /// @@ -67,15 +67,15 @@ namespace CapMachine.Wpf.Models public double Cond1Temp { get; set; } ///// - ///// 润滑油压力[BarA] + ///// 润滑油压力[MpaA] ///// - //[Name("润滑油压力[BarA]")] + //[Name("润滑油压力[MpaA]")] //public double LubePress { get; set; } ///// - ///// COND2压力[BarA] + ///// COND2压力[MpaA] ///// - //[Name("COND2压力[BarA]")] + //[Name("COND2压力[MpaA]")] //public double Cond2Press { get; set; } ///// @@ -178,10 +178,10 @@ namespace CapMachine.Wpf.Models public double ExTemp { get; set; } /// - /// 膨胀阀前压力[BarA] + /// 膨胀阀前压力[MpaA] /// V /// - [Name("膨胀阀前压力[BarA]")] + [Name("膨胀阀前压力[MpaA]")] public double TxvFrPress { get; set; } /// @@ -199,16 +199,16 @@ namespace CapMachine.Wpf.Models public double CondInTemp { get; set; } /// - /// 冷凝器进口压力[BarA] + /// 冷凝器进口压力[MpaA] /// V /// - [Name("冷凝器进口压力[BarA]")] + [Name("冷凝器进口压力[MpaA]")] public double CondInPress { get; set; } ///// - ///// EVAP出口压力[BarA] + ///// EVAP出口压力[MpaA] ///// - //[Name("EVAP出口压力[BarA]")] + //[Name("EVAP出口压力[MpaA]")] //public double EVAPExpPress { get; set; } /// @@ -247,9 +247,9 @@ namespace CapMachine.Wpf.Models public double CapSurfTemp3 { get; set; } ///// - ///// 腔内压力[BarA] + ///// 腔内压力[MpaA] ///// - //[Name("腔内压力[BarA]")] + //[Name("腔内压力[MpaA]")] //public double IntrplPress { get; set; } ///// diff --git a/CapMachine.Wpf/Models/CsvRecordModelMap.cs b/CapMachine.Wpf/Models/CsvRecordModelMap.cs index 1d48d42..1a7f98d 100644 --- a/CapMachine.Wpf/Models/CsvRecordModelMap.cs +++ b/CapMachine.Wpf/Models/CsvRecordModelMap.cs @@ -64,8 +64,8 @@ namespace CapMachine.Wpf.Models Map(m => m.Time).Name("时间"); Map(m => m.WorkCond).Name("工况"); Map(m => m.Speed).Name("转速[rpm]"); - Map(m => m.ExPress).Name("排气压力[BarA]"); - Map(m => m.InhPress).Name("吸气压力[BarA]"); + Map(m => m.ExPress).Name("排气压力[MpaA]"); + Map(m => m.InhPress).Name("吸气压力[MpaA]"); Map(m => m.InhTemp).Name("吸气温度[℃]"); Map(m => m.Cond1Temp).Name("COND1温度[℃]"); Map(m => m.OS2Temp).Name("OS2温度[℃]"); @@ -77,27 +77,27 @@ namespace CapMachine.Wpf.Models Map(m => m.EnvTemp).Name("环境温度[℃]"); Map(m => m.EnvRH).Name("环境湿度[%]"); Map(m => m.ExTemp).Name("排气温度[℃]"); - Map(m => m.TxvFrPress).Name("膨胀阀前压力[BarA]"); + Map(m => m.TxvFrPress).Name("膨胀阀前压力[MpaA]"); Map(m => m.TxvFrTemp).Name("膨胀阀前温度[℃]"); Map(m => m.CondInTemp).Name("冷凝器进口温度[℃]"); - Map(m => m.CondInPress).Name("冷凝器进口压力[BarA]"); + Map(m => m.CondInPress).Name("冷凝器进口压力[MpaA]"); Map(m => m.WaterTankInTemp).Name("水箱进水温度[℃]"); Map(m => m.WaterHeatTempH1).Name("水加热温度H1[℃]"); Map(m => m.CapSurfTemp1).Name("压缩机表面温度1[℃]"); Map(m => m.CapSurfTemp2).Name("压缩机表面温度2[℃]"); Map(m => m.CapSurfTemp3).Name("压缩机表面温度3[℃]"); - //Map(m => m.LubePress).Name("润滑油压力[BarA]"); - //Map(m => m.Cond2Press).Name("COND2压力[BarA]"); + //Map(m => m.LubePress).Name("润滑油压力[MpaA]"); + //Map(m => m.Cond2Press).Name("COND2压力[MpaA]"); //Map(m => m.OCR).Name("OCR[%]"); //Map(m => m.OS1Temp).Name("OS1温度[℃]"); //Map(m => m.Cond2Temp).Name("COND2温度[℃]"); //Map(m => m.EVAPExpTemp).Name("EVAP出口温度[℃]"); //Map(m => m.VRV).Name("冷媒流量[L/min]"); //Map(m => m.LubeFlow).Name("润滑油流量[L/min]"); - //Map(m => m.EVAPExpPress).Name("EVAP出口压力[BarA]"); - //Map(m => m.IntrplPress).Name("腔内压力[BarA]"); + //Map(m => m.EVAPExpPress).Name("EVAP出口压力[MpaA]"); + //Map(m => m.IntrplPress).Name("腔内压力[MpaA]"); //Map(m => m.CapSurfTemp).Name("压缩机表面温度[℃]"); //Map(m => m.PTCFlow).Name("PTC流量[L/min]"); //Map(m => m.PTCEntTemp).Name("PTC入水温度[℃]"); diff --git a/CapMachine.Wpf/Models/LightChart/ChartManager.cs b/CapMachine.Wpf/Models/LightChart/ChartManager.cs index 28a5a35..06a3abc 100644 --- a/CapMachine.Wpf/Models/LightChart/ChartManager.cs +++ b/CapMachine.Wpf/Models/LightChart/ChartManager.cs @@ -202,17 +202,17 @@ namespace CapMachine.Wpf.Models.LightChart { case "转速[rpm]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.Speed, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "排气压力[BarA]": + case "排气压力[MpaA]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.ExPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "吸气压力[BarA]": + case "吸气压力[MpaA]": 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温度[℃]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.Cond1Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - //case "润滑油压力[BarA]": + //case "润滑油压力[MpaA]": // return CurHistoryData.Select(a => new ChartPoint() { Value = a.LubePress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - //case "COND2压力[BarA]": + //case "COND2压力[MpaA]": // 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(); @@ -244,13 +244,13 @@ 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]": + case "膨胀阀前压力[MpaA]": 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]": + //case "EVAP出口压力[MpaA]": // return CurHistoryData.Select(a => new ChartPoint() { Value = a.EVAPExpPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - //case "腔内压力[BarA]": + //case "腔内压力[MpaA]": // 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(); @@ -290,7 +290,7 @@ namespace CapMachine.Wpf.Models.LightChart case "冷凝器进口温度[℃]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.CondInTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); - case "冷凝器进口压力[BarA]": + case "冷凝器进口压力[MpaA]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.CondInPress, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); case "水箱进水温度[℃]": return CurHistoryData.Select(a => new ChartPoint() { Value = a.WaterTankInTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList(); diff --git a/CapMachine.Wpf/Models/SeekData.cs b/CapMachine.Wpf/Models/SeekData.cs index 1ea219d..eddef06 100644 --- a/CapMachine.Wpf/Models/SeekData.cs +++ b/CapMachine.Wpf/Models/SeekData.cs @@ -69,7 +69,7 @@ namespace CapMachine.Wpf.Models new ConfigChartYAxis(){ Index=2,Min=0,Max=8000,Name="转速",Unit="rpm"}, new ConfigChartYAxis(){ Index=3,Min=0,Max=100,Name="电压",Unit="V"}, new ConfigChartYAxis(){ Index=4,Min=0,Max=100,Name="电流",Unit="A"}, - new ConfigChartYAxis(){ Index=5,Min=0,Max=5,Name="压力",Unit="BarA"}, + new ConfigChartYAxis(){ Index=5,Min=0,Max=5,Name="压力",Unit="MpaA"}, new ConfigChartYAxis(){ Index=6,Min=0,Max=5,Name="流量",Unit="L/min"}, new ConfigChartYAxis(){ Index=7,Min=0,Max=5,Name="功率",Unit="W"}, }; diff --git a/CapMachine.Wpf/Services/DataRecordService.cs b/CapMachine.Wpf/Services/DataRecordService.cs index e071932..f7ed53f 100644 --- a/CapMachine.Wpf/Services/DataRecordService.cs +++ b/CapMachine.Wpf/Services/DataRecordService.cs @@ -105,12 +105,12 @@ namespace CapMachine.Wpf.Services new Columns(){ Name="Id",MapType="System.Int64",IsIdentity=true,IsPrimary=true}, new Columns(){ Name="工况",MapType="System.String",IsIdentity=false,IsPrimary=false,StringLength=100}, new Columns(){ Name="转速[rpm]",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="排气压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="吸气压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="吸气温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="COND1温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="润滑油压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="COND2压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="润滑油压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="COND2压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="OCR[%]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="HV[V]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="HV[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, @@ -126,10 +126,10 @@ namespace CapMachine.Wpf.Services new Columns(){ Name="冷媒流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="润滑油流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="排气温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, - new Columns(){ Name="膨胀阀前压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="膨胀阀前压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, 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="腔内压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="EVAP出口压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, + new Columns(){ Name="腔内压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="压缩机表面温度[℃]",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}, @@ -446,12 +446,12 @@ namespace CapMachine.Wpf.Services //new Dictionary() //{ // {"转速[rpm]",Random.Next(0,10)+10 +Add}, - // {"排气压力[BarA]",Random.Next(0,10)+20 +Add}, - // {"吸气压力[BarA]",Random.Next(0,10)+30 +Add}, + // {"排气压力[MpaA]",Random.Next(0,10)+20 +Add}, + // {"吸气压力[MpaA]",Random.Next(0,10)+30 +Add}, // {"吸气温度[℃]",Random.Next(0,10)+40 +Add}, // {"COND1温度[℃]",Random.Next(0,10)+50 +Add}, - // {"润滑油压力[BarA]",Random.Next(0,10)+60 +Add}, - // {"COND2压力[BarA]",Random.Next(0,10)+70 +Add}, + // {"润滑油压力[MpaA]",Random.Next(0,10)+60 +Add}, + // {"COND2压力[MpaA]",Random.Next(0,10)+70 +Add}, // {"OCR[%]",Random.Next(0,10)+80 +Add}, // {"HV[V]",Random.Next(0,10)+90 +Add}, // {"HV[A]",Random.Next(0,10)+5 +Add}, @@ -467,10 +467,10 @@ namespace CapMachine.Wpf.Services // {"冷媒流量[L/min]",Random.Next(0,10) +10+Add}, // {"润滑油流量[L/min]",Random.Next(0,10)+1 +Add}, // {"排气温度[℃]",Random.Next(0,10)+13 +Add}, - // {"膨胀阀前压力[BarA]",Random.Next(0,10)+23 +Add}, + // {"膨胀阀前压力[MpaA]",Random.Next(0,10)+23 +Add}, // {"膨胀阀前温度[℃]",Random.Next(0,10) +33+Add}, - // {"EVAP出口压力[BarA]",Random.Next(0,10)+43 +Add}, - // {"腔内压力[BarA]",Random.Next(0,10) +53+Add}, + // {"EVAP出口压力[MpaA]",Random.Next(0,10)+43 +Add}, + // {"腔内压力[MpaA]",Random.Next(0,10) +53+Add}, // {"压缩机表面温度[℃]",Random.Next(0,10)+63 +Add}, // {"PTC流量[L/min]",Random.Next(0,10)+73 +Add}, // {"PTC入水温度[℃]",Random.Next(0,10)+83 +Add}, diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs index b49d336..d3b4540 100644 --- a/CapMachine.Wpf/Services/MachineRtDataService.cs +++ b/CapMachine.Wpf/Services/MachineRtDataService.cs @@ -135,12 +135,12 @@ namespace CapMachine.Wpf.Services //【测试】 //TagManger.AddTag(new Tag("转速", "转速[rpm]", "Speed", "程序", "VW15000", 100, 0, 1, "rpm", new ShortTagValue(), true) { DecimalPoint = 0 }); - //TagManger.AddTag(new Tag("排气压力", "排气压力[BarA]", "ExPress", "程序", "VW15002", 100, 0, 100, "BarA", new ShortTagValue(), true) { DecimalPoint = 2 }); - //TagManger.AddTag(new Tag("吸气压力", "吸气压力[BarA]", "InhPress", "程序", "VW15004", 100, 0, 100, "BarA", new ShortTagValue(), true) { DecimalPoint = 2 }); + //TagManger.AddTag(new Tag("排气压力", "排气压力[MpaA]", "ExPress", "程序", "VW15002", 100, 0, 100, "MpaA", new ShortTagValue(), true) { DecimalPoint = 2 }); + //TagManger.AddTag(new Tag("吸气压力", "吸气压力[MpaA]", "InhPress", "程序", "VW15004", 100, 0, 100, "MpaA", new ShortTagValue(), true) { DecimalPoint = 2 }); //TagManger.AddTag(new Tag("吸气温度", "吸气温度[℃]", "InhTemp", "程序", "VW15006", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag("COND1温度", "COND1温度[℃]", "Cond1Temp", "程序", "VW15008", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 }); - //TagManger.AddTag(new Tag("润滑油压力", "润滑油压力[BarA]", "LubePress", "程序", "VW15010", 100, 0, 100, "BarA", new ShortTagValue(), true) { DecimalPoint = 2 }); - //TagManger.AddTag(new Tag("COND2压力", "COND2压力[BarA]", "Cond2Press", "程序", "VW15012", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 }); + //TagManger.AddTag(new Tag("润滑油压力", "润滑油压力[MpaA]", "LubePress", "程序", "VW15010", 100, 0, 100, "MpaA", new ShortTagValue(), true) { DecimalPoint = 2 }); + //TagManger.AddTag(new Tag("COND2压力", "COND2压力[MpaA]", "Cond2Press", "程序", "VW15012", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 }); //TagManger.AddTag(new Tag("OCR", "OCR[%]", "OCR", "程序", "VW15014", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag("HV[V]", "HV[V]", "HV", "程序", "VW15016", 100, 0, 10, "V", new ShortTagValue(), true) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag("HV[A]", "HV[A]", "HVCur", "程序", "VW15018", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 }); @@ -159,10 +159,10 @@ namespace CapMachine.Wpf.Services //TagManger.AddTag(new Tag("冷媒流量", "冷媒流量[L/min]", "VRV", "程序", "VW15038", 100, 0, 10, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag("润滑油流量", "润滑油流量[L/min]", "LubeFlow", "程序", "VW15040", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag("排气温度", "排气温度[℃]", "ExTemp", "程序", "VW15042", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 }); - //TagManger.AddTag(new Tag("膨胀阀前压力", "膨胀阀前压力[BarA]", "TxvFrPress", "程序", "VW15044", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 }); + //TagManger.AddTag(new Tag("膨胀阀前压力", "膨胀阀前压力[MpaA]", "TxvFrPress", "程序", "VW15044", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 }); //TagManger.AddTag(new Tag("膨胀阀前温度", "膨胀阀前温度[℃]", "TxvFrTemp", "程序", "VW15046", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); - //TagManger.AddTag(new Tag("EVAP出口压力", "EVAP出口压力[BarA]", "EVAPExpPress", "程序", "VW15048", 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("EVAP出口压力", "EVAP出口压力[MpaA]", "EVAPExpPress", "程序", "VW15048", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 }); + //TagManger.AddTag(new Tag("腔内压力", "腔内压力[MpaA]", "IntrplPress", "程序", "VW15050", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 }); //TagManger.AddTag(new Tag("压缩机表面温度", "压缩机表面温度[℃]", "CapSurfTemp", "程序", "VW15052", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag("PTC流量", "PTC流量[L/min]", "PTCFlow", "程序", "VW15054", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag("PTC入水温度", "PTC入水温度[℃]", "PTCEntTemp", "程序", "VW15056", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); @@ -780,10 +780,10 @@ namespace CapMachine.Wpf.Services //TagManger.AddTag(new Tag("冷媒流量", "冷媒流量[L/min]", "VRV", "程序", "VW15038", 100, 0, 10, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag("润滑油流量", "润滑油流量[L/min]", "LubeFlow", "程序", "VW15040", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag("排气温度", "排气温度[℃]", "ExTemp", "程序", "VW15042", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 }); - //TagManger.AddTag(new Tag("膨胀阀前压力", "膨胀阀前压力[BarA]", "TxvFrPress", "程序", "VW15044", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 }); + //TagManger.AddTag(new Tag("膨胀阀前压力", "膨胀阀前压力[MpaA]", "TxvFrPress", "程序", "VW15044", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 }); //TagManger.AddTag(new Tag("膨胀阀前温度", "膨胀阀前温度[℃]", "TxvFrTemp", "程序", "VW15046", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); - //TagManger.AddTag(new Tag("EVAP出口压力", "EVAP出口压力[BarA]", "EVAPExpPress", "程序", "VW15048", 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("EVAP出口压力", "EVAP出口压力[MpaA]", "EVAPExpPress", "程序", "VW15048", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 }); + //TagManger.AddTag(new Tag("腔内压力", "腔内压力[MpaA]", "IntrplPress", "程序", "VW15050", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 }); //TagManger.AddTag(new Tag("压缩机表面温度", "压缩机表面温度[℃]", "CapSurfTemp", "程序", "VW15052", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag("PTC流量", "PTC流量[L/min]", "PTCFlow", "程序", "VW15054", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag("PTC入水温度", "PTC入水温度[℃]", "PTCEntTemp", "程序", "VW15056", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); diff --git a/CapMachine.Wpf/Views/QuickMeterStepView.xaml b/CapMachine.Wpf/Views/QuickMeterStepView.xaml index 311f9ef..f8f58d6 100644 --- a/CapMachine.Wpf/Views/QuickMeterStepView.xaml +++ b/CapMachine.Wpf/Views/QuickMeterStepView.xaml @@ -167,11 +167,11 @@ MappingName="Speed" NumberDecimalDigits="0" />