diff --git a/BPASmartClient.Academy/50L/BoolAddEnum.cs b/BPASmartClient.Academy/50L/BoolAddEnum.cs
index 491e867d..6319efb6 100644
--- a/BPASmartClient.Academy/50L/BoolAddEnum.cs
+++ b/BPASmartClient.Academy/50L/BoolAddEnum.cs
@@ -29,7 +29,7 @@ namespace BPASmartClient.Academy._50L
         [Add("DB1.DBX1001.1")]
         反应釜泄压阀,
         [Add("DB1.DBX1001.2")]
-        排热空气阀,
+        抽真空阀,
         [Add("DB1.DBX1001.3")]
         热气排空阀,
         [Add("DB1.DBX1001.4")]
diff --git a/BPASmartClient.Academy/App.xaml.cs b/BPASmartClient.Academy/App.xaml.cs
index 4dfa05b6..8da6032b 100644
--- a/BPASmartClient.Academy/App.xaml.cs
+++ b/BPASmartClient.Academy/App.xaml.cs
@@ -51,7 +51,7 @@ namespace BPASmartClient.Academy
             DataInit();
             MenuInit();
             MainView mv = new MainView();
-            string typeName = Json<DevicePar>.Data.ProjectTypeName == ProjectType.HKYF20240714.ToString() ? "10L" : "50L";
+            string typeName = Json<DevicePar>.Data.ProjectTypeName == ProjectType.HKYF20240916.ToString() ? "50L" : "10L";
             mv.TitleName = $"{typeName} 反应釜焖制系统 V1.0.1";
 //#if !DEBUG
 //            LoginView lv = new LoginView();
diff --git a/BPASmartClient.Academy/View/DeviceMotionView.xaml b/BPASmartClient.Academy/View/DeviceMotionView.xaml
index 29a24ab0..98df970c 100644
--- a/BPASmartClient.Academy/View/DeviceMotionView.xaml
+++ b/BPASmartClient.Academy/View/DeviceMotionView.xaml
@@ -8,9 +8,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="clr-namespace:BPASmartClient.Academy.ViewModel"
     d:DataContext="{d:DesignInstance Type=vm:DeviceMotionViewModel}"
-    d:DesignHeight="900"
-    d:DesignWidth="1440"
-    mc:Ignorable="d">
+    d:DesignHeight="900" d:DesignWidth="1440" mc:Ignorable="d">
     <UserControl.Resources>
         <Style x:Key="checkBox" TargetType="{x:Type CheckBox}">
             <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -93,12 +91,8 @@
     </UserControl.Resources>
     <Grid>
         <Grid
-            Height="50"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Top">
-            <Border
-                Margin="0,0,100,0"
-                HorizontalAlignment="Center">
+            Height="50" HorizontalAlignment="Right" VerticalAlignment="Top">
+            <Border Margin="0,0,100,0" HorizontalAlignment="Center">
                 <Button
                     Margin="20,5"
                     Command="{Binding DataRecordCommand}"
@@ -107,10 +101,7 @@
             </Border>
         </Grid>
         <Grid
-            x:Name="ooo"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch"
-            IsHitTestVisible="False"
+            x:Name="ooo" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsHitTestVisible="False"
             Opacity="0.5">
             <Grid.RowDefinitions>
                 <RowDefinition />
@@ -123,61 +114,42 @@
 
                             <!--#region  配料搅拌-->
                             <TextBlock
-                                Canvas.Left="60"
-                                Canvas.Top="10"
+                                Canvas.Left="60" Canvas.Top="10"
                                 Foreground="{Binding DeviceStatus.M101, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="配料搅拌" />
                             <StackPanel
-                                Canvas.Left="56"
-                                Canvas.Top="35"
-                                Orientation="Horizontal">
+                                Canvas.Left="56" Canvas.Top="35" Orientation="Horizontal">
                                 <bpa:MotorTwo
-                                    Width="60"
-                                    Height="30"
-                                    Margin="0,-20,0,0"
+                                    Width="60" Height="30" Margin="0,-20,0,0"
                                     MotorColors="{Binding DeviceStatus.M101, Converter={StaticResource deviceConvert}, ConverterParameter=3}" />
                                 <bpa:MotorHousing
-                                    Width="50"
-                                    Height="50"
-                                    Margin="-20,0,0,0" />
+                                    Width="50" Height="50" Margin="-20,0,0,0" />
                             </StackPanel>
                             <!--#endregion-->
 
                             <!--#region  阀门1 进料阀-->
                             <StackPanel
-                                Canvas.Left="87"
-                                Canvas.Top="150"
-                                Width="70"
-                                Height="120">
+                                Canvas.Left="87" Canvas.Top="150" Width="70" Height="120">
                                 <bpa:PipeLineV
-                                    Width="15"
-                                    Height="80"
+                                    Width="15" Height="80"
                                     Direction="{Binding DeviceStatus.VX100, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                     Fill="{Binding DeviceStatus.VX100, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                     Speed="10" />
                                 <bpa:PipeLineTR
-                                    Width="30"
-                                    Margin="0,-1,-15,0"
+                                    Width="30" Margin="0,-1,-15,0"
                                     Direction="{Binding DeviceStatus.VX100, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                     Fill="{Binding DeviceStatus.VX100, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                    LineWidth="15"
-                                    Speed="10" />
+                                    LineWidth="15" Speed="10" />
                             </StackPanel>
                             <TextBlock
-                                Canvas.Left="70"
-                                Canvas.Top="130"
+                                Canvas.Left="70" Canvas.Top="130"
                                 Foreground="{Binding DeviceStatus.VX100, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="进料阀" />
                             <StackPanel
-                                Canvas.Left="90"
-                                Canvas.Top="65"
-                                Width="65"
-                                Height="130">
+                                Canvas.Left="90" Canvas.Top="65" Width="65" Height="130">
                                 <bpa:JAR Width="65" Height="65" />
                                 <bpa:HandValve
-                                    Width="45"
-                                    Height="65"
-                                    Margin="0,-20,-12,0"
+                                    Width="45" Height="65" Margin="0,-20,-12,0"
                                     EdgeColor="{Binding DeviceStatus.VX100, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                     OpenEnable="{Binding DeviceStatus.VX100}"
                                     RenderTransformOrigin="0.5,0.5">
@@ -192,10 +164,7 @@
                                 </bpa:HandValve>
                             </StackPanel>
                             <bpa:PipeLineH
-                                Canvas.Left="144"
-                                Canvas.Top="244"
-                                Width="65"
-                                Height="15"
+                                Canvas.Left="144" Canvas.Top="244" Width="65" Height="15"
                                 Direction="{Binding DeviceStatus.VX100, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX100, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
@@ -203,55 +172,37 @@
 
                             <!--#region  阀门3 回油阀-->
                             <bpa:PipeLineTL
-                                Canvas.Left="427"
-                                Canvas.Top="200"
-                                Width="16"
-                                Margin="0,0,0,-8"
+                                Canvas.Left="427" Canvas.Top="200" Width="16" Margin="0,0,0,-8"
                                 Direction="{Binding DeviceStatus.VX102, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX102, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="25"
-                                Speed="10" />
+                                LineWidth="25" Speed="10" />
                             <bpa:PipeLineV
-                                Canvas.Left="435"
-                                Canvas.Top="177"
-                                Width="8"
-                                Height="23"
+                                Canvas.Left="435" Canvas.Top="177" Width="8" Height="23"
                                 Direction="{Binding DeviceStatus.VX102, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX102, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
                             <TextBlock
-                                Canvas.Left="495"
-                                Canvas.Top="140"
+                                Canvas.Left="495" Canvas.Top="140"
                                 Foreground="{Binding DeviceStatus.VX102, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="回油阀" />
                             <StackPanel
-                                Canvas.Left="435"
-                                Canvas.Top="160"
-                                Orientation="Horizontal">
+                                Canvas.Left="435" Canvas.Top="160" Orientation="Horizontal">
                                 <bpa:PipeLineBR
-                                    Width="16"
-                                    Margin="0,0,0,-8"
+                                    Width="16" Margin="0,0,0,-8"
                                     Direction="{Binding DeviceStatus.VX102, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                     Fill="{Binding DeviceStatus.VX102, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                    LineWidth="25"
-                                    Speed="10" />
+                                    LineWidth="25" Speed="10" />
                                 <bpa:PipeLineH
-                                    Width="50"
-                                    Height="8"
+                                    Width="50" Height="8"
                                     Direction="{Binding DeviceStatus.VX102, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                     Fill="{Binding DeviceStatus.VX102, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                     Speed="10" />
                                 <bpa:HandValve
-                                    Width="25"
-                                    Margin="-1,-7,0,0"
-                                    Panel.ZIndex="1"
+                                    Width="25" Margin="-1,-7,0,0" Panel.ZIndex="1"
                                     EdgeColor="{Binding DeviceStatus.VX102, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                     OpenEnable="{Binding DeviceStatus.VX102}" />
                                 <bpa:PipeLineH
-                                    Width="50"
-                                    Height="8"
-                                    Margin="-6,0,0,0"
-                                    Panel.ZIndex="0"
+                                    Width="50" Height="8" Margin="-6,0,0,0" Panel.ZIndex="0"
                                     Direction="{Binding DeviceStatus.VX102, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                     Fill="{Binding DeviceStatus.VX102, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                     Speed="10" />
@@ -260,64 +211,44 @@
 
                             <!--#region  阀门4 回水阀-->
                             <TextBlock
-                                Canvas.Left="495"
-                                Canvas.Top="220"
+                                Canvas.Left="495" Canvas.Top="220"
                                 Foreground="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="回水阀" />
                             <StackPanel
-                                Canvas.Left="427"
-                                Canvas.Top="200"
-                                Orientation="Horizontal">
+                                Canvas.Left="427" Canvas.Top="200" Orientation="Horizontal">
                                 <bpa:PipeLineH
-                                    Width="73"
-                                    Height="8"
+                                    Width="73" Height="8"
                                     Direction="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                     Fill="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                     Speed="10" />
                                 <bpa:HandValve
-                                    Width="25"
-                                    Margin="-1,-7,0,0"
-                                    Panel.ZIndex="1"
+                                    Width="25" Margin="-1,-7,0,0" Panel.ZIndex="1"
                                     EdgeColor="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                     OpenEnable="{Binding DeviceStatus.VX103}" />
                                 <bpa:PipeLineH
-                                    Width="120"
-                                    Height="8"
-                                    Margin="-6,0,0,0"
-                                    Panel.ZIndex="0"
+                                    Width="120" Height="8" Margin="-6,0,0,0" Panel.ZIndex="0"
                                     Direction="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                     Fill="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                     Speed="10" />
                                 <bpa:PipeLineTL
-                                    Width="16"
-                                    Margin="0,0,0,8"
+                                    Width="16" Margin="0,0,0,8"
                                     Direction="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                     Fill="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                    LineWidth="25"
-                                    Speed="10" />
+                                    LineWidth="25" Speed="10" />
 
                             </StackPanel>
                             <bpa:PipeLineV
-                                Canvas.Left="646"
-                                Canvas.Top="170"
-                                Width="8"
-                                Height="30"
+                                Canvas.Left="646" Canvas.Top="170" Width="8" Height="30"
                                 Direction="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
                             <bpa:PipeLineBL
-                                Canvas.Left="638"
-                                Canvas.Top="154"
-                                Width="16"
+                                Canvas.Left="638" Canvas.Top="154" Width="16"
                                 Direction="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="25"
-                                Speed="10" />
+                                LineWidth="25" Speed="10" />
                             <bpa:PipeLineH
-                                Canvas.Left="607"
-                                Canvas.Top="154"
-                                Width="31"
-                                Height="8"
+                                Canvas.Left="607" Canvas.Top="154" Width="31" Height="8"
                                 Direction="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX103, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
@@ -325,10 +256,7 @@
 
                             <!--#region  阀门3-4连接-->
                             <bpa:PipeLineH
-                                Canvas.Left="229"
-                                Canvas.Top="208"
-                                Width="198"
-                                Height="8"
+                                Canvas.Left="229" Canvas.Top="208" Width="198" Height="8"
                                 Direction="{Binding PipeLine.PipeH_1.Direction}"
                                 Fill="{Binding PipeLine.PipeH_1.Fill, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
@@ -336,22 +264,16 @@
 
                             <!--#region  阀门5 汇馏阀-->
                             <TextBlock
-                                Canvas.Left="610"
-                                Canvas.Top="240"
+                                Canvas.Left="610" Canvas.Top="240"
                                 Foreground="{Binding DeviceStatus.VX104, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="汇馏阀" />
                             <bpa:PipeLineV
-                                Canvas.Left="584"
-                                Canvas.Top="185"
-                                Width="8"
-                                Height="95"
+                                Canvas.Left="584" Canvas.Top="185" Width="8" Height="95"
                                 Direction="{Binding DeviceStatus.VX104, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX104, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
                             <bpa:HandValve
-                                Canvas.Left="579"
-                                Canvas.Top="240"
-                                Width="25"
+                                Canvas.Left="579" Canvas.Top="240" Width="25"
                                 EdgeColor="{Binding DeviceStatus.VX104, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 OpenEnable="{Binding DeviceStatus.VX104}"
                                 RenderTransformOrigin="0.5,0.5">
@@ -368,63 +290,41 @@
 
                             <!--#region  阀门2 蒸馏阀-->
                             <bpa:PipeLineH
-                                Canvas.Left="258"
-                                Canvas.Top="244"
-                                Width="65"
-                                Height="15"
+                                Canvas.Left="258" Canvas.Top="244" Width="65" Height="15"
                                 Direction="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
                             <bpa:PipeLineTL
-                                Canvas.Left="321"
-                                Canvas.Top="229"
-                                Width="30"
+                                Canvas.Left="321" Canvas.Top="229" Width="30"
                                 Direction="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                 Fill="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="15"
-                                Speed="10" />
+                                LineWidth="15" Speed="10" />
                             <bpa:PipeLineV
-                                Canvas.Left="336"
-                                Canvas.Top="180"
-                                Width="15"
-                                Height="50"
+                                Canvas.Left="336" Canvas.Top="180" Width="15" Height="50"
                                 Direction="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                 Fill="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
                             <bpa:PipeLineV
-                                Canvas.Left="336"
-                                Canvas.Top="40"
-                                Width="15"
-                                Height="110"
+                                Canvas.Left="336" Canvas.Top="40" Width="15" Height="110"
                                 Direction="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                 Fill="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
                             <bpa:PipeLineBR
-                                Canvas.Left="336"
-                                Canvas.Top="10"
-                                Width="30"
+                                Canvas.Left="336" Canvas.Top="10" Width="30"
                                 Direction="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="15"
-                                Speed="10" />
+                                LineWidth="15" Speed="10" />
                             <bpa:PipeLineH
-                                Canvas.Left="366"
-                                Canvas.Top="10"
-                                Width="200"
-                                Height="15"
+                                Canvas.Left="366" Canvas.Top="10" Width="200" Height="15"
                                 Direction="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
                             <TextBlock
-                                Canvas.Left="280"
-                                Canvas.Top="160"
+                                Canvas.Left="280" Canvas.Top="160"
                                 Foreground="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="蒸馏阀" />
                             <bpa:HandValve
-                                Canvas.Left="327"
-                                Canvas.Top="136"
-                                Width="45"
-                                Height="65"
+                                Canvas.Left="327" Canvas.Top="136" Width="45" Height="65"
                                 EdgeColor="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 OpenEnable="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 RenderTransformOrigin="0.5,0.5">
@@ -442,44 +342,31 @@
                                     Width="30"
                                     Direction="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                     Fill="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                    LineWidth="15"
-                                    Speed="10" />
+                                    LineWidth="15" Speed="10" />
                                 <bpa:Condenser
-                                    Width="65"
-                                    Height="80"
-                                    Margin="0,0,-15,0" />
+                                    Width="65" Height="80" Margin="0,0,-15,0" />
                                 <bpa:PipeLineV
-                                    Width="8"
-                                    Height="20"
-                                    Margin="0,-4,-15,0"
+                                    Width="8" Height="20" Margin="0,-4,-15,0"
                                     Direction="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                     Fill="{Binding DeviceStatus.VX101, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                     Speed="10" />
                                 <bpa:Tanks
-                                    Width="60"
-                                    Height="60"
-                                    Margin="0,-5,-15,0" />
+                                    Width="60" Height="60" Margin="0,-5,-15,0" />
                             </StackPanel>
                             <!--#endregion-->
 
                             <!--#region  阀门6 排馏阀-->
                             <TextBlock
-                                Canvas.Left="620"
-                                Canvas.Top="350"
+                                Canvas.Left="620" Canvas.Top="350"
                                 Foreground="{Binding DeviceStatus.VX105, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="排馏阀" />
                             <bpa:PipeLineV
-                                Canvas.Left="596"
-                                Canvas.Top="330"
-                                Width="8"
-                                Height="50"
+                                Canvas.Left="596" Canvas.Top="330" Width="8" Height="50"
                                 Direction="{Binding DeviceStatus.VX105, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX105, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
                             <bpa:HandValve
-                                Canvas.Left="591"
-                                Canvas.Top="350"
-                                Width="25"
+                                Canvas.Left="591" Canvas.Top="350" Width="25"
                                 EdgeColor="{Binding DeviceStatus.VX105, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 OpenEnable="{Binding DeviceStatus.VX105}"
                                 RenderTransformOrigin="0.5,0.5">
@@ -496,82 +383,55 @@
 
                             <!--#region  阀门7 冷凝器冷却水阀-->
                             <TextBlock
-                                Canvas.Left="610"
-                                Canvas.Top="30"
+                                Canvas.Left="610" Canvas.Top="30"
                                 Foreground="{Binding DeviceStatus.VX106, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="冷凝器冷却水阀" />
                             <bpa:PipeLineH
-                                Width="65"
-                                Height="8"
-                                Margin="607,68,402,154"
+                                Width="65" Height="8" Margin="607,68,402,154"
                                 Direction="{Binding DeviceStatus.VX106, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                 Fill="{Binding DeviceStatus.VX106, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 LineWidth="2" />
                             <bpa:HandValve
-                                x:Name="VX106"
-                                Width="30"
-                                Height="20"
-                                Margin="617,58,402,154"
+                                x:Name="VX106" Width="30" Height="20" Margin="617,58,402,154"
                                 OpenEnable="{Binding DeviceStatus.VX106}"
                                 RenderTransformOrigin="0.5,0.5" />
                             <!--#endregion-->
 
                             <!--#region  阀门8 配料釜蒸汽阀-->
                             <bpa:PipeLineH
-                                Canvas.Left="149"
-                                Canvas.Top="85"
-                                Width="70"
-                                Height="10"
+                                Canvas.Left="149" Canvas.Top="85" Width="70" Height="10"
                                 Direction="{Binding DeviceStatus.VX107, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                 Fill="{Binding DeviceStatus.VX107, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
                             <bpa:HandValve
-                                Canvas.Left="179"
-                                Canvas.Top="74"
-                                Width="30"
-                                Height="25"
+                                Canvas.Left="179" Canvas.Top="74" Width="30" Height="25"
                                 OpenEnable="{Binding DeviceStatus.VX107}" />
                             <TextBlock
-                                Canvas.Left="160"
-                                Canvas.Top="54"
-                                Foreground="White"
-                                Text="配料釜蒸汽阀" />
+                                Canvas.Left="160" Canvas.Top="54" Foreground="White" Text="配料釜蒸汽阀" />
                             <!--#endregion-->
 
                             <!--#region  阀门9 反应釜蒸汽阀-->
                             <TextBlock
-                                Canvas.Left="30"
-                                Canvas.Top="250"
+                                Canvas.Left="30" Canvas.Top="250"
                                 Foreground="{Binding DeviceStatus.VX108, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="蒸汽阀" />
                             <bpa:PipeLineTR
-                                Width="24"
-                                Height="24"
-                                Margin="81,266,402,154"
+                                Width="24" Height="24" Margin="81,266,402,154"
                                 Direction="{Binding DeviceStatus.VX108, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                 Fill="{Binding DeviceStatus.VX108, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="18"
-                                Speed="10" />
+                                LineWidth="18" Speed="10" />
                             <bpa:PipeLineTR
-                                Width="24"
-                                Height="24"
-                                Margin="81,266,402,154"
+                                Width="24" Height="24" Margin="81,266,402,154"
                                 Direction="{Binding DeviceStatus.VX108, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
                                 Fill="{Binding DeviceStatus.VX108, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="18"
-                                Speed="10" />
+                                LineWidth="18" Speed="10" />
                             <bpa:PipeLineV
-                                Width="12"
-                                Height="40"
-                                Margin="81,226,402,154"
+                                Width="12" Height="40" Margin="81,226,402,154"
                                 Direction="{Binding DeviceStatus.VX108, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX108, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 LineWidth="4" />
                             <bpa:HandValve
-                                x:Name="VX108"
-                                Width="35"
-                                Height="35"
-                                Margin="65,240,402,154"
+                                x:Name="VX108" Width="35" Height="35" Margin="65,240,402,154"
                                 OpenEnable="{Binding DeviceStatus.VX108}"
                                 RenderTransformOrigin="0.5,0.5">
                                 <bpa:HandValve.RenderTransform>
@@ -587,21 +447,16 @@
 
                             <!--#region  阀门10 反应釜蒸汽疏水阀-->
                             <TextBlock
-                                Canvas.Left="280"
-                                Canvas.Top="315"
+                                Canvas.Left="280" Canvas.Top="315"
                                 Foreground="{Binding DeviceStatus.VX109, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="蒸汽疏水阀" />
                             <bpa:PipeLineV
-                                Width="12"
-                                Height="50"
-                                Margin="348,287,402,154"
+                                Width="12" Height="50" Margin="348,287,402,154"
                                 Direction="{Binding DeviceStatus.VX109, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX109, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 LineWidth="4" />
                             <bpa:HandValve
-                                Width="35"
-                                Height="35"
-                                Margin="341,296,402,154"
+                                Width="35" Height="35" Margin="341,296,402,154"
                                 OpenEnable="{Binding DeviceStatus.VX109}"
                                 RenderTransformOrigin="0.5,0.5">
                                 <bpa:HandValve.RenderTransform>
@@ -617,32 +472,22 @@
 
                             <!--#region  阀门11 反应釜冷却水给水阀-->
                             <TextBlock
-                                Canvas.Left="390"
-                                Canvas.Top="260"
+                                Canvas.Left="390" Canvas.Top="260"
                                 Foreground="{Binding DeviceStatus.VX110, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="冷却水给水阀" />
                             <bpa:PipeLineTL
-                                Width="24"
-                                Height="24"
-                                Margin="360,266,402,154"
+                                Width="24" Height="24" Margin="360,266,402,154"
                                 Direction="{Binding DeviceStatus.VX110, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX110, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="18"
-                                Speed="1" />
+                                LineWidth="18" Speed="1" />
 
                             <bpa:PipeLineV
-                                Width="12"
-                                Height="40"
-                                Margin="372,226,402,154"
+                                Width="12" Height="40" Margin="372,226,402,154"
                                 Direction="{Binding DeviceStatus.VX110, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX110, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="4"
-                                Speed="10" />
+                                LineWidth="4" Speed="10" />
                             <bpa:HandValve
-                                x:Name="VX110"
-                                Width="35"
-                                Height="35"
-                                Margin="365,232,402,154"
+                                x:Name="VX110" Width="35" Height="35" Margin="365,232,402,154"
                                 OpenEnable="{Binding DeviceStatus.VX110}"
                                 RenderTransformOrigin="0.5,0.5">
                                 <bpa:HandValve.RenderTransform>
@@ -658,22 +503,16 @@
 
                             <!--#region  阀门12 冷却水排水阀-->
                             <TextBlock
-                                Canvas.Left="124"
-                                Canvas.Top="316"
+                                Canvas.Left="124" Canvas.Top="316"
                                 Foreground="{Binding DeviceStatus.VX111, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="冷却水排水阀" />
                             <bpa:PipeLineV
-                                Width="12"
-                                Height="50"
-                                Margin="105,290,402,154"
+                                Width="12" Height="50" Margin="105,290,402,154"
                                 Direction="{Binding DeviceStatus.VX111, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX111, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 LineWidth="4" />
                             <bpa:HandValve
-                                x:Name="VX111"
-                                Width="35"
-                                Height="35"
-                                Margin="89,297,402,154"
+                                x:Name="VX111" Width="35" Height="35" Margin="89,297,402,154"
                                 OpenEnable="{Binding DeviceStatus.VX111}"
                                 RenderTransformOrigin="0.5,0.5">
                                 <bpa:HandValve.RenderTransform>
@@ -689,9 +528,7 @@
 
                             <!--#region  阀门9-12链接-->
                             <bpa:PipeLineH
-                                Width="95"
-                                Height="12"
-                                Margin="105,278,402,154"
+                                Width="95" Height="12" Margin="105,278,402,154"
                                 Direction="{Binding PipeLine.PipeH_3.Direction}"
                                 Fill="{Binding PipeLine.PipeH_3.Fill, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 LineWidth="4" />
@@ -699,9 +536,7 @@
 
                             <!--#region  阀门10-11连接-->
                             <bpa:PipeLineH
-                                Width="95"
-                                Height="12"
-                                Margin="265,278,402,154"
+                                Width="95" Height="12" Margin="265,278,402,154"
                                 Direction="{Binding PipeLine.PipeH_2.Direction}"
                                 Fill="{Binding PipeLine.PipeH_2.Fill, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 LineWidth="4" />
@@ -709,35 +544,22 @@
 
                             <!--#region  阀门13分馏真空阀-->
                             <bpa:PipeLineH
-                                Canvas.Left="607"
-                                Canvas.Top="142"
-                                Width="140"
-                                Height="10"
+                                Canvas.Left="607" Canvas.Top="142" Width="140" Height="10"
                                 Direction="{Binding DeviceStatus.VX112, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX112, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
                             <bpa:PipeLineBL
-                                Canvas.Left="746"
-                                Canvas.Top="142"
-                                Width="20"
-                                Height="20"
+                                Canvas.Left="746" Canvas.Top="142" Width="20" Height="20"
                                 Direction="{Binding DeviceStatus.VX112, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX112, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="20"
-                                Speed="2" />
+                                LineWidth="20" Speed="2" />
                             <bpa:PipeLineV
-                                Canvas.Left="756"
-                                Canvas.Top="161"
-                                Width="10"
-                                Height="150"
+                                Canvas.Left="756" Canvas.Top="161" Width="10" Height="150"
                                 Direction="{Binding DeviceStatus.VX112, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX112, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
                             <bpa:HandValve
-                                Canvas.Left="750"
-                                Canvas.Top="181"
-                                Width="30"
-                                Height="25"
+                                Canvas.Left="750" Canvas.Top="181" Width="30" Height="25"
                                 OpenEnable="{Binding DeviceStatus.VX112}"
                                 RenderTransformOrigin="0.5,0.5">
                                 <bpa:HandValve.RenderTransform>
@@ -750,40 +572,28 @@
                                 </bpa:HandValve.RenderTransform>
                             </bpa:HandValve>
                             <TextBlock
-                                Canvas.Left="780"
-                                Canvas.Top="183"
+                                Canvas.Left="780" Canvas.Top="183"
                                 Foreground="{Binding DeviceStatus.VX112, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="分馏真空阀" />
                             <!--#endregion-->
 
                             <!--#region  阀门14蒸馏真空阀-->
                             <bpa:PipeLineH
-                                Canvas.Left="619"
-                                Canvas.Top="292"
-                                Width="128"
-                                Height="10"
+                                Canvas.Left="619" Canvas.Top="292" Width="128" Height="10"
                                 Direction="{Binding DeviceStatus.VX113, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX113, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="10" />
                             <bpa:PipeLineBL
-                                Canvas.Left="746"
-                                Canvas.Top="292"
-                                Width="20"
-                                Height="20"
+                                Canvas.Left="746" Canvas.Top="292" Width="20" Height="20"
                                 Direction="{Binding DeviceStatus.VX113, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
                                 Fill="{Binding DeviceStatus.VX113, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="20"
-                                Speed="2" />
+                                LineWidth="20" Speed="2" />
 
                             <bpa:HandValve
-                                Canvas.Left="696"
-                                Canvas.Top="281"
-                                Width="30"
-                                Height="25"
+                                Canvas.Left="696" Canvas.Top="281" Width="30" Height="25"
                                 OpenEnable="{Binding DeviceStatus.VX113}" />
                             <TextBlock
-                                Canvas.Left="680"
-                                Canvas.Top="310"
+                                Canvas.Left="680" Canvas.Top="310"
                                 Foreground="{Binding DeviceStatus.VX113, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="蒸馏真空阀" />
 
@@ -791,22 +601,15 @@
 
                             <!--#region  阀门13-14连接-->
                             <bpa:PipeLineV
-                                Canvas.Left="756"
-                                Canvas.Top="311"
-                                Width="10"
-                                Height="40"
+                                Canvas.Left="756" Canvas.Top="311" Width="10" Height="40"
                                 Direction="{Binding PipeLine.PipeH_4.Direction}"
                                 Fill="{Binding PipeLine.PipeH_4.Fill, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
                                 Speed="4" />
                             <bpa:PipeLineBR
-                                Canvas.Left="756"
-                                Canvas.Top="370"
-                                Width="20"
-                                Height="20"
+                                Canvas.Left="756" Canvas.Top="370" Width="20" Height="20"
                                 Direction="{Binding PipeLine.PipeH_4.Direction}"
                                 Fill="{Binding PipeLine.PipeH_4.Fill, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="20"
-                                Speed="4">
+                                LineWidth="20" Speed="4">
                                 <bpa:PipeLineBR.RenderTransform>
                                     <ScaleTransform ScaleY="-1.0" />
                                 </bpa:PipeLineBR.RenderTransform>
@@ -815,20 +618,14 @@
 
                             <!--#region  反应釜搅拌-->
                             <TextBlock
-                                Canvas.Left="170"
-                                Canvas.Top="150"
+                                Canvas.Left="170" Canvas.Top="150"
                                 Foreground="{Binding DeviceStatus.M102, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="反应釜搅拌" />
 
                             <StackPanel
-                                Canvas.Left="200"
-                                Canvas.Top="175"
-                                Width="65"
-                                Height="220">
+                                Canvas.Left="200" Canvas.Top="175" Width="65" Height="220">
                                 <bpa:MotorTwo
-                                    Width="40"
-                                    Height="30"
-                                    Margin="0,0,0,-1"
+                                    Width="40" Height="30" Margin="0,0,0,-1"
                                     MotorColors="{Binding DeviceStatus.M102, Converter={StaticResource deviceConvert}, ConverterParameter=3}"
                                     RenderTransformOrigin="0.5,0.5">
                                     <bpa:MotorTwo.RenderTransform>
@@ -841,18 +638,11 @@
                                     </bpa:MotorTwo.RenderTransform>
                                 </bpa:MotorTwo>
                                 <bpa:Joint
-                                    Width="40"
-                                    Height="30"
-                                    Margin="0,0,0,-3" />
+                                    Width="40" Height="30" Margin="0,0,0,-3" />
                                 <local:RetortTank
-                                    Width="65"
-                                    Height="120"
-                                    Margin="0,4,0,0" />
+                                    Width="65" Height="120" Margin="0,4,0,0" />
                                 <bpa:HandValve
-                                    Width="48"
-                                    Height="65"
-                                    Margin="0,-24,-14,0"
-                                    RenderTransformOrigin="0.5,0.5">
+                                    Width="48" Height="65" Margin="0,-24,-14,0" RenderTransformOrigin="0.5,0.5">
                                     <bpa:HandValve.RenderTransform>
                                         <TransformGroup>
                                             <ScaleTransform ScaleX="0.926" ScaleY="1.08" />
@@ -867,610 +657,324 @@
 
                             <!--#region  水罐-->
                             <bpa:Tanks
-                                Canvas.Left="570"
-                                Canvas.Top="280"
-                                Width="60"
-                                Height="60"
+                                Canvas.Left="570" Canvas.Top="280" Width="60" Height="60"
                                 Margin="0,-5,-15,0" />
                             <!--#endregion-->
 
                             <!--#region  真空泵-->
                             <bpa:MotorTwo
-                                Canvas.Left="841"
-                                Canvas.Top="380"
-                                Width="40"
-                                Height="25"
+                                Canvas.Left="841" Canvas.Top="380" Width="40" Height="25"
                                 MotorColors="{Binding DeviceStatus.M103, Converter={StaticResource deviceConvert}, ConverterParameter=3}">
                                 <bpa:MotorTwo.RenderTransform>
                                     <RotateTransform Angle="180" />
                                 </bpa:MotorTwo.RenderTransform>
                             </bpa:MotorTwo>
                             <bpa:Joint
-                                Canvas.Left="817"
-                                Canvas.Top="355"
-                                Height="36">
+                                Canvas.Left="817" Canvas.Top="355" Height="36">
                                 <bpa:Joint.RenderTransform>
                                     <ScaleTransform ScaleX="-1.0" />
                                 </bpa:Joint.RenderTransform>
                             </bpa:Joint>
                             <bpa:Tanks
-                                Canvas.Left="770"
-                                Canvas.Top="384"
-                                Width="50"
-                                Height="50" />
+                                Canvas.Left="770" Canvas.Top="384" Width="50" Height="50" />
                             <TextBlock
-                                Canvas.Left="775"
-                                Canvas.Top="333"
+                                Canvas.Left="775" Canvas.Top="333"
                                 Foreground="{Binding DeviceStatus.M103, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="分馏真空泵" />
                             <!--#endregion-->
 
                             <!--#region  仪器标注-->
                             <TextBlock
-                                Canvas.Left="104"
-                                Canvas.Top="84"
-                                Foreground="Blue"
-                                Text="配料罐" />
+                                Canvas.Left="104" Canvas.Top="84" Foreground="Blue" Text="配料罐" />
                             <TextBlock
-                                Canvas.Left="92"
-                                Canvas.Top="70"
-                                Width="60"
-                                Foreground="Red"
+                                Canvas.Left="92" Canvas.Top="70" Width="60" Foreground="Red"
                                 Text="{Binding DeviceStatus.TempMaterial, StringFormat='{}{0}℃'}"
                                 TextAlignment="Center" />
                             <TextBlock
-                                Canvas.Left="214"
-                                Canvas.Top="290"
-                                Foreground="Blue"
-                                Text="反应釜" />
+                                Canvas.Left="214" Canvas.Top="290" Foreground="Blue" Text="反应釜" />
                             <TextBlock
-                                Canvas.Left="203"
-                                Canvas.Top="260"
-                                Width="60"
-                                Foreground="Red"
+                                Canvas.Left="203" Canvas.Top="260" Width="60" Foreground="Red"
                                 Text="{Binding DeviceStatus.TempWok, StringFormat='{}{0}℃'}"
                                 TextAlignment="Center" />
                             <TextBlock
-                                Canvas.Left="569"
-                                Canvas.Top="88"
-                                Foreground="Blue"
-                                Text="冷凝器" />
+                                Canvas.Left="569" Canvas.Top="88" Foreground="Blue" Text="冷凝器" />
                             <TextBlock
-                                Canvas.Left="389"
-                                Canvas.Top="30"
-                                Width="150"
-                                Foreground="Red"
+                                Canvas.Left="389" Canvas.Top="30" Width="150" Foreground="Red"
                                 Text="{Binding DeviceStatus.TempVent, StringFormat='反应釜排气温度：{0}℃'}"
                                 TextAlignment="Center" />
                             <TextBlock
-                                Canvas.Left="569"
-                                Canvas.Top="168"
-                                Foreground="Blue"
-                                Text="蒸馏罐" />
+                                Canvas.Left="569" Canvas.Top="168" Foreground="Blue" Text="蒸馏罐" />
                             <TextBlock
-                                Canvas.Left="589"
-                                Canvas.Top="312"
-                                Foreground="Blue"
-                                Text="水罐" />
+                                Canvas.Left="589" Canvas.Top="312" Foreground="Blue" Text="水罐" />
                             <TextBlock
-                                Canvas.Left="570"
-                                Canvas.Top="295"
-                                Width="60"
-                                FontSize="9"
+                                Canvas.Left="570" Canvas.Top="295" Width="60" FontSize="9"
                                 Foreground="Red"
                                 Text="{Binding DeviceStatus.WeightWok, StringFormat='{}{0:f2}g'}"
                                 TextAlignment="Center" />
                             <TextBlock
-                                Canvas.Left="780"
-                                Canvas.Top="414"
-                                FontSize="10"
-                                Foreground="Blue"
+                                Canvas.Left="780" Canvas.Top="414" FontSize="10" Foreground="Blue"
                                 Text="真空泵" />
                             <!--#endregion-->
 
                             <!--#region  水罐重量清零-->
                             <Button
-                                Canvas.Left="480"
-                                Canvas.Top="370"
-                                Width="100"
-                                Height="25"
-                                VerticalAlignment="Center"
-                                Click="ClearBtn_CLick"
-                                Content="水罐重量清零"
-                                FontSize="10"
+                                Canvas.Left="480" Canvas.Top="370" Width="100" Height="25"
+                                VerticalAlignment="Center" Click="ClearBtn_CLick" Content="水罐重量清零" FontSize="10"
                                 Style="{StaticResource ButtonStyle}" />
                             <!--#endregion-->
 
                             <!--#region   控制按钮-->
                             <StackPanel
-                                Canvas.Left="-20"
-                                Canvas.Top="-5"
-                                Orientation="Vertical">
+                                Canvas.Left="-20" Canvas.Top="-5" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="配料搅拌:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="70" Height="22" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="配料搅拌:开" FontSize="10" Foreground="White"
                                     GroupName="1"
                                     Style="{StaticResource radiobutton}"
                                     Tag="0" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="配料搅拌:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="1"
+                                    Width="70" Height="22" BorderThickness="0" Click="Close_Click"
+                                    Content="配料搅拌:关" FontSize="10" Foreground="White" GroupName="1"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="0" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="-5"
-                                Canvas.Top="118"
-                                Orientation="Vertical">
+                                Canvas.Left="-5" Canvas.Top="118" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="进料阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="70" Height="22" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="进料阀:开" FontSize="10" Foreground="White"
                                     GroupName="2"
                                     Style="{StaticResource radiobutton}"
                                     Tag="3" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="进料阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="2"
+                                    Width="70" Height="22" BorderThickness="0" Click="Close_Click"
+                                    Content="进料阀:关" FontSize="10" Foreground="White" GroupName="2"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="3" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="144"
-                                Canvas.Top="180"
-                                Orientation="Vertical">
+                                Canvas.Left="144" Canvas.Top="180" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="反应釜搅拌:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="70" Height="22" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="反应釜搅拌:开" FontSize="10" Foreground="White"
                                     GroupName="3"
                                     Style="{StaticResource radiobutton}"
                                     Tag="1" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="反应釜搅拌:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="3"
+                                    Width="70" Height="22" BorderThickness="0" Click="Close_Click"
+                                    Content="反应釜搅拌:关" FontSize="10" Foreground="White" GroupName="3"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="1" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="265"
-                                Canvas.Top="110"
-                                Orientation="Vertical">
+                                Canvas.Left="265" Canvas.Top="110" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="蒸馏阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="70" Height="22" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="蒸馏阀:开" FontSize="10" Foreground="White"
                                     GroupName="4"
                                     Style="{StaticResource radiobutton}"
                                     Tag="4" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="蒸馏阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="4"
+                                    Width="70" Height="22" BorderThickness="0" Click="Close_Click"
+                                    Content="蒸馏阀:关" FontSize="10" Foreground="White" GroupName="4"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="4" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="475"
-                                Canvas.Top="90"
-                                Orientation="Vertical">
+                                Canvas.Left="475" Canvas.Top="90" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="回油阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="70" Height="22" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="回油阀:开" FontSize="10" Foreground="White"
                                     GroupName="5"
                                     Style="{StaticResource radiobutton}"
                                     Tag="5" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="回油阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="5"
+                                    Width="70" Height="22" BorderThickness="0" Click="Close_Click"
+                                    Content="回油阀:关" FontSize="10" Foreground="White" GroupName="5"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="5" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="475"
-                                Canvas.Top="240"
-                                Orientation="Vertical">
+                                Canvas.Left="475" Canvas.Top="240" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="回水阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="70" Height="22" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="回水阀:开" FontSize="10" Foreground="White"
                                     GroupName="6"
                                     Style="{StaticResource radiobutton}"
                                     Tag="6" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="回水阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="6"
+                                    Width="70" Height="22" BorderThickness="0" Click="Close_Click"
+                                    Content="回水阀:关" FontSize="10" Foreground="White" GroupName="6"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="6" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="645"
-                                Canvas.Top="224"
-                                Orientation="Vertical">
+                                Canvas.Left="645" Canvas.Top="224" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="汇馏阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="70" Height="22" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="汇馏阀:开" FontSize="10" Foreground="White"
                                     GroupName="7"
                                     Style="{StaticResource radiobutton}"
                                     Tag="7" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="汇馏阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="7"
+                                    Width="70" Height="22" BorderThickness="0" Click="Close_Click"
+                                    Content="汇馏阀:关" FontSize="10" Foreground="White" GroupName="7"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="7" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="605"
-                                Canvas.Top="376"
-                                Orientation="Vertical">
+                                Canvas.Left="605" Canvas.Top="376" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="排馏阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="70" Height="22" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="排馏阀:开" FontSize="10" Foreground="White"
                                     GroupName="8"
                                     Style="{StaticResource radiobutton}"
                                     Tag="8" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="排馏阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="8"
+                                    Width="70" Height="22" BorderThickness="0" Click="Close_Click"
+                                    Content="排馏阀:关" FontSize="10" Foreground="White" GroupName="8"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="8" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="603"
-                                Canvas.Top="-30"
-                                Orientation="Vertical">
+                                Canvas.Left="603" Canvas.Top="-30" Orientation="Vertical">
                                 <RadioButton
-                                    Width="100"
-                                    Height="28"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="冷凝器冷却水阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="100" Height="28" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="冷凝器冷却水阀:开" FontSize="10" Foreground="White"
                                     GroupName="9"
                                     Style="{StaticResource radiobutton}"
                                     Tag="9" />
                                 <RadioButton
-                                    Width="100"
-                                    Height="28"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="冷凝器冷却水阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="9"
+                                    Width="100" Height="28" BorderThickness="0" Click="Close_Click"
+                                    Content="冷凝器冷却水阀:关" FontSize="10" Foreground="White" GroupName="9"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="9" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="150"
-                                Canvas.Top="0"
-                                Orientation="Vertical">
+                                Canvas.Left="150" Canvas.Top="0" Orientation="Vertical">
                                 <RadioButton
-                                    Width="90"
-                                    Height="25"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="配料釜蒸汽阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="90" Height="25" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="配料釜蒸汽阀:开" FontSize="10" Foreground="White"
                                     GroupName="10"
                                     Style="{StaticResource radiobutton}"
                                     Tag="10" />
                                 <RadioButton
-                                    Width="90"
-                                    Height="25"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="配料釜蒸汽阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="10"
+                                    Width="90" Height="25" BorderThickness="0" Click="Close_Click"
+                                    Content="配料釜蒸汽阀:关" FontSize="10" Foreground="White" GroupName="10"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="10" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="-65"
-                                Canvas.Top="234"
-                                Orientation="Vertical">
+                                Canvas.Left="-65" Canvas.Top="234" Orientation="Vertical">
                                 <RadioButton
-                                    Width="90"
-                                    Height="25"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="反应釜蒸汽阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="90" Height="25" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="反应釜蒸汽阀:开" FontSize="10" Foreground="White"
                                     GroupName="11"
                                     Style="{StaticResource radiobutton}"
                                     Tag="11" />
                                 <RadioButton
-                                    Width="90"
-                                    Height="25"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="反应釜蒸汽阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="11"
+                                    Width="90" Height="25" BorderThickness="0" Click="Close_Click"
+                                    Content="反应釜蒸汽阀:关" FontSize="10" Foreground="White" GroupName="11"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="11" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="265"
-                                Canvas.Top="346"
-                                Orientation="Vertical">
+                                Canvas.Left="265" Canvas.Top="346" Orientation="Vertical">
                                 <RadioButton
-                                    Width="110"
-                                    Height="30"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="反应釜蒸汽疏水阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="110" Height="30" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="反应釜蒸汽疏水阀:开" FontSize="10" Foreground="White"
                                     GroupName="12"
                                     Style="{StaticResource radiobutton}"
                                     Tag="12" />
                                 <RadioButton
-                                    Width="110"
-                                    Height="30"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="反应釜蒸汽疏水阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="12"
+                                    Width="110" Height="30" BorderThickness="0" Click="Close_Click"
+                                    Content="反应釜蒸汽疏水阀:关" FontSize="10" Foreground="White" GroupName="12"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="12" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="370"
-                                Canvas.Top="288"
-                                Orientation="Vertical">
+                                Canvas.Left="370" Canvas.Top="288" Orientation="Vertical">
                                 <RadioButton
-                                    Width="120"
-                                    Height="30"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="反应釜冷却水给水阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="120" Height="30" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="反应釜冷却水给水阀:开" FontSize="10" Foreground="White"
                                     GroupName="13"
                                     Style="{StaticResource radiobutton}"
                                     Tag="13" />
                                 <RadioButton
-                                    Width="120"
-                                    Height="30"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="反应釜冷却水给水阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="13"
+                                    Width="120" Height="30" BorderThickness="0" Click="Close_Click"
+                                    Content="反应釜冷却水给水阀:关" FontSize="10" Foreground="White" GroupName="13"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="13" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="92"
-                                Canvas.Top="348"
-                                Orientation="Vertical">
+                                Canvas.Left="92" Canvas.Top="348" Orientation="Vertical">
                                 <RadioButton
-                                    Width="120"
-                                    Height="30"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="反应釜冷却水给水阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="120" Height="30" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="反应釜冷却水给水阀:开" FontSize="10" Foreground="White"
                                     GroupName="18"
                                     Style="{StaticResource radiobutton}"
                                     Tag="18" />
                                 <RadioButton
-                                    Width="120"
-                                    Height="30"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="反应釜冷却水给水阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="18"
+                                    Width="120" Height="30" BorderThickness="0" Click="Close_Click"
+                                    Content="反应釜冷却水给水阀:关" FontSize="10" Foreground="White" GroupName="18"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="18" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="775"
-                                Canvas.Top="128"
-                                Orientation="Vertical">
+                                Canvas.Left="775" Canvas.Top="128" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="分馏真空阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="70" Height="22" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="分馏真空阀:开" FontSize="10" Foreground="White"
                                     GroupName="19"
                                     Style="{StaticResource radiobutton}"
                                     Tag="19" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="分馏真空阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="19"
+                                    Width="70" Height="22" BorderThickness="0" Click="Close_Click"
+                                    Content="分馏真空阀:关" FontSize="10" Foreground="White" GroupName="19"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="19" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="678"
-                                Canvas.Top="336"
-                                Orientation="Vertical">
+                                Canvas.Left="678" Canvas.Top="336" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="蒸馏真空阀:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="70" Height="22" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="蒸馏真空阀:开" FontSize="10" Foreground="White"
                                     GroupName="20"
                                     Style="{StaticResource radiobutton}"
                                     Tag="20" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="蒸馏真空阀:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="20"
+                                    Width="70" Height="22" BorderThickness="0" Click="Close_Click"
+                                    Content="蒸馏真空阀:关" FontSize="10" Foreground="White" GroupName="20"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="20" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="772"
-                                Canvas.Top="286"
-                                Orientation="Vertical">
+                                Canvas.Left="772" Canvas.Top="286" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="Open_Click"
-                                    Content="真空泵:开"
-                                    FontSize="10"
-                                    Foreground="White"
+                                    Width="70" Height="22" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="Open_Click" Content="真空泵:开" FontSize="10" Foreground="White"
                                     GroupName="20"
                                     Style="{StaticResource radiobutton}"
                                     Tag="2" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="22"
-                                    BorderThickness="0"
-                                    Click="Close_Click"
-                                    Content="真空泵:关"
-                                    FontSize="10"
-                                    Foreground="White"
-                                    GroupName="20"
+                                    Width="70" Height="22" BorderThickness="0" Click="Close_Click"
+                                    Content="真空泵:关" FontSize="10" Foreground="White" GroupName="20"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="2" />
@@ -1479,146 +983,76 @@
 
                             <!--#region  新增按钮-->
                             <StackPanel
-                                Canvas.Left="705"
-                                Canvas.Top="-30"
-                                Orientation="Vertical">
+                                Canvas.Left="705" Canvas.Top="-30" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="20"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="new_Click"
-                                    Content="闪蒸:开"
-                                    FontSize="8"
-                                    Foreground="White"
+                                    Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="new_Click" Content="闪蒸:开" FontSize="8" Foreground="White"
                                     GroupName="t1"
                                     Style="{StaticResource radiobutton}"
                                     Tag="0" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="20"
-                                    BorderThickness="0"
-                                    Click="new_Click"
-                                    Content="闪蒸:关"
-                                    FontSize="8"
-                                    Foreground="White"
-                                    GroupName="t1"
+                                    Width="70" Height="20" BorderThickness="0" Click="new_Click"
+                                    Content="闪蒸:关" FontSize="8" Foreground="White" GroupName="t1"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="0" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="785"
-                                Canvas.Top="-30"
-                                Orientation="Vertical">
+                                Canvas.Left="785" Canvas.Top="-30" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="20"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="new_Click"
-                                    Content="真空蒸馏:开"
-                                    FontSize="8"
-                                    Foreground="White"
+                                    Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="new_Click" Content="真空蒸馏:开" FontSize="8" Foreground="White"
                                     GroupName="t2"
                                     Style="{StaticResource radiobutton}"
                                     Tag="1" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="20"
-                                    BorderThickness="0"
-                                    Click="new_Click"
-                                    Content="真空蒸馏:关"
-                                    FontSize="8"
-                                    Foreground="White"
-                                    GroupName="t2"
+                                    Width="70" Height="20" BorderThickness="0" Click="new_Click"
+                                    Content="真空蒸馏:关" FontSize="8" Foreground="White" GroupName="t2"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="1" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="705"
-                                Canvas.Top="20"
-                                Orientation="Vertical">
+                                Canvas.Left="705" Canvas.Top="20" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="20"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="new_Click"
-                                    Content="真空下料:开"
-                                    FontSize="8"
-                                    Foreground="White"
+                                    Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="new_Click" Content="真空下料:开" FontSize="8" Foreground="White"
                                     GroupName="t3"
                                     Style="{StaticResource radiobutton}"
                                     Tag="2" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="20"
-                                    BorderThickness="0"
-                                    Click="new_Click"
-                                    Content="真空下料:关"
-                                    FontSize="8"
-                                    Foreground="White"
-                                    GroupName="t3"
+                                    Width="70" Height="20" BorderThickness="0" Click="new_Click"
+                                    Content="真空下料:关" FontSize="8" Foreground="White" GroupName="t3"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="2" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="785"
-                                Canvas.Top="20"
-                                Orientation="Vertical">
+                                Canvas.Left="785" Canvas.Top="20" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="20"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="new_Click"
-                                    Content="加压出料:开"
-                                    FontSize="8"
-                                    Foreground="White"
+                                    Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="new_Click" Content="二次闪蒸:开" FontSize="8" Foreground="White"
                                     GroupName="t4"
                                     Style="{StaticResource radiobutton}"
                                     Tag="3" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="20"
-                                    BorderThickness="0"
-                                    Click="new_Click"
-                                    Content="加压出料:关"
-                                    FontSize="8"
-                                    Foreground="White"
-                                    GroupName="t4"
+                                    Width="70" Height="20" BorderThickness="0" Click="new_Click"
+                                    Content="二次闪蒸:关" FontSize="8" Foreground="White" GroupName="t4"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="3" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="745"
-                                Canvas.Top="70"
-                                Orientation="Vertical">
+                                Canvas.Left="745" Canvas.Top="70" Orientation="Vertical">
                                 <RadioButton
-                                    Width="70"
-                                    Height="20"
-                                    Margin="0,0,0,2"
-                                    BorderThickness="0"
-                                    Click="new_Click"
-                                    Content="排空阀:开"
-                                    FontSize="8"
-                                    Foreground="White"
+                                    Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
+                                    Click="new_Click" Content="排空阀:开" FontSize="8" Foreground="White"
                                     GroupName="t5"
                                     Style="{StaticResource radiobutton}"
                                     Tag="4" />
                                 <RadioButton
-                                    Width="70"
-                                    Height="20"
-                                    BorderThickness="0"
-                                    Click="new_Click"
-                                    Content="排空阀:关"
-                                    FontSize="8"
-                                    Foreground="White"
-                                    GroupName="t5"
+                                    Width="70" Height="20" BorderThickness="0" Click="new_Click"
+                                    Content="排空阀:关" FontSize="8" Foreground="White" GroupName="t5"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="4" />
@@ -1635,28 +1069,16 @@
                             <RowDefinition Height="200" />
                         </Grid.RowDefinitions>
                         <StackPanel
-                            Margin="200,0,0,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Orientation="Horizontal">
+                            Margin="200,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal">
                             <TextBlock
-                                VerticalAlignment="Center"
-                                FontSize="20"
-                                Foreground="White"
-                                Text="请输入产品编号：" />
+                                VerticalAlignment="Center" FontSize="20" Foreground="White" Text="请输入产品编号：" />
                             <TextBox
-                                x:Name="recipeName"
-                                Width="200"
-                                Height="40"
-                                VerticalAlignment="Center"
+                                x:Name="recipeName" Width="200" Height="40" VerticalAlignment="Center"
                                 FontSize="20"
                                 Text="{Binding Name}" />
                         </StackPanel>
                         <CheckBox
-                            x:Name="start_check"
-                            Width="160"
-                            Height="50"
-                            HorizontalAlignment="Left"
+                            x:Name="start_check" Width="160" Height="50" HorizontalAlignment="Left"
                             VerticalAlignment="Top"
                             Command="{Binding Start}"
                             Content="{Binding Content}"
@@ -1671,174 +1093,132 @@
                                 <RowDefinition />
                             </Grid.RowDefinitions>
                             <TextBlock
-                                Margin="20,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Top"
-                                FontSize="20"
-                                Foreground="White"
-                                Text="温度控制及校准:" />
+                                Margin="20,0" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="20"
+                                Foreground="White" Text="温度控制及校准:" />
                             <StackPanel
-                                Grid.Row="1"
-                                Margin="20,2,30,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Bottom"
+                                Grid.Row="1" Margin="20,2,30,0" HorizontalAlignment="Left" VerticalAlignment="Bottom"
                                 Orientation="Horizontal">
                                 <RadioButton
-                                    Height="40"
-                                    Click="auto_click"
-                                    Content="配料罐升温"
-                                    GroupName="heat"
+                                    Height="40" Click="auto_click" Content="配料罐升温" GroupName="heat"
                                     IsChecked="True"
                                     Style="{StaticResource RectangleRadioButtonStyle}" />
                                 <RadioButton
-                                    Height="40"
-                                    Click="auto_click"
-                                    Content="反应釜升温"
-                                    GroupName="heat"
+                                    Height="40" Click="auto_click" Content="反应釜升温" GroupName="heat"
                                     Style="{StaticResource RectangleRadioButtonStyle}" />
                                 <RadioButton
-                                    Height="40"
-                                    Click="auto_click"
-                                    Content="反应釜降温"
-                                    GroupName="heat"
+                                    Height="40" Click="auto_click" Content="反应釜降温" GroupName="heat"
                                     Style="{StaticResource RectangleRadioButtonStyle}" />
                                 <RadioButton
-                                    Height="40"
-                                    Click="auto_click"
-                                    Content="温度校准"
-                                    GroupName="heat"
+                                    Height="40" Click="auto_click" Content="温度校准" GroupName="heat"
                                     Style="{StaticResource RectangleRadioButtonStyle}" />
                             </StackPanel>
                             <Border
-                                Grid.Row="2"
-                                Margin="20,0,30,10"
-                                BorderBrush="#ff2AB2E7"
-                                BorderThickness="2">
+                                Grid.Row="2" Margin="20,0,30,10" BorderBrush="#ff2AB2E7" BorderThickness="2">
                                 <UniformGrid Rows="2">
                                     <Grid>
-                                        <WrapPanel x:Name="wokTemp" Margin="0,15,0,0">
+                                        <WrapPanel x:Name="materialTemp" Margin="0,15,0,0">
+                                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
+                                                <TextBlock
+                                                    Margin="40,0,20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
+                                                    Foreground="White" Text="设置温度:" />
+                                                <TextBox
+                                                    x:Name="temp_1" Width="120" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                    Text="0" />
+                                                <TextBlock
+                                                    Margin="20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
+                                                    Foreground="White" Text="℃" />
+                                                <RadioButton
+                                                    Width="100" Height="30" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                                    BorderThickness="0" Click="TempSet_CLick" Content="启动" Foreground="White"
+                                                    Style="{StaticResource radiobutton}" />
+                                                <RadioButton
+                                                    Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
+                                                    Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
+                                                    Style="{StaticResource radiobutton}" />
+                                            </StackPanel>
+                                        </WrapPanel>
+                                        <WrapPanel
+                                            x:Name="wokTemp" Margin="0,15,0,0" Visibility="Collapsed">
+                                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
+                                                <TextBlock
+                                                    Margin="40,0,20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
+                                                    Foreground="White" Text="设置温度:" />
+                                                <TextBox
+                                                    x:Name="temp_2" Width="120" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                    Text="0" />
+                                                <TextBlock
+                                                    Margin="20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
+                                                    Foreground="White" Text="℃" />
+                                                <RadioButton
+                                                    Width="100" Height="30" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                                    BorderThickness="0" Click="TempSet_CLick" Content="启动" Foreground="White"
+                                                    Style="{StaticResource radiobutton}" />
+                                                <RadioButton
+                                                    Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
+                                                    Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
+                                                    Style="{StaticResource radiobutton}" />
+                                            </StackPanel>
+                                        </WrapPanel>
+                                        <WrapPanel
+                                            x:Name="wokCooling" Margin="0,15,0,0" Visibility="Collapsed">
                                             <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
                                                 <TextBlock
-                                                    Margin="40,0,20,0"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="16"
-                                                    Foreground="White"
-                                                    Text="设置温度:" />
+                                                    Margin="40,0,20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
+                                                    Foreground="White" Text="设置温度:" />
                                                 <TextBox
-                                                    x:Name="temp_1"
-                                                    Width="120"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
+                                                    x:Name="temp_3" Width="120" HorizontalAlignment="Center" VerticalAlignment="Center"
                                                     Text="0" />
                                                 <TextBlock
-                                                    Margin="20,0"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="16"
-                                                    Foreground="White"
-                                                    Text="℃" />
+                                                    Margin="20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
+                                                    Foreground="White" Text="℃" />
                                                 <RadioButton
-                                                    Width="100"
-                                                    Height="30"
-                                                    HorizontalAlignment="Right"
-                                                    VerticalAlignment="Center"
-                                                    BorderThickness="0"
-                                                    Click="TempSet_CLick"
-                                                    Content="启动"
-                                                    Foreground="White"
-                                                    GroupName="tempctrl"
+                                                    Width="100" Height="30" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                                    BorderThickness="0" Click="TempSet_CLick" Content="启动" Foreground="White"
                                                     Style="{StaticResource radiobutton}" />
                                                 <RadioButton
-                                                    Width="100"
-                                                    Height="30"
-                                                    Margin="40,0,0,0"
-                                                    BorderThickness="0"
-                                                    Click="TempCLose_CLick"
-                                                    Content="停止"
-                                                    Foreground="White"
-                                                    GroupName="tempctrl"
-                                                    IsChecked="True"
+                                                    Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
+                                                    Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
                                                     Style="{StaticResource radiobutton}" />
                                             </StackPanel>
                                         </WrapPanel>
                                         <WrapPanel
-                                            x:Name="caliTemp"
-                                            Margin="0,15,0,0"
-                                            Visibility="Collapsed">
+                                            x:Name="caliTemp" Margin="0,15,0,0" Visibility="Collapsed">
                                             <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
                                                 <TextBlock
-                                                    Margin="40,0,20,0"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="14"
-                                                    Foreground="White"
-                                                    Text="反应釜排气温度校准:" />
+                                                    Margin="40,0,20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"
+                                                    Foreground="White" Text="反应釜排气温度校准:" />
                                                 <TextBox
-                                                    x:Name="tempvent"
-                                                    Width="120"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
+                                                    x:Name="tempvent" Width="120" HorizontalAlignment="Center" VerticalAlignment="Center"
                                                     Text="0" />
                                                 <TextBlock
-                                                    Margin="20,0"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="14"
-                                                    Foreground="White"
-                                                    Text="℃" />
+                                                    Margin="20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"
+                                                    Foreground="White" Text="℃" />
                                             </StackPanel>
                                             <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
                                                 <TextBlock
-                                                    Margin="40,0,20,0"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="16"
-                                                    Foreground="White"
-                                                    Text="配料罐温度校准:" />
+                                                    Margin="40,0,20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
+                                                    Foreground="White" Text="配料罐温度校准:" />
                                                 <TextBox
-                                                    x:Name="tempmaterial"
-                                                    Width="120"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
+                                                    x:Name="tempmaterial" Width="120" HorizontalAlignment="Center" VerticalAlignment="Center"
                                                     Text="0" />
                                                 <TextBlock
-                                                    Margin="20,0"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="14"
-                                                    Foreground="White"
-                                                    Text="℃" />
+                                                    Margin="20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"
+                                                    Foreground="White" Text="℃" />
                                             </StackPanel>
                                             <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
                                                 <TextBlock
-                                                    Margin="40,0,20,0"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="14"
-                                                    Foreground="White"
-                                                    Text="反应釜温度校准:" />
+                                                    Margin="40,0,20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"
+                                                    Foreground="White" Text="反应釜温度校准:" />
                                                 <TextBox
-                                                    x:Name="tempwok"
-                                                    Width="120"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
+                                                    x:Name="tempwok" Width="120" HorizontalAlignment="Center" VerticalAlignment="Center"
                                                     Text="0" />
                                                 <TextBlock
-                                                    Margin="20,0"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="14"
-                                                    Foreground="White"
-                                                    Text="℃" />
+                                                    Margin="20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"
+                                                    Foreground="White" Text="℃" />
                                             </StackPanel>
                                             <Button
-                                                Width="120"
-                                                Height="30"
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Center"
-                                                Click="TempSet_CLick"
-                                                Content="确认"
+                                                Width="120" Height="30" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                                Click="TempSet_CLick" Content="确认"
                                                 Style="{StaticResource ButtonStyle}" />
                                         </WrapPanel>
                                     </Grid>
@@ -1854,19 +1234,11 @@
         </Grid>
 
         <TextBlock
-            x:Name="state"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            FontSize="100"
-            FontWeight="Black"
-            Text="设备未连接"
-            Visibility="Collapsed" />
+            x:Name="state" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="100"
+            FontWeight="Black" Text="设备未连接" Visibility="Collapsed" />
 
         <Grid
-            x:Name="hzSet"
-            Width="800"
-            Height="500"
-            Visibility="Collapsed">
+            x:Name="hzSet" Width="800" Height="500" Visibility="Collapsed">
             <Grid.Background>
                 <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/容器边框.png" />
             </Grid.Background>
@@ -1875,64 +1247,31 @@
                 <RowDefinition Height="5*" />
             </Grid.RowDefinitions>
             <TextBlock
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                FontSize="30"
-                Foreground="White"
+                HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="30" Foreground="White"
                 Text="设置频率" />
             <UniformGrid
-                Grid.Row="1"
-                Margin="0,0,0,40"
-                Rows="3">
+                Grid.Row="1" Margin="0,0,0,40" Rows="3">
                 <TextBlock
-                    x:Name="motorName"
-                    Margin="60,0,0,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    FontSize="25"
-                    Foreground="White"
-                    Text="配料搅拌频率:" />
+                    x:Name="motorName" Margin="60,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center"
+                    FontSize="25" Foreground="White" Text="配料搅拌频率:" />
                 <StackPanel
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Orientation="Horizontal">
+                    HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal">
                     <TextBox
-                        x:Name="motorValue"
-                        Width="260"
-                        Height="46"
-                        HorizontalContentAlignment="Center"
-                        VerticalContentAlignment="Center"
-                        FontSize="25"
-                        Foreground="White"
-                        TextAlignment="Center" />
+                        x:Name="motorValue" Width="260" Height="46" HorizontalContentAlignment="Center"
+                        VerticalContentAlignment="Center" FontSize="25" Foreground="White" TextAlignment="Center" />
                     <TextBlock
-                        Margin="20,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontSize="25"
-                        Foreground="White"
-                        Text="％（范围：20-100）" />
+                        Margin="20,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="25"
+                        Foreground="White" Text="％（范围：20-100）" />
                 </StackPanel>
                 <StackPanel
-                    Margin="0,0,50,0"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Center"
-                    Orientation="Horizontal">
+                    Margin="0,0,50,0" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
                     <Button
-                        Width="120"
-                        Height="40"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        Click="hzSet_Click"
-                        Content="确认"
+                        Width="120" Height="40" HorizontalAlignment="Right" VerticalAlignment="Center"
+                        Click="hzSet_Click" Content="确认"
                         Style="{StaticResource ButtonStyle}" />
                     <Button
-                        Width="120"
-                        Height="40"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        Click="hzCancel_Click"
-                        Content="取消"
+                        Width="120" Height="40" HorizontalAlignment="Right" VerticalAlignment="Center"
+                        Click="hzCancel_Click" Content="取消"
                         Style="{StaticResource ButtonStyle}" />
                 </StackPanel>
             </UniformGrid>
diff --git a/BPASmartClient.Academy/View/DeviceMotionView.xaml.cs b/BPASmartClient.Academy/View/DeviceMotionView.xaml.cs
index 4e260717..0a697af7 100644
--- a/BPASmartClient.Academy/View/DeviceMotionView.xaml.cs
+++ b/BPASmartClient.Academy/View/DeviceMotionView.xaml.cs
@@ -74,22 +74,30 @@ namespace BPASmartClient.Academy.View
             {
                 case "反应釜升温":
                     tempName = "反应釜升温";
+                    materialTemp.Visibility = Visibility.Collapsed;
                     wokTemp.Visibility = Visibility.Visible;
+                    wokCooling.Visibility = Visibility.Collapsed;
                     caliTemp.Visibility = Visibility.Collapsed;
                     break;
                 case "配料罐升温":
                     tempName = "配料罐升温";
-                    wokTemp.Visibility = Visibility.Visible;
+                    materialTemp.Visibility = Visibility.Visible;
+                    wokTemp.Visibility = Visibility.Collapsed;
+                    wokCooling.Visibility = Visibility.Collapsed;
                     caliTemp.Visibility = Visibility.Collapsed;
                     break;
                 case "反应釜降温":
                     tempName = "反应釜降温";
-                    wokTemp.Visibility = Visibility.Visible;
+                    materialTemp.Visibility = Visibility.Collapsed;
+                    wokTemp.Visibility = Visibility.Collapsed;
+                    wokCooling.Visibility = Visibility.Visible;
                     caliTemp.Visibility = Visibility.Collapsed;
                     break;
                 case "温度校准":
                     tempName = "温度校准";
+                    materialTemp.Visibility = Visibility.Collapsed;
                     wokTemp.Visibility = Visibility.Collapsed;
+                    wokCooling.Visibility = Visibility.Collapsed;
                     caliTemp.Visibility = Visibility.Visible;
                     break;
                 default:
@@ -169,7 +177,7 @@ namespace BPASmartClient.Academy.View
                 {
                     case "反应釜升温":
                         int tempValue;
-                        suc = int.TryParse(temp_1.Text.ToString(), out tempValue);
+                        suc = int.TryParse(temp_2.Text.ToString(), out tempValue);
                         if (suc)
                         {
                             Simens_PLC.GetInstance.siemens.Write<bool>("DB1.DBX1001.7", true);
@@ -203,7 +211,7 @@ namespace BPASmartClient.Academy.View
                         }
                         break;
                     case "反应釜降温":
-                        suc = int.TryParse(temp_1.Text.ToString(), out tempValue);
+                        suc = int.TryParse(temp_3.Text.ToString(), out tempValue);
                         //int time;
                         //suc = int.TryParse(time_1.Text.ToString(), out time);
                         if (suc)
diff --git a/BPASmartClient.Academy/View/DeviceMotion_2View.xaml b/BPASmartClient.Academy/View/DeviceMotion_2View.xaml
index e6fa6d87..7f43fb1d 100644
--- a/BPASmartClient.Academy/View/DeviceMotion_2View.xaml
+++ b/BPASmartClient.Academy/View/DeviceMotion_2View.xaml
@@ -1138,13 +1138,13 @@
                                 Canvas.Left="785" Canvas.Top="20" Orientation="Vertical">
                                 <RadioButton
                                     Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
-                                    Click="new_Click" Content="加压出料:开" FontSize="8" Foreground="White"
+                                    Click="new_Click" Content="二次闪蒸:开" FontSize="8" Foreground="White"
                                     GroupName="t4"
                                     Style="{StaticResource radiobutton}"
                                     Tag="3" />
                                 <RadioButton
                                     Width="70" Height="20" BorderThickness="0" Click="new_Click"
-                                    Content="加压出料:关" FontSize="8" Foreground="White" GroupName="t4"
+                                    Content="二次闪蒸:关" FontSize="8" Foreground="White" GroupName="t4"
                                     IsChecked="True"
                                     Style="{StaticResource radiobutton}"
                                     Tag="3" />
@@ -1224,7 +1224,7 @@
                                 Grid.Row="2" Margin="20,0,30,10" BorderBrush="#ff2AB2E7" BorderThickness="2">
                                 <UniformGrid Rows="2">
                                     <Grid>
-                                        <WrapPanel x:Name="wokTemp" Margin="0,15,0,0">
+                                        <WrapPanel x:Name="materialTemp" Margin="0,15,0,0">
                                             <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
                                                 <TextBlock
                                                     Margin="40,0,20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
@@ -1238,11 +1238,54 @@
                                                 <RadioButton
                                                     Width="100" Height="30" HorizontalAlignment="Right" VerticalAlignment="Center"
                                                     BorderThickness="0" Click="TempSet_CLick" Content="启动" Foreground="White"
-                                                    GroupName="tempctrl"
                                                     Style="{StaticResource radiobutton}" />
                                                 <RadioButton
                                                     Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
-                                                    Click="TempCLose_CLick" Content="停止" Foreground="White" GroupName="tempctrl"
+                                                    Click="TempCLose_CLick" Content="停止" Foreground="White"
+                                                    IsChecked="True"
+                                                    Style="{StaticResource radiobutton}" />
+                                            </StackPanel>
+                                        </WrapPanel>
+                                        <WrapPanel x:Name="wokTemp" Margin="0,15,0,0" Visibility="Collapsed">
+                                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
+                                                <TextBlock
+                                                    Margin="40,0,20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
+                                                    Foreground="White" Text="设置温度:" />
+                                                <TextBox
+                                                    x:Name="temp_2" Width="120" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                    Text="0" />
+                                                <TextBlock
+                                                    Margin="20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
+                                                    Foreground="White" Text="℃" />
+                                                <RadioButton
+                                                    Width="100" Height="30" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                                    BorderThickness="0" Click="TempSet_CLick" Content="启动" Foreground="White"
+                                                    Style="{StaticResource radiobutton}" />
+                                                <RadioButton
+                                                    Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
+                                                    Click="TempCLose_CLick" Content="停止" Foreground="White"
+                                                    IsChecked="True"
+                                                    Style="{StaticResource radiobutton}" />
+                                            </StackPanel>
+                                        </WrapPanel>
+                                        <WrapPanel x:Name="wokCooling" Margin="0,15,0,0" Visibility="Collapsed">
+                                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
+                                                <TextBlock
+                                                    Margin="40,0,20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
+                                                    Foreground="White" Text="设置温度:" />
+                                                <TextBox
+                                                    x:Name="temp_3" Width="120" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                    Text="0" />
+                                                <TextBlock
+                                                    Margin="20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
+                                                    Foreground="White" Text="℃" />
+                                                <RadioButton
+                                                    Width="100" Height="30" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                                    BorderThickness="0" Click="TempSet_CLick" Content="启动" Foreground="White"
+                                                    Style="{StaticResource radiobutton}" />
+                                                <RadioButton
+                                                    Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
+                                                    Click="TempCLose_CLick" Content="停止" Foreground="White"
                                                     IsChecked="True"
                                                     Style="{StaticResource radiobutton}" />
                                             </StackPanel>
diff --git a/BPASmartClient.Academy/View/DeviceMotion_2View.xaml.cs b/BPASmartClient.Academy/View/DeviceMotion_2View.xaml.cs
index d194ea9a..4e4e3d4a 100644
--- a/BPASmartClient.Academy/View/DeviceMotion_2View.xaml.cs
+++ b/BPASmartClient.Academy/View/DeviceMotion_2View.xaml.cs
@@ -62,22 +62,30 @@ namespace BPASmartClient.Academy.View
             {
                 case "反应釜升温":
                     tempName = "反应釜升温";
+                    materialTemp.Visibility = Visibility.Collapsed;
                     wokTemp.Visibility = Visibility.Visible;
+                    wokCooling.Visibility = Visibility.Collapsed;
                     caliTemp.Visibility = Visibility.Collapsed;
                     break;
                 case "配料罐升温":
                     tempName = "配料罐升温";
-                    wokTemp.Visibility = Visibility.Visible;
+                    materialTemp.Visibility = Visibility.Visible;
+                    wokTemp.Visibility = Visibility.Collapsed;
+                    wokCooling.Visibility = Visibility.Collapsed;
                     caliTemp.Visibility = Visibility.Collapsed;
                     break;
                 case "反应釜降温":
                     tempName = "反应釜降温";
-                    wokTemp.Visibility = Visibility.Visible;
+                    materialTemp.Visibility = Visibility.Collapsed;
+                    wokTemp.Visibility = Visibility.Collapsed;
+                    wokCooling.Visibility = Visibility.Visible;
                     caliTemp.Visibility = Visibility.Collapsed;
                     break;
                 case "温度校准":
                     tempName = "温度校准";
+                    materialTemp.Visibility = Visibility.Collapsed;
                     wokTemp.Visibility = Visibility.Collapsed;
+                    wokCooling.Visibility = Visibility.Collapsed;
                     caliTemp.Visibility = Visibility.Visible;
                     break;
                 default:
@@ -165,7 +173,7 @@ namespace BPASmartClient.Academy.View
                 {
                     case "反应釜升温":
                         int tempValue;
-                        suc = int.TryParse(temp_1.Text.ToString(), out tempValue);
+                        suc = int.TryParse(temp_2.Text.ToString(), out tempValue);
                         if (suc)
                         {
                             Simens_PLC.GetInstance.siemens.Write<bool>("DB1.DBX1001.7", true);
@@ -199,7 +207,7 @@ namespace BPASmartClient.Academy.View
                         }
                         break;
                     case "反应釜降温":
-                        suc = int.TryParse(temp_1.Text.ToString(), out tempValue);
+                        suc = int.TryParse(temp_3.Text.ToString(), out tempValue);
                         //int time;
                         //suc = int.TryParse(time_1.Text.ToString(), out time);
                         if (suc)
diff --git a/BPASmartClient.Academy/View/ReactionKettle50LView.xaml b/BPASmartClient.Academy/View/ReactionKettle50LView.xaml
index 10fbdcdf..23331346 100644
--- a/BPASmartClient.Academy/View/ReactionKettle50LView.xaml
+++ b/BPASmartClient.Academy/View/ReactionKettle50LView.xaml
@@ -510,14 +510,14 @@
                         Panel.ZIndex="99" Orientation="Vertical">
                         <RadioButton
                             Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
-                            Click="open_Click" Content="排热空气阀:开" FontSize="8" Foreground="White"
+                            Click="open_Click" Content="抽真空阀:开" FontSize="8" Foreground="White"
                             Style="{StaticResource radiobutton}"
-                            Tag="排热空气阀" />
+                            Tag="抽真空阀" />
                         <RadioButton
                             Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="排热空气阀:关" FontSize="8" Foreground="White" IsChecked="True"
+                            Content="抽真空阀:关" FontSize="8" Foreground="White" IsChecked="True"
                             Style="{StaticResource radiobutton}"
-                            Tag="排热空气阀" />
+                            Tag="抽真空阀" />
                     </StackPanel>
                     <StackPanel
                         Canvas.Left="660.3" Canvas.Top="149" HorizontalAlignment="Left" VerticalAlignment="Top"
@@ -818,7 +818,7 @@
                         Canvas.Left="618" Canvas.Top="192" Canvas.Right="312.8" HorizontalAlignment="Left"
                         VerticalAlignment="Top" FontSize="12" Foreground="White" Text="热气排空阀"
                         TextAlignment="Center" />
-                    <!--#region 排热空气阀-->
+                    <!--#region 抽真空阀-->
                     <bpa:PipeLineTL
                         Canvas.Left="730" Canvas.Top="290.5" Canvas.Right="260" Width="10"
                         Height="10" HorizontalAlignment="Center" VerticalAlignment="Top" Fill="#E31A1A"
@@ -826,7 +826,7 @@
                     <bpa:PipeLineH
                         Canvas.Left="600.3" Canvas.Top="295.5" Canvas.Right="269.7" Width="130"
                         Height="5" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
-                        Direction="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
+                        Direction="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <bpa:PipeLineTR
@@ -838,7 +838,7 @@
                     <bpa:PipeLineV
                         Canvas.Left="590.8" Canvas.Top="230.7" Canvas.Right="404.2" Width="5"
                         Height="60" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
-                        Direction="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
+                        Direction="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <bpa:HandValve
@@ -848,7 +848,7 @@
                         OpenEnable="{Binding DeviceStatus.ReactOutHotGasValve}" />
                     <TextBlock
                         Canvas.Left="613" Canvas.Top="272" Canvas.Right="384.8" HorizontalAlignment="Left"
-                        VerticalAlignment="Top" FontSize="12" Foreground="White" Text="排热空气阀"
+                        VerticalAlignment="Top" FontSize="12" Foreground="White" Text="抽真空阀"
                         TextAlignment="Center" />
                     <!--#region 反应釜排水阀-->
                     <bpa:PipeLineV