diff --git a/CapMachine.Wpf/Assets/Images/CapMachineKR25003.png b/CapMachine.Wpf/Assets/Images/CapMachineKR25003.png
new file mode 100644
index 0000000..648b74f
Binary files /dev/null and b/CapMachine.Wpf/Assets/Images/CapMachineKR25003.png differ
diff --git a/CapMachine.Wpf/CapMachine.Wpf.csproj b/CapMachine.Wpf/CapMachine.Wpf.csproj
index 61f16c6..92a0e4d 100644
--- a/CapMachine.Wpf/CapMachine.Wpf.csproj
+++ b/CapMachine.Wpf/CapMachine.Wpf.csproj
@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <None Remove="Assets\Fonts\iconfont.ttf" />
+    <None Remove="Assets\Images\CapMachineKR25003.png" />
     <None Remove="Assets\Images\CapMachineOutput1.png" />
     <None Remove="Assets\Images\favicon.ico" />
     <None Remove="Assets\Images\Logo.png" />
@@ -178,6 +179,9 @@
     <Content Include="Assets\Fonts\iconfont.ttf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Assets\Images\CapMachineKR25003.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Assets\Images\CapMachineOutput1.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs
index 2b5cadb..de587d3 100644
--- a/CapMachine.Wpf/Models/CsvRecordModel.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModel.cs
@@ -60,10 +60,10 @@ namespace CapMachine.Wpf.Models
         public double InhTemp { get; set; }
 
         /// <summary>
-        /// 冷凝器出口水温[℃]
+        /// 冷凝器循环水温[℃]
         /// V COND1水温
         /// </summary>
-        [Name("冷凝器出口水温[℃]")]
+        [Name("冷凝器循环水温[℃]")]
         public double Cond1Temp { get; set; }
 
         ///// <summary>
@@ -211,12 +211,12 @@ namespace CapMachine.Wpf.Models
         //[Name("EVAP出口压力[MpaA]")]
         //public double EVAPExpPress { get; set; }
 
-        /// <summary>
-        /// 水箱进水温度[℃]
-        /// V
-        /// </summary>
-        [Name("水箱进水温度[℃]")]
-        public double WaterTankInTemp { get; set; }
+        ///// <summary>
+        ///// 水箱进水温度[℃]
+        ///// V
+        ///// </summary>
+        //[Name("水箱进水温度[℃]")]
+        //public double WaterTankInTemp { get; set; }
 
         /// <summary>
         /// 水加热温度H1[℃]
@@ -232,19 +232,19 @@ namespace CapMachine.Wpf.Models
         [Name("压缩机表面温度1[℃]")]
         public double CapSurfTemp1 { get; set; }
 
-        /// <summary>
-        /// 压缩机表面温度2[℃]
-        /// V
-        /// </summary>
-        [Name("压缩机表面温度2[℃]")]
-        public double CapSurfTemp2 { get; set; }
+        ///// <summary>
+        ///// 压缩机表面温度2[℃]
+        ///// V
+        ///// </summary>
+        //[Name("压缩机表面温度2[℃]")]
+        //public double CapSurfTemp2 { get; set; }
 
-        /// <summary>
-        /// 压缩机表面温度3[℃]
-        /// V
-        /// </summary>
-        [Name("压缩机表面温度3[℃]")]
-        public double CapSurfTemp3 { get; set; }
+        ///// <summary>
+        ///// 压缩机表面温度3[℃]
+        ///// V
+        ///// </summary>
+        //[Name("压缩机表面温度3[℃]")]
+        //public double CapSurfTemp3 { get; set; }
 
         ///// <summary>
         ///// 腔内压力[MpaA]
diff --git a/CapMachine.Wpf/Models/CsvRecordModelMap.cs b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
index e3007b0..3fd8d44 100644
--- a/CapMachine.Wpf/Models/CsvRecordModelMap.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
@@ -67,7 +67,7 @@ namespace CapMachine.Wpf.Models
             Map(m => m.ExPress).Name("排气压力[MpaA]");
             Map(m => m.InhPress).Name("吸气压力[MpaA]");
             Map(m => m.InhTemp).Name("吸气温度[℃]");
-            Map(m => m.Cond1Temp).Name("冷凝器出口水温[℃]");
+            Map(m => m.Cond1Temp).Name("冷凝器循环水温[℃]");
             Map(m => m.OS2Temp).Name("吸气混合器温度[℃]");
             Map(m => m.HV).Name("HV_V[V]");
             Map(m => m.HVCur).Name("HV_A[A]");
@@ -82,11 +82,11 @@ namespace CapMachine.Wpf.Models
 
             Map(m => m.CondInTemp).Name("冷凝器进口温度[℃]");
             Map(m => m.CondInPress).Name("冷凝器进口压力[MpaA]");
-            Map(m => m.WaterTankInTemp).Name("水箱进水温度[℃]");
+            //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.CapSurfTemp2).Name("压缩机表面温度2[℃]");
+            //Map(m => m.CapSurfTemp3).Name("压缩机表面温度3[℃]");
 
             //Map(m => m.LubePress).Name("润滑油压力[MpaA]");
             //Map(m => m.Cond2Press).Name("COND2压力[MpaA]");
diff --git a/CapMachine.Wpf/Models/LightChart/ChartManager.cs b/CapMachine.Wpf/Models/LightChart/ChartManager.cs
index c843911..d4c95fe 100644
--- a/CapMachine.Wpf/Models/LightChart/ChartManager.cs
+++ b/CapMachine.Wpf/Models/LightChart/ChartManager.cs
@@ -209,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 "冷凝器出口水温[℃]":
+                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();
@@ -293,16 +293,16 @@ namespace CapMachine.Wpf.Models.LightChart
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.CondInTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
                 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();
+                //case "水箱进水温度[℃]":
+                //    return CurHistoryData.Select(a => new ChartPoint() { Value = a.WaterTankInTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
                 case "水加热温度H1[℃]":
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.WaterHeatTempH1, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
                 case "压缩机表面温度1[℃]":
                     return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapSurfTemp1, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
-                case "压缩机表面温度2[℃]":
-                    return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapSurfTemp2, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
-                case "压缩机表面温度3[℃]":
-                    return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapSurfTemp3, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
+                //case "压缩机表面温度2[℃]":
+                //    return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapSurfTemp2, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
+                //case "压缩机表面温度3[℃]":
+                //    return CurHistoryData.Select(a => new ChartPoint() { Value = a.CapSurfTemp3, 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 "过冷度[K]":
diff --git a/CapMachine.Wpf/ProPars/ProParsSongZhiHelper.cs b/CapMachine.Wpf/ProPars/ProParsSongZhiHelper.cs
index 3db1da9..500f31c 100644
--- a/CapMachine.Wpf/ProPars/ProParsSongZhiHelper.cs
+++ b/CapMachine.Wpf/ProPars/ProParsSongZhiHelper.cs
@@ -36,7 +36,7 @@ namespace CapMachine.Wpf.ProPars
                 new PlcParsData(){ Name="排气压力",EnName="ExPress",SetAddressInfo=AddressInfo.OK,Step=150,Steps=new List<PlcMeterStepCell>(),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<PlcMeterStepCell>(),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<PlcMeterStepCell>(),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<PlcMeterStepCell>(),Ratio=10,Unit="",ValueStartAddress=1074,MinStartAddress=1066,SecStartAddress=1068,CycleStartAddress=1072,SlopConstAddress=1070 },
+                new PlcParsData(){ Name="冷凝器循环水温",EnName="Cond1Temp",SetAddressInfo=AddressInfo.OK,Step=150,Steps=new List<PlcMeterStepCell>(),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<PlcMeterStepCell>(),Ratio=10,Unit="" ,ValueStartAddress=1088,MinStartAddress=1080,SecStartAddress=1082 },//??
                 new PlcParsData(){ Name="HV电压",EnName="HVVol",Step=150,SetAddressInfo=AddressInfo.OK,Steps=new List<PlcMeterStepCell>(),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<PlcMeterStepCell>(),Ratio=10,Unit="" ,ValueStartAddress=1114,MinStartAddress=1106,SecStartAddress=1108},
diff --git a/CapMachine.Wpf/Services/AlarmService.cs b/CapMachine.Wpf/Services/AlarmService.cs
index 6fe3edb..7093acc 100644
--- a/CapMachine.Wpf/Services/AlarmService.cs
+++ b/CapMachine.Wpf/Services/AlarmService.cs
@@ -17,7 +17,7 @@ namespace CapMachine.Wpf.Services
     /// </summary>
     public class AlarmService : BindableBase
     {
-        public AlarmService(ConfigService configService, IEventAggregator eventAggregator,IFreeSql freeSql
+        public AlarmService(ConfigService configService, IEventAggregator eventAggregator, IFreeSql freeSql
             )
         {
             ConfigService = configService;
@@ -65,47 +65,47 @@ namespace CapMachine.Wpf.Services
                     ThresholdUp=1,
                     BoolActiveValue=true
                 }},
+                //new AlarmRunCell(FreeSql){Index=3,CurAlarmConfig=new AlarmConfig()
+                //{
+                //    Name="水压低",
+                //    ActiveType=ActiveType.Bool,
+                //    Address="V0.3",
+                //    AlarmLevel=AlarmLevel.Level1,
+                //    Category="一般报警",
+                //    Message="水压低",
+                //    ThresholdDown=1,
+                //    ThresholdUp=1,
+                //    BoolActiveValue=true
+                //}},
+                //new AlarmRunCell(FreeSql){Index=4,CurAlarmConfig=new AlarmConfig()
+                //{
+                //    Name="水泵过载",
+                //    ActiveType=ActiveType.Bool,
+                //    Address="V0.4",
+                //    AlarmLevel=AlarmLevel.Level1,
+                //    Category="一般报警",
+                //    Message="水泵过载",
+                //    ThresholdDown=1,
+                //    ThresholdUp=1,
+                //    BoolActiveValue=true
+                //}},
+                //new AlarmRunCell(FreeSql){Index=5,CurAlarmConfig=new AlarmConfig()
+                //{
+                //    Name="冷水机组故障",
+                //    ActiveType=ActiveType.Bool,
+                //    Address="V0.5",
+                //    AlarmLevel=AlarmLevel.Level1,
+                //    Category="一般报警",
+                //    Message="冷水机组故障",
+                //    ThresholdDown=1,
+                //    ThresholdUp=1,
+                //    BoolActiveValue=true
+                //}},
                 new AlarmRunCell(FreeSql){Index=3,CurAlarmConfig=new AlarmConfig()
-                {
-                    Name="水压低",
-                    ActiveType=ActiveType.Bool,
-                    Address="V0.3",
-                    AlarmLevel=AlarmLevel.Level1,
-                    Category="一般报警",
-                    Message="水压低",
-                    ThresholdDown=1,
-                    ThresholdUp=1,
-                    BoolActiveValue=true
-                }},
-                new AlarmRunCell(FreeSql){Index=4,CurAlarmConfig=new AlarmConfig()
-                {
-                    Name="水泵过载",
-                    ActiveType=ActiveType.Bool,
-                    Address="V0.4",
-                    AlarmLevel=AlarmLevel.Level1,
-                    Category="一般报警",
-                    Message="水泵过载",
-                    ThresholdDown=1,
-                    ThresholdUp=1,
-                    BoolActiveValue=true
-                }},
-                new AlarmRunCell(FreeSql){Index=5,CurAlarmConfig=new AlarmConfig()
-                {
-                    Name="冷水机组故障",
-                    ActiveType=ActiveType.Bool,
-                    Address="V0.5",
-                    AlarmLevel=AlarmLevel.Level1,
-                    Category="一般报警",
-                    Message="冷水机组故障",
-                    ThresholdDown=1,
-                    ThresholdUp=1,
-                    BoolActiveValue=true
-                }},
-                new AlarmRunCell(FreeSql){Index=6,CurAlarmConfig=new AlarmConfig()
                 {
                     Name="排气压力",
                     ActiveType=ActiveType.Bool,
-                    Address="V0.6",
+                    Address="V0.3",
                     AlarmLevel=AlarmLevel.Level1,
                     Category="一般报警",
                     Message="排气压力",
@@ -113,11 +113,11 @@ namespace CapMachine.Wpf.Services
                     ThresholdUp=1,
                     BoolActiveValue=true
                 }},
-                new AlarmRunCell(FreeSql){Index=7,CurAlarmConfig=new AlarmConfig()
+                new AlarmRunCell(FreeSql){Index=4,CurAlarmConfig=new AlarmConfig()
                 {
                     Name="吸气压力",
                     ActiveType=ActiveType.Bool,
-                    Address="V0.7",
+                    Address="V0.4",
                     AlarmLevel=AlarmLevel.Level1,
                     Category="一般报警",
                     Message="吸气压力",
@@ -125,11 +125,11 @@ namespace CapMachine.Wpf.Services
                     ThresholdUp=1,
                     BoolActiveValue=true
                 }},
-                new AlarmRunCell(FreeSql){Index=8,CurAlarmConfig=new AlarmConfig()
+                new AlarmRunCell(FreeSql){Index=5,CurAlarmConfig=new AlarmConfig()
                 {
                     Name="吸气温度",
                     ActiveType=ActiveType.Bool,
-                    Address="V1.0",
+                    Address="V0.5",
                     AlarmLevel=AlarmLevel.Level1,
                     Category="一般报警",
                     Message="吸气温度",
@@ -137,11 +137,23 @@ namespace CapMachine.Wpf.Services
                     ThresholdUp=1,
                     BoolActiveValue=true
                 }},
-                new AlarmRunCell(FreeSql){Index=9,CurAlarmConfig=new AlarmConfig()
+                new AlarmRunCell(FreeSql){Index=6,CurAlarmConfig=new AlarmConfig()
+                {
+                    Name="冷凝器循环水温",
+                    ActiveType=ActiveType.Bool,
+                    Address="V0.6",
+                    AlarmLevel=AlarmLevel.Level1,
+                    Category="一般报警",
+                    Message="冷凝器循环水温",
+                    ThresholdDown=1,
+                    ThresholdUp=1,
+                    BoolActiveValue=true
+                }},
+                new AlarmRunCell(FreeSql){Index=7,CurAlarmConfig=new AlarmConfig()
                 {
                     Name="吸气混合器温度",
                     ActiveType=ActiveType.Bool,
-                    Address="V1.1",
+                    Address="V0.7",
                     AlarmLevel=AlarmLevel.Level1,
                     Category="一般报警",
                     Message="吸气混合器温度",
@@ -149,23 +161,12 @@ namespace CapMachine.Wpf.Services
                     ThresholdUp=1,
                     BoolActiveValue=true
                 }},
-                new AlarmRunCell(FreeSql){Index=10,CurAlarmConfig=new AlarmConfig()
-                {
-                    Name="水加热温度",
-                    ActiveType=ActiveType.Bool,
-                    Address="V1.2",
-                    AlarmLevel=AlarmLevel.Level1,
-                    Category="一般报警",
-                    Message="水加热温度",
-                    ThresholdDown=1,
-                    ThresholdUp=1,
-                    BoolActiveValue=true
-                }},
-                new AlarmRunCell(FreeSql){Index=11,CurAlarmConfig=new AlarmConfig()
+
+                new AlarmRunCell(FreeSql){Index=8,CurAlarmConfig=new AlarmConfig()
                 {
                     Name="排气温度",
                     ActiveType=ActiveType.Bool,
-                    Address="V1.3",
+                    Address="V1.0",
                     AlarmLevel=AlarmLevel.Level1,
                     Category="一般报警",
                     Message="排气温度",
@@ -173,23 +174,35 @@ namespace CapMachine.Wpf.Services
                     ThresholdUp=1,
                     BoolActiveValue=true
                 }},
-                new AlarmRunCell(FreeSql){Index=12,CurAlarmConfig=new AlarmConfig()
+                new AlarmRunCell(FreeSql){Index=9,CurAlarmConfig=new AlarmConfig()
                 {
-                    Name="水箱进水温度",
+                    Name="水加热温度",
                     ActiveType=ActiveType.Bool,
-                    Address="V1.4",
+                    Address="V1.1",
                     AlarmLevel=AlarmLevel.Level1,
                     Category="一般报警",
-                    Message="水箱进水温度",
+                    Message="水加热温度",
                     ThresholdDown=1,
                     ThresholdUp=1,
                     BoolActiveValue=true
                 }},
-                new AlarmRunCell(FreeSql){Index=13,CurAlarmConfig=new AlarmConfig()
+                //new AlarmRunCell(FreeSql){Index=12,CurAlarmConfig=new AlarmConfig()
+                //{
+                //    Name="水箱进水温度",
+                //    ActiveType=ActiveType.Bool,
+                //    Address="V1.4",
+                //    AlarmLevel=AlarmLevel.Level1,
+                //    Category="一般报警",
+                //    Message="水箱进水温度",
+                //    ThresholdDown=1,
+                //    ThresholdUp=1,
+                //    BoolActiveValue=true
+                //}},
+                new AlarmRunCell(FreeSql){Index=10,CurAlarmConfig=new AlarmConfig()
                 {
                     Name="压缩机表面温度",
                     ActiveType=ActiveType.Bool,
-                    Address="V1.5",
+                    Address="V1.2",
                     AlarmLevel=AlarmLevel.Level1,
                     Category="一般报警",
                     Message="压缩机表面温度",
@@ -197,18 +210,18 @@ namespace CapMachine.Wpf.Services
                     ThresholdUp=1,
                     BoolActiveValue=true
                 }},
-                new AlarmRunCell(FreeSql){Index=14,CurAlarmConfig=new AlarmConfig()
-                {
-                    Name="试验箱",
-                    ActiveType=ActiveType.Bool,
-                    Address="V1.6",
-                    AlarmLevel=AlarmLevel.Level1,
-                    Category="一般报警",
-                    Message="试验箱",
-                    ThresholdDown=1,
-                    ThresholdUp=1,
-                    BoolActiveValue=true
-                }},
+                //new AlarmRunCell(FreeSql){Index=14,CurAlarmConfig=new AlarmConfig()
+                //{
+                //    Name="试验箱",
+                //    ActiveType=ActiveType.Bool,
+                //    Address="V1.6",
+                //    AlarmLevel=AlarmLevel.Level1,
+                //    Category="一般报警",
+                //    Message="试验箱",
+                //    ThresholdDown=1,
+                //    ThresholdUp=1,
+                //    BoolActiveValue=true
+                //}},
             };
         }
         public ConfigService ConfigService { get; }
diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs
index 501d397..1cc5cf7 100644
--- a/CapMachine.Wpf/Services/MachineRtDataService.cs
+++ b/CapMachine.Wpf/Services/MachineRtDataService.cs
@@ -274,8 +274,8 @@ namespace CapMachine.Wpf.Services
             });
             TagManger.AddTag(new Tag<short>(new ShortTagValue())
             {
-                Name = "冷凝器出口水温[℃]",//名称带单位 COND1水温
-                NameNoUnit = "冷凝器出口水温",//无单位名称
+                Name = "冷凝器循环水温[℃]",//名称带单位 COND1水温
+                NameNoUnit = "冷凝器循环水温",//无单位名称
                 EnName = "Cond1Temp",//英文名称
                 Group = "程序",//分组
                 MinValue = 0,
@@ -384,8 +384,8 @@ namespace CapMachine.Wpf.Services
                 MVAddress = "",
                 IsMeter = true,
                 AutoHandSwitchAddress = "",
-                Precision = 10,
-                DecimalPoint = 1,
+                Precision = 100,
+                DecimalPoint = 2,
                 Samp = 1,
                 ValueType = typeof(short),
                 Index = "",
@@ -403,8 +403,8 @@ namespace CapMachine.Wpf.Services
                 SVAddress = "",
                 MVAddress = "",
                 IsMeter = false,
-                Precision = 100,
-                DecimalPoint = 2,
+                Precision = 1000,
+                DecimalPoint = 3,
                 Samp = 1,
                 ValueType = typeof(short),
                 Index = "",
@@ -544,25 +544,25 @@ namespace CapMachine.Wpf.Services
                 ValueType = typeof(short),
                 Index = "",
             });
-            TagManger.AddTag(new Tag<short>(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<short>(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<short>(new ShortTagValue())
             {
                 Name = "水加热温度H1[℃]",//名称带单位
@@ -601,44 +601,44 @@ namespace CapMachine.Wpf.Services
                 ValueType = typeof(short),
                 Index = "",
             });
-            TagManger.AddTag(new Tag<short>(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<short>(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<short>(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<short>(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<short>(new ShortTagValue())
             {
                 Name = "通讯母线电压[V]",//名称带单位
@@ -831,13 +831,13 @@ namespace CapMachine.Wpf.Services
                 new HandSwitchData(){Name="冷凝器电加热",ActionAddress="M1.5",StateAddress="Q0.4" },
                 new HandSwitchData(){Name="吸气混合器电加热",ActionAddress="M1.6",StateAddress="Q0.5" },
                 new HandSwitchData(){Name="吸排气球阀",ActionAddress="M1.7",StateAddress="Q0.7" },
-                new HandSwitchData(){Name="试验箱",ActionAddress="M2.0",StateAddress="V15.0" },
-                new HandSwitchData(){Name="水SEV1",ActionAddress="M2.1",StateAddress="Q1.0" },
-                new HandSwitchData(){Name="水SEV2",ActionAddress="M2.2",StateAddress="Q1.1" },
-                new HandSwitchData(){Name="HCV1",ActionAddress="M2.3",StateAddress="Q1.2" },
-                new HandSwitchData(){Name="HCV2",ActionAddress="M2.4",StateAddress="Q1.3" },
-                new HandSwitchData(){Name="ECV1",ActionAddress="M2.5",StateAddress="Q1.4" },
-                new HandSwitchData(){Name="ECV2",ActionAddress="M2.6",StateAddress="Q1.5" },
+                //new HandSwitchData(){Name="试验箱",ActionAddress="M2.0",StateAddress="V15.0" },
+                //new HandSwitchData(){Name="水SEV1",ActionAddress="M2.1",StateAddress="Q1.0" },
+                //new HandSwitchData(){Name="水SEV2",ActionAddress="M2.2",StateAddress="Q1.1" },
+                new HandSwitchData(){Name="HCV1",ActionAddress="M2.3",StateAddress="Q1.0" },
+                new HandSwitchData(){Name="HCV2",ActionAddress="M2.4",StateAddress="Q1.1" },
+                new HandSwitchData(){Name="ECV1",ActionAddress="M2.5",StateAddress="Q1.2" },
+                new HandSwitchData(){Name="ECV2",ActionAddress="M2.6",StateAddress="Q1.3" },
                 new HandSwitchData(){Name="使能",ActionAddress="M2.7",StateAddress="V15.1" },
             };
 
diff --git a/CapMachine.Wpf/Services/PPCService.cs b/CapMachine.Wpf/Services/PPCService.cs
index df6adf7..12e43ba 100644
--- a/CapMachine.Wpf/Services/PPCService.cs
+++ b/CapMachine.Wpf/Services/PPCService.cs
@@ -64,7 +64,7 @@ namespace CapMachine.Wpf.Services
             //OS2TempTag = TagManager.DicTags.GetValueOrDefault("吸气混合器温度[℃]");
             TxvFrTempTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前温度[℃]")!;
             TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[MpaA]")!;
-            //Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]");
+            //Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器循环水温[℃]");
             //CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]");
 
             Superheat = TagManager.DicTags.GetValueOrDefault("过热度[K]");
diff --git a/CapMachine.Wpf/ViewModels/MonitorViewModel.cs b/CapMachine.Wpf/ViewModels/MonitorViewModel.cs
index 9b671a6..6666e2b 100644
--- a/CapMachine.Wpf/ViewModels/MonitorViewModel.cs
+++ b/CapMachine.Wpf/ViewModels/MonitorViewModel.cs
@@ -61,7 +61,7 @@ namespace CapMachine.Wpf.ViewModels
             OS2TempTag = TagManager.DicTags.GetValueOrDefault("吸气混合器温度[℃]");
             TxvFrTempTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前温度[℃]");
             TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[MpaA]");
-            Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]");
+            Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器循环水温[℃]");
             CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]");
 
 
@@ -184,7 +184,7 @@ namespace CapMachine.Wpf.ViewModels
         public ITag TxvFrPressTag { get; set; }
 
         /// <summary>
-        /// 冷凝器出口水温
+        /// 冷凝器循环水温
         /// </summary>
         public ITag Cond1TempTag { get; set; }
 
diff --git a/CapMachine.Wpf/Views/MonitorView.xaml b/CapMachine.Wpf/Views/MonitorView.xaml
index 14cc84b..4d4487f 100644
--- a/CapMachine.Wpf/Views/MonitorView.xaml
+++ b/CapMachine.Wpf/Views/MonitorView.xaml
@@ -431,7 +431,7 @@
                                     <TextBlock Text="暂停" />
                                 </StackPanel>
                             </Button>
-                            <Button
+                            <!--<Button
                                 Margin="5,0"
                                 Command="{Binding OperCmd}"
                                 CommandParameter="消音"
@@ -446,7 +446,7 @@
                                         Text="&#xe9c4;" />
                                     <TextBlock Text="消音" />
                                 </StackPanel>
-                            </Button>
+                            </Button>-->
                             <Button
                                 Margin="5,0"
                                 Command="{Binding OperCmd}"
@@ -869,7 +869,7 @@
                     <!--  inkscape  -->
                     <Canvas Grid.Column="1">
                         <Canvas.Background>
-                            <ImageBrush ImageSource="\Assets\Images\CapMachineOutput1.png" />
+                            <ImageBrush ImageSource="\Assets\Images\CapMachineKR25003.png" />
                         </Canvas.Background>
                         <Rectangle
                             Canvas.Left="30"
@@ -1042,14 +1042,6 @@
                             CellTitle="冷凝器进水温"
                             CellUnit="{Binding CondInTempTag.Unit}"
                             CellValue="{Binding CondInTempTag.EngPvValueStr}" />
-                        <Controls:ValueShow
-                            Canvas.Left="1194"
-                            Canvas.Top="360"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Top"
-                            CellTitle="冷凝器出水温"
-                            CellUnit="{Binding Cond1TempTag.Unit}"
-                            CellValue="{Binding Cond1TempTag.EngPvValueStr}" />
                         <Controls:ValueShow
                             Canvas.Left="1217"
                             Canvas.Top="136"
@@ -1066,14 +1058,6 @@
                             CellTitle="吸气温度MV"
                             CellUnit="%"
                             CellValue="{Binding InhTempTag.EngMvValue}" />
-                        <Label
-                            Canvas.Left="1339"
-                            Canvas.Top="225"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Top"
-                            Content="CCV2&#x0a;冷凝器出水"
-                            FontSize="16"
-                            FontWeight="Bold" />
                         <StackPanel
                             Canvas.Left="1250"
                             Canvas.Top="5"
diff --git a/CapMachine.Wpf/Views/ProConfigView.xaml b/CapMachine.Wpf/Views/ProConfigView.xaml
index 398706a..c3ba805 100644
--- a/CapMachine.Wpf/Views/ProConfigView.xaml
+++ b/CapMachine.Wpf/Views/ProConfigView.xaml
@@ -654,7 +654,7 @@
 
                         <DataGridTemplateColumn>
                             <DataGridTemplateColumn.Header>
-                                <TextBlock FontWeight="Bold" Text="冷凝器出口水温&#x0A;(℃)" />
+                                <TextBlock FontWeight="Bold" Text="冷凝器循环水温&#x0A;(℃)" />
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
@@ -1476,7 +1476,7 @@
                                             VerticalAlignment="Center"
                                             FontSize="12"
                                             FontWeight="Bold"
-                                            Text="冷凝器出口水温&#x0A;(℃)" />
+                                            Text="冷凝器循环水温&#x0A;(℃)" />
                                     </StackPanel>
                                 </TabItem.Header>
                                 <Controls:MeterConfig
@@ -1490,7 +1490,7 @@
                                     EditCommand="{Binding ProStepCond1TempEditCmd}"
                                     IsTimeOk="{Binding MeterCond1TempExDto.IsTimeOk}"
                                     ListMeter="{Binding ListSlopMeterCond1TempItems}"
-                                    MeterName="冷凝器出口水温"
+                                    MeterName="冷凝器循环水温"
                                     MeterSelectedChangedCmd="{Binding MeterCond1TempSlopSelectedChangedCmd}"
                                     ParConfigCommand="{Binding MeterCond1TempParConfigCmd}"
                                     SelectedMeter="{Binding SelectedSlopCond1Temp, Mode=TwoWay}"