diff --git a/CapMachine.Wpf/Dtos/QuickMeterStepDto.cs b/CapMachine.Wpf/Dtos/QuickMeterStepDto.cs
index 4becada..20c83f9 100644
--- a/CapMachine.Wpf/Dtos/QuickMeterStepDto.cs
+++ b/CapMachine.Wpf/Dtos/QuickMeterStepDto.cs
@@ -134,9 +134,9 @@ namespace CapMachine.Wpf.Dtos
private double _EVAPExpTemp;
///
- /// EVAP出口温度 信息
+ /// 蒸发混合温度 信息
///
- [Column("EVAP出口温度(℃)")]
+ [Column("蒸发混合温度(℃)")]
public double EVAPExpTemp
{
get { return _EVAPExpTemp; }
diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs
index 30df758..0acb3f1 100644
--- a/CapMachine.Wpf/Models/CsvRecordModel.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModel.cs
@@ -140,9 +140,9 @@ namespace CapMachine.Wpf.Models
public double Cond2Temp { get; set; }
///
- /// EVAP出口温度[℃]
+ /// 蒸发混合温度[℃]
///
- [Name("EVAP出口温度[℃]")]
+ [Name("蒸发混合温度[℃]")]
public double EVAPExpTemp { get; set; }
///
diff --git a/CapMachine.Wpf/Models/CsvRecordModelMap.cs b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
index 18feb2d..b7da64c 100644
--- a/CapMachine.Wpf/Models/CsvRecordModelMap.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
@@ -36,7 +36,7 @@ namespace CapMachine.Wpf.Models
Map(m => m.OS1Temp).Name("OS1温度[℃]");
Map(m => m.OS2Temp).Name("OS2温度[℃]");
Map(m => m.Cond2Temp).Name("COND2温度[℃]");
- Map(m => m.EVAPExpTemp).Name("EVAP出口温度[℃]");
+ Map(m => m.EVAPExpTemp).Name("蒸发混合温度[℃]");
Map(m => m.VRV).Name("冷媒流量[L/min]");
Map(m => m.LubeFlow).Name("润滑油流量[L/min]");
Map(m => m.ExTemp).Name("排气温度[℃]");
diff --git a/CapMachine.Wpf/Models/LightChart/ChartManager.cs b/CapMachine.Wpf/Models/LightChart/ChartManager.cs
index 6b66f12..979c134 100644
--- a/CapMachine.Wpf/Models/LightChart/ChartManager.cs
+++ b/CapMachine.Wpf/Models/LightChart/ChartManager.cs
@@ -237,7 +237,7 @@ namespace CapMachine.Wpf.Models.LightChart
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出口温度[℃]":
+ case "蒸发混合温度[℃]":
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();
diff --git a/CapMachine.Wpf/ProPars/ProParsHelper.cs b/CapMachine.Wpf/ProPars/ProParsHelper.cs
index d936d20..3c9c8ea 100644
--- a/CapMachine.Wpf/ProPars/ProParsHelper.cs
+++ b/CapMachine.Wpf/ProPars/ProParsHelper.cs
@@ -32,7 +32,7 @@ namespace CapMachine.Wpf.ProPars
new PlcParsData(){ Name="COND1温度 ",EnName="Cond1Temp",Step=100,Steps=new List(),Ratio=10,Unit="",ValueStartAddress=1014,MinStartAddress=1068,SecStartAddress=1070,CycleStartAddress=1098 },
new PlcParsData(){ Name="COND2温度",EnName="Cond2Temp",Step=100,SetAddressInfo=AddressInfo.NoTimeAndCycle, Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1034,MinStartAddress=0,SecStartAddress=0,CycleStartAddress=0 },
new PlcParsData(){ Name="COND2压力",EnName="Cond2Press",Step=100,Steps=new List(),Ratio=100,Unit="" ,ValueStartAddress=1018,MinStartAddress=1076,SecStartAddress=1078,CycleStartAddress=0 },
- new PlcParsData(){ Name="EVAP出口温度",EnName="EVAPExpTemp",Step=100,SetAddressInfo=AddressInfo.NoTimeAndCycle,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1036,MinStartAddress=0,SecStartAddress=0,CycleStartAddress=0 },
+ new PlcParsData(){ Name="蒸发混合温度",EnName="EVAPExpTemp",Step=100,SetAddressInfo=AddressInfo.NoTimeAndCycle,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1036,MinStartAddress=0,SecStartAddress=0,CycleStartAddress=0 },
new PlcParsData(){ Name="排气压力",EnName="ExPress",Step=100,Steps=new List(),Ratio=100,Unit="" ,ValueStartAddress=1008,MinStartAddress=1056,SecStartAddress=1058,CycleStartAddress=1090 },
new PlcParsData(){ Name="HV电压",EnName="HVVol",Step=100,SetAddressInfo=AddressInfo.NoCycle,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1022,MinStartAddress=1080,SecStartAddress=1082,CycleStartAddress=0 },
@@ -1766,7 +1766,7 @@ namespace CapMachine.Wpf.ProPars
{
return 2;
}
- else if (headerText.Contains("EVAP出口温度"))
+ else if (headerText.Contains("蒸发混合温度"))
{
return 3;
}
diff --git a/CapMachine.Wpf/ProPars/ProParsHelperQuick.cs b/CapMachine.Wpf/ProPars/ProParsHelperQuick.cs
index 67a678e..08df451 100644
--- a/CapMachine.Wpf/ProPars/ProParsHelperQuick.cs
+++ b/CapMachine.Wpf/ProPars/ProParsHelperQuick.cs
@@ -25,7 +25,7 @@ namespace CapMachine.Wpf.ProPars
new PlcParsDataQuick(){ Name="COND1温度 ",EnName="Cond1Temp",Step=100,Steps=new List(),Ratio=10,Unit="",ValueStartAddress=1014, },
new PlcParsDataQuick(){ Name="COND2温度",EnName="Cond2Temp",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1034, },
new PlcParsDataQuick(){ Name="COND2压力",EnName="Cond2Press",Step=100,Steps=new List(),Ratio=100,Unit="" ,ValueStartAddress=1018, },
- new PlcParsDataQuick(){ Name="EVAP出口温度",EnName="EVAPExpTemp",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1036, },
+ new PlcParsDataQuick(){ Name="蒸发混合温度",EnName="EVAPExpTemp",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1036, },
new PlcParsDataQuick(){ Name="排气压力",EnName="ExPress",Step=100,Steps=new List(),Ratio=100,Unit="" ,ValueStartAddress=1008, },
new PlcParsDataQuick(){ Name="HV电压",EnName="HVVol",Step=100,Steps=new List(),Ratio=10,Unit="" ,ValueStartAddress=1022, },
@@ -477,7 +477,7 @@ namespace CapMachine.Wpf.ProPars
{
return 2;
}
- else if (headerText.Contains("EVAP出口温度"))
+ else if (headerText.Contains("蒸发混合温度"))
{
return 3;
}
diff --git a/CapMachine.Wpf/ProPars/ProParsSongZhiHelper.cs b/CapMachine.Wpf/ProPars/ProParsSongZhiHelper.cs
index 3db1da9..ab2acb4 100644
--- a/CapMachine.Wpf/ProPars/ProParsSongZhiHelper.cs
+++ b/CapMachine.Wpf/ProPars/ProParsSongZhiHelper.cs
@@ -1843,7 +1843,7 @@ namespace CapMachine.Wpf.ProPars
{
return 2;
}
- else if (headerText.Contains("EVAP出口温度"))
+ else if (headerText.Contains("蒸发混合温度"))
{
return 3;
}
diff --git a/CapMachine.Wpf/Services/DataRecordService.cs b/CapMachine.Wpf/Services/DataRecordService.cs
index 255ea79..996da68 100644
--- a/CapMachine.Wpf/Services/DataRecordService.cs
+++ b/CapMachine.Wpf/Services/DataRecordService.cs
@@ -122,7 +122,7 @@ namespace CapMachine.Wpf.Services
new Columns(){ Name="OS1温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="OS2温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="COND2温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
- new Columns(){ Name="EVAP出口温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
+ new Columns(){ Name="蒸发混合温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
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},
diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs
index 729a787..f18b930 100644
--- a/CapMachine.Wpf/Services/MachineRtDataService.cs
+++ b/CapMachine.Wpf/Services/MachineRtDataService.cs
@@ -156,16 +156,16 @@ namespace CapMachine.Wpf.Services
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, 100, "A", new ShortTagValue(), false) { DecimalPoint = 2 });
TagManger.AddTag(new Tag("HV[W]", "HV[W]", "HVPw", "程序", "VW15020", 100, 0, 1, "W", new ShortTagValue(), false) { DecimalPoint = 1 });
- TagManger.AddTag(new Tag("LV[V]", "LV[V]", "LV", "程序", "VW15022", 100, 0, 10, "V", new ShortTagValue(), true) { DecimalPoint = 1 });
+ TagManger.AddTag(new Tag("LV[V]", "LV[V]", "LV", "程序", "VW15022", 100, 0, 100, "V", new ShortTagValue(), true) { DecimalPoint = 2 });
//TagManger.AddTag(new Tag("LV[A]", "LV[A]", "LVCur", "程序", "VW15024", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 });
- TagManger.AddTag(new Tag("LV[A]", "LV[A]", "LVCur", "程序", "VW15024", 100, 0, 100, "A", new ShortTagValue(), false) { DecimalPoint = 2 });
+ TagManger.AddTag(new Tag("LV[A]", "LV[A]", "LVCur", "程序", "VW15024", 100, 0, 1000, "A", new ShortTagValue(), false) { DecimalPoint =3 });
TagManger.AddTag(new Tag("环境温度", "环境温度[℃]", "EnvTemp", "程序", "VW15026", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 });
//TagManger.AddTag(new Tag("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
TagManger.AddTag(new Tag("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
TagManger.AddTag(new Tag("OS1温度", "OS1温度[℃]", "OS1Temp", "程序", "VW15030", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag("OS2温度", "OS2温度[℃]", "OS2Temp", "程序", "VW15032", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag("COND2温度", "COND2温度[℃]", "Cond2Temp", "程序", "VW15034", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
- TagManger.AddTag(new Tag("EVAP出口温度", "EVAP出口温度[℃]", "EVAPExpTemp", "程序", "VW15036", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
+ TagManger.AddTag(new Tag("蒸发混合温度", "蒸发混合温度[℃]", "EVAPExpTemp", "程序", "VW15036", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
//TagManger.AddTag(new Tag("冷媒流量", "冷媒流量[L/min]", "VRV", "程序", "VW15038", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 });
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, 10, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 });
@@ -194,635 +194,7 @@ namespace CapMachine.Wpf.Services
TagManger.AddTag(new Tag("通讯PTC模块温度", "通讯PTC模块温度[℃]", "ComPTCMdTemp", "程序", "VW14130", 100, 0, 1, "℃", new ShortTagValue(), false) { DecimalPoint = 0 });
#endregion
-
-
- #region SongZhi
-
- ////【SongZhi】
-
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "转速[rpm]",//名称带单位
- // NameNoUnit = "转速",//无单位名称
- // EnName = "Speed",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "rpm",
- // PVAddress = "VW100",//地址信息
- // SVAddress = "VW200",
- // MVAddress = "VW242",
- // IsMeter = true,
- // AutoHandSwitchAddress = "VW240",
- // Precision = 1,
- // DecimalPoint = 0,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "排气压力[MpaA]",//名称带单位
- // NameNoUnit = "排气压力",//无单位名称
- // EnName = "ExPress",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "MpaA",
- // PVAddress = "VW102",//地址信息
- // SVAddress = "VW202",
- // MVAddress = "VW242",
- // IsMeter = true,
- // AutoHandSwitchAddress = "VW240",
- // Precision = 1000,
- // DecimalPoint = 3,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "吸气压力[MpaA]",//名称带单位
- // NameNoUnit = "吸气压力",//无单位名称
- // EnName = "InhPress",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "MpaA",
- // PVAddress = "VW104",//地址信息
- // SVAddress = "VW204",
- // MVAddress = "VW246",
- // IsMeter = true,
- // AutoHandSwitchAddress = "VW244",
- // Precision = 1000,
- // DecimalPoint = 3,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "吸气温度[℃]",//名称带单位
- // NameNoUnit = "吸气温度",//无单位名称
- // EnName = "InhTemp",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "℃",
- // PVAddress = "VW106",//地址信息
- // SVAddress = "VW206",
- // MVAddress = "VW250",
- // IsMeter = true,
- // AutoHandSwitchAddress = "VW248",
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "冷凝器出口水温[℃]",//名称带单位 COND1水温
- // NameNoUnit = "冷凝器出口水温",//无单位名称
- // EnName = "Cond1Temp",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "℃",
- // PVAddress = "VW108",//地址信息
- // SVAddress = "VW208",
- // MVAddress = "VW254",
- // IsMeter = true,
- // AutoHandSwitchAddress = "VW252",
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "吸气混合器温度[℃]",//名称带单位 OS2温度
- // NameNoUnit = "吸气混合器温度",//无单位名称 OS2温度
- // EnName = "OS2Temp",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "℃",
- // PVAddress = "VW110",//地址信息
- // SVAddress = "VW210",
- // MVAddress = "VW258",
- // IsMeter = true,
- // AutoHandSwitchAddress = "VW256",
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "HV_V[V]",//名称带单位
- // NameNoUnit = "HV_V",//无单位名称
- // EnName = "HV_V",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "V",
- // PVAddress = "VW112",//地址信息
- // SVAddress = "VW212",
- // MVAddress = "VW262",
- // IsMeter = true,
- // AutoHandSwitchAddress = "VW260",
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "HV_A[A]",//名称带单位
- // NameNoUnit = "HV_A",//无单位名称
- // EnName = "HV_A",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "A",
- // PVAddress = "VW114",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 100,
- // DecimalPoint = 2,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "HV_W[W]",//名称带单位
- // NameNoUnit = "HV_W",//无单位名称
- // EnName = "HV_W",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "W",
- // PVAddress = "VW116",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 1,
- // DecimalPoint = 0,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "LV_V[V]",//名称带单位
- // NameNoUnit = "LV_V",//无单位名称
- // EnName = "LV_V",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "V",
- // PVAddress = "VW118",//地址信息
- // SVAddress = "VW214",
- // MVAddress = "",
- // IsMeter = true,
- // AutoHandSwitchAddress = "",
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "LV_A[A]",//名称带单位
- // NameNoUnit = "LV_A",//无单位名称
- // EnName = "LV_A",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "A",
- // PVAddress = "VW120",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 100,
- // DecimalPoint = 2,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "试验箱温度[℃]",//名称带单位
- // NameNoUnit = "试验箱温度",//无单位名称
- // EnName = "EnvTemp",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "℃",
- // PVAddress = "VW122",//地址信息
- // SVAddress = "VW216",
- // MVAddress = "",
- // IsMeter = true,
- // AutoHandSwitchAddress = "",
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "试验箱湿度[%]",//名称带单位
- // NameNoUnit = "试验箱湿度",//无单位名称
- // EnName = "EnvRH",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "%",
- // PVAddress = "VW124",//地址信息
- // SVAddress = "VW218",
- // MVAddress = "",
- // IsMeter = true,
- // AutoHandSwitchAddress = "",
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "排气温度[℃]",//名称带单位
- // NameNoUnit = "排气温度",//无单位名称
- // EnName = "ExTemp",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "℃",
- // PVAddress = "VW126",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "膨胀阀前温度[℃]",//名称带单位
- // NameNoUnit = "膨胀阀前温度",//无单位名称
- // EnName = "TxvFrTemp",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "℃",
- // PVAddress = "VW128",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "膨胀阀前压力[MpaA]",//名称带单位
- // NameNoUnit = "膨胀阀前压力",//无单位名称
- // EnName = "TxvFrPress",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "MpaA",
- // PVAddress = "VW130",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 1000,
- // DecimalPoint = 3,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "冷凝器进口温度[℃]",//名称带单位
- // NameNoUnit = "冷凝器进口温度",//无单位名称
- // EnName = "CondInTemp",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "℃",
- // PVAddress = "VW132",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "冷凝器进口压力[MpaA]",//名称带单位
- // NameNoUnit = "冷凝器进口压力",//无单位名称
- // EnName = "CondInPress",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "MpaA",
- // PVAddress = "VW134",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 1000,
- // DecimalPoint = 3,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "水箱进水温度[℃]",//名称带单位
- // NameNoUnit = "水箱进水温度",//无单位名称
- // EnName = "WaterTankInTemp",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // Unit = "℃",
- // MaxValue = 100,
- // PVAddress = "VW136",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "水加热温度H1[℃]",//名称带单位
- // NameNoUnit = "水加热温度H1",//无单位名称
- // EnName = "WaterHeatTempH1",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "℃",
- // PVAddress = "VW138",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "压缩机表面温度1[℃]",//名称带单位
- // NameNoUnit = "压缩机表面温度1",//无单位名称
- // EnName = "CapSurfTemp1",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "℃",
- // PVAddress = "VW140",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "压缩机表面温度2[℃]",//名称带单位
- // NameNoUnit = "压缩机表面温度2",//无单位名称
- // EnName = "CapSurfTemp2",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "℃",
- // PVAddress = "VW142",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "压缩机表面温度3[℃]",//名称带单位
- // NameNoUnit = "压缩机表面温度3",//无单位名称
- // EnName = "CapSurfTemp3",//英文名称
- // Group = "程序",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "℃",
- // PVAddress = "VW144",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "通讯母线电压[V]",//名称带单位
- // NameNoUnit = "通讯母线电压",//无单位名称
- // EnName = "ComCapBusVol",//英文名称
- // Group = "CANLIN",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "V",
- // PVAddress = "VW146",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "通讯母线电流[A]",//名称带单位
- // NameNoUnit = "通讯母线电流",//无单位名称
- // EnName = "ComCapBusCur",//英文名称
- // Group = "CANLIN",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "A",
- // PVAddress = "VW148",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 100,
- // DecimalPoint = 2,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "通讯相电流[A]",//名称带单位
- // NameNoUnit = "通讯相电流",//无单位名称
- // EnName = "ComCapPhCur",//英文名称
- // Group = "CANLIN",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "A",
- // PVAddress = "VW150",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 100,
- // DecimalPoint = 2,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "通讯功率[W]",//名称带单位
- // NameNoUnit = "通讯功率",//无单位名称
- // EnName = "ComCapPw",//英文名称
- // Group = "CANLIN",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "W",
- // PVAddress = "VW152",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 1000,
- // DecimalPoint = 2,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "通讯芯片温度[℃]",//名称带单位
- // NameNoUnit = "通讯芯片温度",//无单位名称
- // EnName = "ComCapChipTemp",//英文名称
- // Group = "CANLIN",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "℃",
- // PVAddress = "VW154",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "过冷度[K]",//名称带单位
- // NameNoUnit = "过冷度",//无单位名称
- // EnName = "Subcooling",//英文名称
- // Group = "计算",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "K",
- // PVAddress = "",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
- //TagManger.AddTag(new Tag(new ShortTagValue())
- //{
- // Name = "过热度[K]",//名称带单位
- // NameNoUnit = "过热度",//无单位名称
- // EnName = "Superheat",//英文名称
- // Group = "计算",//分组
- // MinValue = 0,
- // MaxValue = 100,
- // Unit = "K",
- // PVAddress = "",//地址信息
- // SVAddress = "",
- // MVAddress = "",
- // IsMeter = false,
- // Precision = 10,
- // DecimalPoint = 1,
- // Samp = 1,
- // ValueType = typeof(short),
- // Index = "",
- //});
-
- //#endregion
-
- //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 });
- //TagManger.AddTag(new Tag("HV[W]", "HV[W]", "HVPw", "程序", "VW15020", 100, 0, 1, "W", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("LV[V]", "LV[V]", "LV", "程序", "VW15022", 100, 0, 10, "V", new ShortTagValue(), true) { DecimalPoint = 1 });
- ////TagManger.AddTag(new Tag("LV[A]", "LV[A]", "LVCur", "程序", "VW15024", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("LV[A]", "LV[A]", "LVCur", "程序", "VW15024", 100, 0, 100, "A", new ShortTagValue(), false) { DecimalPoint = 2 });
- //TagManger.AddTag(new Tag("环境温度", "环境温度[℃]", "EnvTemp", "程序", "VW15026", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 });
- ////TagManger.AddTag(new Tag("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 1, "%", new ShortTagValue(), true) { DecimalPoint = 0 });
- //TagManger.AddTag(new Tag("OS1温度", "OS1温度[℃]", "OS1Temp", "程序", "VW15030", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("OS2温度", "OS2温度[℃]", "OS2Temp", "程序", "VW15032", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("COND2温度", "COND2温度[℃]", "Cond2Temp", "程序", "VW15034", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("EVAP出口温度", "EVAP出口温度[℃]", "EVAPExpTemp", "程序", "VW15036", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
- ////TagManger.AddTag(new Tag("冷媒流量", "冷媒流量[L/min]", "VRV", "程序", "VW15038", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 });
- //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("膨胀阀前压力", "膨胀阀前压力[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出口压力[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 });
- //TagManger.AddTag(new Tag("PTC出水温度", "PTC出水温度[℃]", "PTCExpTemp", "程序", "VW15058", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("通讯Cmp母线电流", "通讯Cmp母线电流[A]", "ComCapBusCur", "程序", "VW15060", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("通讯Cmp母线电压", "通讯Cmp母线电压[V]", "ComCapBusVol", "程序", "VW15062", 100, 0, 10, "V", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("通讯Cmp逆变器温度", "通讯Cmp逆变器温度[℃]", "ComCapInvTemp", "程序", "VW15064", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("通讯Cmp相电流", "通讯Cmp相电流[A]", "ComCapPhCur", "程序", "VW15066", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("通讯Cmp功率", "通讯Cmp功率[W]", "ComCapPw", "程序", "VW15068", 100, 0, 1, "W", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("通讯Cmp芯片温度", "通讯Cmp芯片温度[℃]", "ComCapChipTemp", "程序", "VW15070", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("通讯PTC入水温度", "通讯PTC入水温度[℃]", "ComPTCEntTemp", "程序", "VW15072", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("通讯PTC出水温度", "通讯PTC出水温度[℃]", "ComPTCExpTemp", "程序", "VW15074", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("通讯PTC峰值电流", "通讯PTC峰值电流[A]", "ComPTCPeakCur", "程序", "VW15076", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("通讯PTC母线电流", "通讯PTC母线电流[A]", "ComPTCBusCur", "程序", "VW15078", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("通讯PTC膜温", "通讯PTC膜温[℃]", "ComPTCFlmTemp", "程序", "VW15080", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
- //TagManger.AddTag(new Tag("通讯PTC模块温度", "通讯PTC模块温度[℃]", "ComPTCMdTemp", "程序", "VW15082", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
-
- #endregion
+
ListHandSwitchData = new List()
{
diff --git a/CapMachine.Wpf/Services/ProRuntimeService.cs b/CapMachine.Wpf/Services/ProRuntimeService.cs
index 68da2de..6642270 100644
--- a/CapMachine.Wpf/Services/ProRuntimeService.cs
+++ b/CapMachine.Wpf/Services/ProRuntimeService.cs
@@ -65,7 +65,7 @@ namespace CapMachine.Wpf.Services
},
new ProExModel(ProRunChannel){
- MeterName="EVAP出口温度",
+ MeterName="蒸发混合温度",
ListProStepExe=new List(),
},
diff --git a/CapMachine.Wpf/ViewModels/ProConfigViewModel.cs b/CapMachine.Wpf/ViewModels/ProConfigViewModel.cs
index 07c63f4..c237397 100644
--- a/CapMachine.Wpf/ViewModels/ProConfigViewModel.cs
+++ b/CapMachine.Wpf/ViewModels/ProConfigViewModel.cs
@@ -8164,7 +8164,7 @@ namespace CapMachine.Wpf.ViewModels
{
if (par != null && par is string)
{
- CallMeterParConfig("EVAP出口温度", par! as string);
+ CallMeterParConfig("蒸发混合温度", par! as string);
}
}
diff --git a/CapMachine.Wpf/Views/QuickMeterStepView.xaml b/CapMachine.Wpf/Views/QuickMeterStepView.xaml
index 311f9ef..78e3f19 100644
--- a/CapMachine.Wpf/Views/QuickMeterStepView.xaml
+++ b/CapMachine.Wpf/Views/QuickMeterStepView.xaml
@@ -220,7 +220,7 @@
MappingName="OS2Temp"
NumberDecimalDigits="1" />