50L界面显示修改

BPASmartClient.Academy/Themes/Generic.xaml

@@ -3,6 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:bpa="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
     xmlns:helper="clr-namespace:BPASmartClient.Academy.Themes"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     >
     <Style x:Key="radiobutton" TargetType="{x:Type RadioButton}">
         <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -105,4 +106,13 @@
         <Setter Property="LineWidth" Value="1" />
         <Setter Property="Speed" Value="1" />
     </Style>
+
+    <Style x:Key="ValveAnnotationTextStyle" TargetType="TextBlock">
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Visibility" Value="Collapsed" />
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="White" />
+        <Setter Property="TextAlignment" Value="Center" />
+    </Style>
 </ResourceDictionary>

BPASmartClient.Academy/View/ReactionKettle50LView.xaml

@@ -258,6 +258,14 @@
                 <Canvas
                     Width="1200" Height="490" MouseLeftButtonDown="Canvas_MouseDown">
                     <!--#region 开关控制按钮-->
+                    <!--#region 压缩空气进气阀-->
+                    <bpa:PipeLineH
+                        Canvas.Left="379" Canvas.Top="415" Canvas.Right="286.9" Width="368"
+                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" d:Direction="1"
+                        Direction="{Binding DeviceStatus.ReactPressureAirInValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
+                        Fill="{Binding DeviceStatus.ReactPressureAirInValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
+                        LineWidth="1" />
+
                     <!--#region 压缩空气进气阀-->
                     <bpa:PipeLineTL
                         Canvas.Left="742" Canvas.Top="384" Canvas.Right="238.3" Width="20"
@@ -331,13 +339,17 @@
                         Canvas.Left="913" Canvas.Top="142" HorizontalAlignment="Center" VerticalAlignment="Top"
                         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"
+                            Width="70" Height="20" Margin="0,0,0,2"
+                            helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactTurnMotor}"
+                            BorderThickness="0" Click="open_Click" Content="旋转电机:开" FontSize="8"
+                            Foreground="White"
                             Style="{StaticResource radiobutton}"
                             Tag="反应釜旋转电机" />
                         <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="旋转电机:关" FontSize="8" Foreground="White" IsChecked="True"
+                            Width="70" Height="20"
+                            helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactTurnMotor, Converter={StaticResource BoolInverterConverter}}"
+                            BorderThickness="0" Click="close_Click" Content="旋转电机:关" FontSize="8"
+                            Foreground="White" IsChecked="True"
                             Style="{StaticResource radiobutton}"
                             Tag="反应釜旋转电机" />
                     </StackPanel>
@@ -345,13 +357,17 @@
                         Canvas.Left="13" Canvas.Top="156" HorizontalAlignment="Center" VerticalAlignment="Top"
                         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"
+                            Width="70" Height="20" Margin="0,0,0,2"
+                            helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetFans}"
+                            BorderThickness="0" Click="open_Click" Content="真空泵:开" FontSize="8"
+                            Foreground="White"
                             Style="{StaticResource radiobutton}"
                             Tag="负压风机" />
                         <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="真空泵:关" FontSize="8" Foreground="White" IsChecked="True"
+                            Width="70" Height="20"
+                            helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetFans, Converter={StaticResource BoolInverterConverter}}"
+                            BorderThickness="0" Click="close_Click" Content="真空泵:关" FontSize="8"
+                            Foreground="White" IsChecked="True"
                             Style="{StaticResource radiobutton}"
                             Tag="负压风机" />
                     </StackPanel>
@@ -359,13 +375,17 @@
                         Canvas.Left="247" Canvas.Top="446" HorizontalAlignment="Left" VerticalAlignment="Top"
                         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"
+                            Width="70" Height="20" Margin="0,0,0,2"
+                            helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetBrinePumpState}"
+                            BorderThickness="0" Click="open_Click" Content="卤水泵:开" FontSize="8"
+                            Foreground="White"
                             Style="{StaticResource radiobutton}"
                             Tag="卤水泵" />
                         <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="卤水泵:关" FontSize="8" Foreground="White" IsChecked="True"
+                            Width="70" Height="20"
+                            helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetBrinePumpState, Converter={StaticResource BoolInverterConverter}}"
+                            BorderThickness="0" Click="close_Click" Content="卤水泵:关" FontSize="8"
+                            Foreground="White" IsChecked="True"
                             Style="{StaticResource radiobutton}"
                             Tag="卤水泵" />
                     </StackPanel>
@@ -387,13 +407,17 @@
                         Canvas.Left="813" Canvas.Top="322" HorizontalAlignment="Left" VerticalAlignment="Center"
                         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"
+                            Width="70" Height="20" Margin="0,0,0,2"
+                            helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactReverse}"
+                            BorderThickness="0" Click="open_Click" Content="反应釜反转:开" FontSize="8"
+                            Foreground="White"
                             Style="{StaticResource radiobutton}"
                             Tag="反应釜反转" />
                         <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="反应釜反转:关" FontSize="8" Foreground="White" IsChecked="True"
+                            Width="70" Height="20"
+                            helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactReverse, Converter={StaticResource BoolInverterConverter}}"
+                            BorderThickness="0" Click="close_Click" Content="反应釜反转:关" FontSize="8"
+                            Foreground="White" IsChecked="True"
                             Style="{StaticResource radiobutton}"
                             Tag="反应釜反转" />
                     </StackPanel>
@@ -496,171 +520,36 @@
                         Canvas.Left="800" Canvas.Top="78" HorizontalAlignment="Left" VerticalAlignment="Top"
                         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"
+                            Width="70" Height="20" Margin="0,0,0,2"
+                            helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactPressureReliefValve}"
+                            BorderThickness="0" Click="open_Click" Content="反应釜泄压阀:开" FontSize="8"
+                            Foreground="White"
                             Style="{StaticResource radiobutton}"
                             Tag="反应釜泄压阀" />
                         <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="反应釜泄压阀:关" FontSize="8" Foreground="White" IsChecked="True"
+                            Width="70" Height="20"
+                            helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactPressureReliefValve, Converter={StaticResource BoolInverterConverter}}"
+                            BorderThickness="0" Click="close_Click" Content="反应釜泄压阀:关" FontSize="8"
+                            Foreground="White" IsChecked="True"
                             Style="{StaticResource radiobutton}"
                             Tag="反应釜泄压阀" />
                     </StackPanel>
-                    <!--  之前抽真空阀叫排热空气阀，后面改了  -->
-                    <StackPanel
-                        Canvas.Left="607" Canvas.Top="230" HorizontalAlignment="Left" VerticalAlignment="Center"
-                        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"
-                            Style="{StaticResource radiobutton}"
-                            Tag="抽真空阀" />
-                        <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="抽真空阀:关" FontSize="8" Foreground="White" IsChecked="True"
-                            Style="{StaticResource radiobutton}"
-                            Tag="抽真空阀" />
-                    </StackPanel>
-                    <StackPanel
-                        Canvas.Left="632" Canvas.Top="149" HorizontalAlignment="Left" VerticalAlignment="Center"
-                        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"
-                            Style="{StaticResource radiobutton}"
-                            Tag="热气排空阀" />
-                        <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="热气排空阀:关" FontSize="8" Foreground="White" IsChecked="True"
-                            Style="{StaticResource radiobutton}"
-                            Tag="热气排空阀" />
-                    </StackPanel>
-                    <StackPanel
-                        Canvas.Left="496" Canvas.Top="99" HorizontalAlignment="Left" VerticalAlignment="Center"
-                        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"
-                            Style="{StaticResource radiobutton}"
-                            Tag="冷凝水进气阀" />
-                        <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="冷凝水进气阀:关" FontSize="8" Foreground="White" IsChecked="True"
-                            Style="{StaticResource radiobutton}"
-                            Tag="冷凝水进气阀" />
-                    </StackPanel>
-                    <StackPanel
-                        Canvas.Left="478" Canvas.Top="251" HorizontalAlignment="Left" VerticalAlignment="Center"
-                        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"
-                            Style="{StaticResource radiobutton}"
-                            Tag="反应釜排水阀" />
-                        <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="反应釜排水阀:关" FontSize="8" Foreground="White" IsChecked="True"
-                            Style="{StaticResource radiobutton}"
-                            Tag="反应釜排水阀" />
-                    </StackPanel>
 
-                    <StackPanel
-                        Canvas.Left="364" Canvas.Top="285" Width="102" HorizontalAlignment="Left"
-                        VerticalAlignment="Center" Panel.ZIndex="99" Orientation="Vertical">
-                        <RadioButton
-                            Width="85" Height="20" Margin="0,0,0,2" BorderThickness="0"
-                            Click="open_Click" Content="反应釜出冷却水阀:开" FontSize="8" Foreground="White"
-                            Style="{StaticResource radiobutton}"
-                            Tag="反应釜出冷却水阀" />
-                        <RadioButton
-                            Width="85" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="反应釜出冷却水阀:关" FontSize="8" Foreground="White" IsChecked="True"
-                            Style="{StaticResource radiobutton}"
-                            Tag="反应釜出冷却水阀" />
-                    </StackPanel>
-                    <StackPanel
-                        Canvas.Left="543" Canvas.Top="370" HorizontalAlignment="Left" VerticalAlignment="Top"
-                        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"
-                            Style="{StaticResource radiobutton}"
-                            Tag="反应釜进清水阀" />
-                        <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="进清水阀:关" FontSize="8" Foreground="White" IsChecked="True"
-                            Style="{StaticResource radiobutton}"
-                            Tag="反应釜进清水阀" />
-                    </StackPanel>
-
-
-                    <StackPanel
-                        Canvas.Left="306" Canvas.Top="378" HorizontalAlignment="Center" VerticalAlignment="Top"
-                        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"
-                            Style="{StaticResource radiobutton}"
-                            Tag="反应釜压缩空气进气阀" />
-                        <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="压缩空气进气阀:关" FontSize="8" Foreground="White" IsChecked="True"
-                            Style="{StaticResource radiobutton}"
-                            Tag="反应釜压缩空气进气阀" />
-                    </StackPanel>
-                    <StackPanel
-                        Canvas.Left="503" Canvas.Top="446" HorizontalAlignment="Left" VerticalAlignment="Center"
-                        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"
-                            Style="{StaticResource radiobutton}"
-                            Tag="反应釜进卤水阀" />
-                        <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="反应釜进卤水阀:关" FontSize="8" Foreground="White" IsChecked="True"
-                            Style="{StaticResource radiobutton}"
-                            Tag="反应釜进卤水阀" />
-                    </StackPanel>
-                    <StackPanel
-                        Canvas.Left="95" Canvas.Top="95" HorizontalAlignment="Center" VerticalAlignment="Top"
-                        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"
-                            Style="{StaticResource radiobutton}"
-                            Tag="冷凝水罐真空阀" />
-                        <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="冷凝水罐真空阀:关" FontSize="8" Foreground="White" IsChecked="True"
-                            Style="{StaticResource radiobutton}"
-                            Tag="冷凝水罐真空阀" />
-                    </StackPanel>
-                    <StackPanel
-                        Canvas.Left="141" Canvas.Top="148" HorizontalAlignment="Center" VerticalAlignment="Top"
-                        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"
-                            Style="{StaticResource radiobutton}"
-                            Tag="冷凝水罐进水阀" />
-                        <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="冷凝水罐进水阀:关" FontSize="8" Foreground="White" IsChecked="True"
-                            Style="{StaticResource radiobutton}"
-                            Tag="冷凝水罐进水阀" />
-                    </StackPanel>
                     <StackPanel
                         Canvas.Left="14" Canvas.Top="249" HorizontalAlignment="Center" VerticalAlignment="Top"
                         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"
+                            Width="70" Height="20" Margin="0,0,0,2"
+                            helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetCompressorRunning}"
+                            BorderThickness="0" Click="open_Click" Content="空压机:开" FontSize="8"
+                            Foreground="White"
                             Style="{StaticResource radiobutton}"
                             Tag="空压机启动" />
                         <RadioButton
-                            Width="70" Height="20" BorderThickness="0" Click="close_Click"
-                            Content="空压机:关" FontSize="8" Foreground="White" IsChecked="True"
+                            Width="70" Height="20"
+                            helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetCompressorRunning, Converter={StaticResource BoolInverterConverter}}"
+                            BorderThickness="0" Click="close_Click" Content="空压机:关" FontSize="8"
+                            Foreground="White" IsChecked="True"
                             Style="{StaticResource radiobutton}"
                             Tag="空压机启动" />
 
@@ -820,21 +709,21 @@
                         Direction="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
-                    <bpa:HandValve
-                        Canvas.Left="603" Canvas.Top="114" Canvas.Right="380.8" Width="32"
-                        Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
+                    <cc:ValveWithCommandState
+                        Canvas.Left="615" Canvas.Top="114" Canvas.Right="380.8" Width="32"
+                        Height="32" HorizontalAlignment="Left" VerticalAlignment="Center"
+                        CommandColor="{Binding DeviceStatus.IsSetColdWaterTankInAirValve, Converter={StaticResource BoolToColorConverter}}"
                         EdgeColor="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ColdWaterTankInAirValve}"
                         Tag="冷凝水进气阀">
-                        <bpa:HandValve.RenderTransform>
+                        <cc:ValveWithCommandState.RenderTransform>
                             <RotateTransform Angle="90" />
-                        </bpa:HandValve.RenderTransform>
-                    </bpa:HandValve>
+                        </cc:ValveWithCommandState.RenderTransform>
+                    </cc:ValveWithCommandState>
                     <TextBlock
-                        Canvas.Left="607" Canvas.Top="68" Canvas.Right="384.8" HorizontalAlignment="Center"
-                        VerticalAlignment="Top" FontSize="12" Foreground="White"
-                        Text="冷&#xA;凝&#xA;水&#xA;罐&#xA;进&#xA;气&#xA;阀"
-                        TextAlignment="Center" />
+                        Canvas.Left="616" Canvas.Top="72" Canvas.Right="384.8" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="冷&#xA;凝&#xA;水&#xA;罐&#xA;进&#xA;气&#xA;阀" />
 
                     <!--#region 热气排空阀-->
                     <bpa:PipeLineH
@@ -843,16 +732,17 @@
                         Direction="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="0.23" />
-                    <bpa:HandValve
-                        Canvas.Left="662" Canvas.Top="207" Canvas.Right="343.4" Width="32"
-                        Height="32" HorizontalAlignment="Left" VerticalAlignment="Center"
+                    <cc:ValveWithCommandState
+                        Canvas.Left="636" Canvas.Top="200" Canvas.Right="343.4" Width="32"
+                        Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        CommandColor="{Binding DeviceStatus.IsSetHotGasEmptyValve, Converter={StaticResource BoolToColorConverter}}"
                         EdgeColor="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.HotGasEmptyValve}"
                         Tag="热气排空阀" />
                     <TextBlock
-                        Canvas.Left="639" Canvas.Top="192" Canvas.Right="312.8" HorizontalAlignment="Left"
-                        VerticalAlignment="Center" FontSize="12" Foreground="White" Text="热气排空阀"
-                        TextAlignment="Center" />
+                        Canvas.Left="639" Canvas.Top="192" Canvas.Right="312.8" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="热气排空阀" />
                     <!--#region 抽真空阀-->
                     <bpa:PipeLineH
                         Canvas.Left="600.3" Canvas.Top="295.5" Canvas.Right="269.7" Width="130"
@@ -872,17 +762,18 @@
                         Direction="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
-                    <bpa:HandValve
-                        Canvas.Left="635.883" Canvas.Top="288.036" Canvas.Right="380.8" Width="32"
+                    <cc:ValveWithCommandState
+                        Canvas.Left="636" Canvas.Top="281" Canvas.Right="380.8" Width="32"
                         Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        CommandColor="{Binding DeviceStatus.IsSetReactOutHotGasValve, Converter={StaticResource BoolToColorConverter}}"
                         EdgeColor="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactOutHotGasValve}"
                         Tag="抽真空阀" />
                     <!--  之前抽真空阀叫排热空气阀，后面改了  -->
                     <TextBlock
-                        Canvas.Left="618" Canvas.Top="272" Canvas.Right="384.8" HorizontalAlignment="Left"
-                        VerticalAlignment="Center" FontSize="12" Foreground="White" Text="抽真空阀"
-                        TextAlignment="Center" />
+                        Canvas.Left="618" Canvas.Top="272" Canvas.Right="384.8" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="抽真空阀" />
                     <!--#region 反应釜排水阀-->
                     <bpa:PipeLineV
                         Canvas.Left="735" Canvas.Top="292" Canvas.Right="260" Width="10"
@@ -902,15 +793,17 @@
                         Direction="{Binding DeviceStatus.ReactDrainValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactDrainValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
-                    <bpa:HandValve
-                        Canvas.Left="514" Canvas.Top="310" Canvas.Right="339" Width="32"
-                        Height="32" HorizontalAlignment="Left" VerticalAlignment="Center"
+                    <cc:ValveWithCommandState
+                        Canvas.Left="514" Canvas.Top="302" Canvas.Right="339" Width="32"
+                        Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        CommandColor="{Binding DeviceStatus.IsSetReactDrainValve, Converter={StaticResource BoolToColorConverter}}"
                         EdgeColor="{Binding DeviceStatus.ReactDrainValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactDrainValve}"
                         Tag="反应釜排水阀" />
                     <TextBlock
-                        Canvas.Left="484" Canvas.Top="297" HorizontalAlignment="Left" VerticalAlignment="Center"
-                        FontSize="12" Foreground="White" Text="反应釜排水阀" TextAlignment="Center" />
+                        Canvas.Left="491" Canvas.Top="290" VerticalAlignment="Top" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="反应釜排水阀" />
                     <!--#region 冷却水、疏水-->
                     <bpa:PipeLineV
                         Canvas.Left="744" Canvas.Top="225" Canvas.Right="250.9" Width="10"
@@ -930,15 +823,17 @@
                         Direction="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=7, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="16" />
-                    <bpa:HandValve
+                    <cc:ValveWithCommandState
                         Canvas.Left="406" Canvas.Top="336" Canvas.Right="360" Width="32"
                         Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        CommandColor="{Binding DeviceStatus.IsSetReactOutColdValve, Converter={StaticResource BoolToColorConverter}}"
                         EdgeColor="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactOutColdValve}"
                         Tag="反应釜出冷却水阀" />
                     <TextBlock
-                        Canvas.Left="378" Canvas.Top="330" HorizontalAlignment="Left" VerticalAlignment="Center"
-                        FontSize="12" Foreground="White" Text="冷却水、疏水" TextAlignment="Center" />
+                        Canvas.Left="388" Canvas.Top="322" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="冷却水、疏水" />
                     <!--#region 进清水阀、进卤水阀、压缩空气进气阀进连接处-->
                     <bpa:PipeLineV
                         Canvas.Left="751.7" Canvas.Top="224.571" Canvas.Right="243.3" Width="10"
@@ -965,15 +860,17 @@
                         Direction="{Binding DeviceStatus.ReactInCleanWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInCleanWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
-                    <bpa:HandValve
+                    <cc:ValveWithCommandState
                         Canvas.Left="646" Canvas.Top="373" Canvas.Right="384" Width="32"
                         Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        CommandColor="{Binding DeviceStatus.ReactInCleanWaterValve, Converter={StaticResource BoolToColorConverter}}"
                         EdgeColor="{Binding DeviceStatus.ReactInCleanWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactInCleanWaterValve}"
                         Tag="反应釜进清水阀" />
                     <TextBlock
-                        Canvas.Left="628" Canvas.Top="362" HorizontalAlignment="Center" VerticalAlignment="Top"
-                        FontSize="12" Foreground="White" Text="进清水阀" TextAlignment="Center" />
+                        Canvas.Left="628" Canvas.Top="362" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="进清水阀" />
                     <bpa:PipeLineV
                         Canvas.Left="751.5" Canvas.Top="385" Canvas.Right="277.3" Width="10"
                         Height="29" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
@@ -999,8 +896,9 @@
                         Fill="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="1" />
                     <TextBlock
-                        Canvas.Left="574" Canvas.Top="447" Canvas.Right="240" HorizontalAlignment="Left"
-                        VerticalAlignment="Center" FontSize="12" Foreground="White" Text="进卤水阀" />
+                        Canvas.Left="574" Canvas.Top="447" Canvas.Right="240" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="进卤水阀" />
                     <bpa:MotorTwo
                         Canvas.Left="244" Canvas.Top="463" Canvas.Right="197.5" Width="25"
                         Height="12" HorizontalAlignment="Center" VerticalAlignment="Top">
@@ -1009,41 +907,20 @@
                         </bpa:MotorTwo.RenderTransform>
                     </bpa:MotorTwo>
                     <TextBlock
-                        Canvas.Left="205" Canvas.Top="465" Canvas.Right="206.5" HorizontalAlignment="Left"
-                        VerticalAlignment="Top" Foreground="White" Text="卤水泵" />
+                        Canvas.Left="205" Canvas.Top="465" Canvas.Right="206.5" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="卤水泵" />
                     <cc:ValveWithCommandState
-                        Canvas.Left="394" Canvas.Top="377" Width="35" Height="24"
-                        HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Canvas.Left="384" Canvas.Top="399"
                         CommandColor="{Binding DeviceStatus.IsSetReactPressureAirInValve, Converter={StaticResource BoolToColorConverter}}"
                         EdgeColor="{Binding DeviceStatus.ReactPressureAirInValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
-                        MouseLeftButtonDown="Canvas_MouseDown"
                         OpenEnable="{Binding DeviceStatus.ReactPressureAirInValve}"
                         Tag="反应釜压缩空气进气阀" />
 
-
-                    <Grid
-                        Canvas.Left="384" Canvas.Top="399" Panel.ZIndex="8" MouseLeftButtonDown="Canvas_MouseDown">
-                        <bpa:HandValve
-                            Canvas.Right="400"
-                            EdgeColor="{Binding DeviceStatus.ReactPressureAirInValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
-                            OpenEnable="{Binding DeviceStatus.ReactPressureAirInValve}"
-                            Style="{StaticResource BaseHandValveStyle}"
-                            Tag="反应釜压缩空气进气阀" />
-                        <TextBlock
-                            d:Foreground="Red"
-                            Foreground="{Binding DeviceStatus.IsSetReactPressureAirInValve, Converter={StaticResource BoolToColorConverter}}"
-                            Style="{StaticResource CommandStateStyle}" />
-                    </Grid>
-                    <bpa:PipeLineH
-                        Canvas.Left="379" Canvas.Top="415" Canvas.Right="286.9" Width="368"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" d:Direction="1"
-                        Direction="{Binding DeviceStatus.ReactPressureAirInValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
-                        Fill="{Binding DeviceStatus.ReactPressureAirInValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
-                        LineWidth="1" />
-
                     <TextBlock
-                        Canvas.Left="350" Canvas.Top="423" HorizontalAlignment="Left" VerticalAlignment="Top"
-                        FontSize="12" Foreground="White" Text="压缩空气进气阀" TextAlignment="Center" />
+                        Canvas.Left="350" Canvas.Top="423" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="压缩空气进气阀" />
 
                     <!--#region 冷却水进水阀-->
                     <bpa:PipeLineV
@@ -1092,8 +969,9 @@
                         EdgeColor="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactInColdValve}" />
                     <TextBlock
-                        Canvas.Left="640" Canvas.Top="30" HorizontalAlignment="Left" VerticalAlignment="Center"
-                        FontSize="12" Foreground="White" Text="冷却水进水阀" TextAlignment="Center" />
+                        Canvas.Left="640" Canvas.Top="30" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="冷却水进水阀" />
 
                     <!--#region 风机-->
                     <bpa:PipeLineBL
@@ -1124,17 +1002,20 @@
                         VerticalAlignment="Top" FontSize="12" Foreground="White" Text="空压机启动反馈"
                         TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="38" Canvas.Top="138" HorizontalAlignment="Center" VerticalAlignment="Top"
-                        Foreground="White" Text="真空泵" />
-                    <bpa:HandValve
+                        Canvas.Left="30" Canvas.Top="136" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="真空泵" />
+                    <cc:ValveWithCommandState
                         Canvas.Left="122" Canvas.Top="54" Canvas.Right="343.4" Width="32"
                         Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        CommandColor="{Binding DeviceStatus.IsSetColdWaterTankVacuumValve, Converter={StaticResource BoolToColorConverter}}"
                         EdgeColor="{Binding DeviceStatus.ColdWaterTankVacuumValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ColdWaterTankVacuumValve}"
                         Tag="冷凝水罐真空阀" />
                     <TextBlock
-                        Canvas.Left="93" Canvas.Top="80" HorizontalAlignment="Left" VerticalAlignment="Center"
-                        FontSize="12" Foreground="White" Text="冷凝水管负压阀" TextAlignment="Center" />
+                        Canvas.Left="93" Canvas.Top="83" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="冷凝水管负压阀" />
                     <bpa:PipeLineH
                         Canvas.Left="437" Canvas.Top="22" Canvas.Right="260.7" Width="303"
                         Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
@@ -1147,16 +1028,18 @@
                         EdgeColor="{Binding DeviceStatus.ReactInSteamValue, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactInSteamValue}" />
                     <TextBlock
-                        Canvas.Left="336" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="12"
-                        Foreground="White" Text="蒸汽比例阀" TextAlignment="Center" />
+                        Canvas.Left="336" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="蒸汽比例阀" />
                     <bpa:HandValve
                         Canvas.Left="427" Canvas.Top="7" Width="32" Height="32"
                         HorizontalAlignment="Center" VerticalAlignment="Top"
                         EdgeColor="{Binding DeviceStatus.ReactInSteamValue, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactInSteamValue}" />
                     <TextBlock
-                        Canvas.Left="417" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="12"
-                        Foreground="White" Text="蒸汽阀" TextAlignment="Center" />
+                        Canvas.Left="417" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="蒸汽阀" />
                     <bpa:PipeLineBL
                         Canvas.Left="739.1" Canvas.Top="21.963" Canvas.Right="250.9" Width="20"
                         Height="20" HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -1182,19 +1065,20 @@
                         Fill="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         LineWidth="6" Speed="1.5" />
                     <TextBlock
-                        Canvas.Left="798" Canvas.Top="120" Canvas.Right="312.8" HorizontalAlignment="Left"
-                        VerticalAlignment="Center" FontSize="12" Foreground="White" Text="反应釜泄压阀"
-                        TextAlignment="Center" />
-                    <bpa:HandValve
+                        Canvas.Left="798" Canvas.Top="120" Canvas.Right="312.8" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="反应釜泄压阀" />
+                    <cc:ValveWithCommandState
                         Canvas.Left="226" Canvas.Top="175" Canvas.Right="343.4" Width="32"
                         Height="32" HorizontalAlignment="Left" VerticalAlignment="Center"
+                        CommandColor="{Binding DeviceStatus.IsSetColdWaterTankInWaterValve, Converter={StaticResource BoolToColorConverter}}"
                         EdgeColor="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ColdWaterTankInWaterValve}"
                         Tag="冷凝水罐进水阀">
-                        <bpa:HandValve.RenderTransform>
+                        <cc:ValveWithCommandState.RenderTransform>
                             <RotateTransform Angle="270" />
-                        </bpa:HandValve.RenderTransform>
-                    </bpa:HandValve>
+                        </cc:ValveWithCommandState.RenderTransform>
+                    </cc:ValveWithCommandState>
                     <bpa:PipeLineH
                         Canvas.Left="603" Canvas.Top="438" Canvas.Right="257.5" Width="144"
                         Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" d:Direction="1"
@@ -1202,18 +1086,16 @@
                         Fill="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="10" />
                     <TextBlock
-                        Canvas.Left="255" Canvas.Top="92" Canvas.Right="312.8" HorizontalAlignment="Center"
-                        VerticalAlignment="Top" FontSize="12" Foreground="White"
-                        Text="冷&#xA;凝&#xA;水&#xA;罐&#xA;进&#xA;水&#xA;阀"
-                        TextAlignment="Center" />
-                    <bpa:HandValve
+                        Canvas.Left="255" Canvas.Top="92" Canvas.Right="312.8" d:Visibility="Visible"
+                        Style="{StaticResource ValveAnnotationTextStyle}"
+                        Text="冷&#xA;凝&#xA;水&#xA;罐&#xA;进&#xA;水&#xA;阀" />
+                    <cc:ValveWithCommandState
                         Canvas.Left="587" Canvas.Top="423" Canvas.Right="253.9" Width="32"
                         Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        CommandColor="{Binding DeviceStatus.IsSetReactInBrineWaterValve, Converter={StaticResource BoolToColorConverter}}"
                         EdgeColor="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactInBrineWaterValve}"
-                        Tag="反应釜进卤水阀">
-
-                    </bpa:HandValve>
+                        Tag="反应釜进卤水阀" />
                     <TextBlock
                         Canvas.Left="85" Canvas.Top="410" HorizontalAlignment="Center" VerticalAlignment="Top"
                         FontSize="12" Foreground="White" Text="卤水配制罐" />
@@ -1248,7 +1130,7 @@
                     </GroupBox>
                     <!--#region 联动按钮-->
                     <GroupBox
-                        Canvas.Left="1037" Canvas.Top="51" HorizontalAlignment="Left" VerticalAlignment="Top"
+                        Canvas.Left="1057" Canvas.Top="51" HorizontalAlignment="Left" VerticalAlignment="Center"
                         Foreground="White" Header="联动按钮">
                         <StackPanel>
                             <!--#region 排水启动-->
@@ -1270,11 +1152,6 @@
                                         Style="{StaticResource radiobutton}"
                                         Tag="排水启动" />
                                 </StackPanel>
-                                <TextBlock
-                                    Height="20" Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    d:Foreground="Red" FontSize="16"
-                                    Foreground="{Binding DeviceStatus.IsSetStartEmptyWater, Converter={StaticResource BoolToColorConverter}}"
-                                    Text="⬛" TextAlignment="Center" />
                             </StackPanel>
                             <!--#endregion-->
                             <!--#region 清洗启动-->
@@ -1296,11 +1173,6 @@
                                         Style="{StaticResource radiobutton}"
                                         Tag="清洗启动按钮" />
                                 </StackPanel>
-                                <TextBlock
-                                    Height="20" Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    d:Foreground="Red" FontSize="16"
-                                    Foreground="{Binding DeviceStatus.IsSetStartClean, Converter={StaticResource BoolToColorConverter}}"
-                                    Text="⬛" TextAlignment="Center" />
                             </StackPanel>
                             <!--#endregion-->
                             <!--#region 真空蒸馏-->
@@ -1322,11 +1194,6 @@
                                         Style="{StaticResource radiobutton}"
                                         Tag="真空蒸馏" />
                                 </StackPanel>
-                                <TextBlock
-                                    Height="20" Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    d:Foreground="Red" FontSize="16"
-                                    Foreground="{Binding DeviceStatus.IsSetVacuumDistill, Converter={StaticResource BoolToColorConverter}}"
-                                    Text="⬛" TextAlignment="Center" />
                             </StackPanel>
                             <!--#endregion-->
                             <!--#region 反应釜回原点-->
@@ -1334,23 +1201,20 @@
                                 <StackPanel
                                     HorizontalAlignment="Center" VerticalAlignment="Center" Panel.ZIndex="99" Orientation="Vertical">
                                     <RadioButton
-                                        Width="90" Height="20" Margin="0,0,0,2" BorderThickness="0"
-                                        Click="open_Click" Content="反应釜回原点:开" FontSize="8" Foreground="White"
-                                        Style="{StaticResource radiobutton}"
+                                        Width="90" Height="20" Margin="0,0,0,2"
                                         helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactHomeBit}"
+                                        BorderThickness="0" Click="open_Click" Content="反应釜回原点:开" FontSize="8"
+                                        Foreground="White"
+                                        Style="{StaticResource radiobutton}"
                                         Tag="反应釜回原点" />
                                     <RadioButton
-                                        Width="90" Height="20" BorderThickness="0" Click="close_Click"
-                                        Content="反应釜回原点:关" FontSize="8" Foreground="White" IsChecked="True"
-                                        Style="{StaticResource radiobutton}"
+                                        Width="90" Height="20"
                                         helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactHomeBit, Converter={StaticResource BoolInverterConverter}}"
+                                        BorderThickness="0" Click="close_Click" Content="反应釜回原点:关" FontSize="8"
+                                        Foreground="White" IsChecked="True"
+                                        Style="{StaticResource radiobutton}"
                                         Tag="反应釜回原点" />
                                 </StackPanel>
-                                <TextBlock
-                                    Height="20" Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    d:Foreground="Red" FontSize="16"
-                                    Foreground="{Binding DeviceStatus.IsSetReactHomeBit, Converter={StaticResource BoolToColorConverter}}"
-                                    Text="⬛" TextAlignment="Center" />
                             </StackPanel>
                             <!--#endregion-->
                             <!--#region 反应釜去加料位-->
@@ -1358,23 +1222,20 @@
                                 <StackPanel
                                     HorizontalAlignment="Center" VerticalAlignment="Center" Panel.ZIndex="99" Orientation="Vertical">
                                     <RadioButton
-                                        Width="90" Height="20" Margin="0,0,0,2" BorderThickness="0"
-                                        Click="open_Click" Content="反应釜去加料位:开" FontSize="8" Foreground="White"
+                                        Width="90" Height="20" Margin="0,0,0,2"
                                         helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetGoAddPosition}"
+                                        BorderThickness="0" Click="open_Click" Content="反应釜去加料位:开" FontSize="8"
+                                        Foreground="White"
                                         Style="{StaticResource radiobutton}"
                                         Tag="去加料位" />
                                     <RadioButton
-                                        Width="90" Height="20" BorderThickness="0" Click="close_Click"
-                                        Content="反应釜去加料位:关" FontSize="8" Foreground="White" IsChecked="True"
+                                        Width="90" Height="20"
                                         helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetGoAddPosition, Converter={StaticResource BoolInverterConverter}}"
+                                        BorderThickness="0" Click="close_Click" Content="反应釜去加料位:关" FontSize="8"
+                                        Foreground="White" IsChecked="True"
                                         Style="{StaticResource radiobutton}"
                                         Tag="去加料位" />
                                 </StackPanel>
-                                <TextBlock
-                                    Height="20" Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    d:Foreground="Red" FontSize="16"
-                                    Foreground="{Binding DeviceStatus.IsSetGoAddPosition, Converter={StaticResource BoolToColorConverter}}"
-                                    Text="⬛" TextAlignment="Center" />
                             </StackPanel>
                             <!--#endregion-->
                             <!--#region 反应釜去倒料位-->
@@ -1382,54 +1243,42 @@
                                 <StackPanel
                                     HorizontalAlignment="Center" VerticalAlignment="Center" Panel.ZIndex="99" Orientation="Vertical">
                                     <RadioButton
-                                        Width="90" Height="20" Margin="0,0,0,2" BorderThickness="0"
-                                        Click="open_Click" Content="反应釜去倒料位:开" FontSize="8" Foreground="White"
-                                        Style="{StaticResource radiobutton}"
+                                        Width="90" Height="20" Margin="0,0,0,2"
                                         helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactOut}"
+                                        BorderThickness="0" Click="open_Click" Content="反应釜去倒料位:开" FontSize="8"
+                                        Foreground="White"
+                                        Style="{StaticResource radiobutton}"
                                         Tag="反应釜去倒料位" />
                                     <RadioButton
-                                        Width="90" Height="20" BorderThickness="0" Click="close_Click"
-                                        Content="反应釜去倒料位:关" FontSize="8" Foreground="White" IsChecked="True"
-                                        Style="{StaticResource radiobutton}"
+                                        Width="90" Height="20"
                                         helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactOut, Converter={StaticResource BoolInverterConverter}}"
+                                        BorderThickness="0" Click="close_Click" Content="反应釜去倒料位:关" FontSize="8"
+                                        Foreground="White" IsChecked="True"
+                                        Style="{StaticResource radiobutton}"
                                         Tag="反应釜去倒料位" />
                                 </StackPanel>
-                                <TextBlock
-                                    Height="20" Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    d:Foreground="Red" FontSize="16"
-                                    Foreground="{Binding DeviceStatus.IsSetReactOut, Converter={StaticResource BoolToColorConverter}}"
-                                    Text="⬛" TextAlignment="Center" />
                             </StackPanel>
                             <!--#endregion-->
                             <!--#region 进卤水启动-->
-                            <StackPanel
-                                Width="127" Margin="10,5,0,5" Orientation="Horizontal">
+                            <StackPanel Margin="10,5,0,5" Orientation="Horizontal">
                                 <StackPanel
-                                    HorizontalAlignment="Center" VerticalAlignment="Center" Panel.ZIndex="99" Orientation="Vertical">
+                                    Width="100" HorizontalAlignment="Center" VerticalAlignment="Center" Panel.ZIndex="99"
+                                    Orientation="Vertical">
                                     <RadioButton
-                                        Width="90" Height="20" Margin="0,0,0,2" BorderThickness="0"
-                                        Click="open_Click" Content="进卤水启动:开" FontSize="8" Foreground="White"
+                                        Width="90" Height="20" Margin="0,0,0,2"
                                         helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetStartEnterBrine}"
+                                        BorderThickness="0" Click="open_Click" Content="进卤水启动:开" FontSize="8"
+                                        Foreground="White"
                                         Style="{StaticResource radiobutton}"
                                         Tag="进卤水启动" />
                                     <RadioButton
-                                        Width="90" Height="20" BorderThickness="0" Click="close_Click"
-                                        Content="进卤水启动:关" FontSize="8" Foreground="White" IsChecked="True"
+                                        Width="90" Height="20"
                                         helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetStartEnterBrine, Converter={StaticResource BoolInverterConverter}}"
+                                        BorderThickness="0" Click="close_Click" Content="进卤水启动:关" FontSize="8"
+                                        Foreground="White" IsChecked="True"
                                         Style="{StaticResource radiobutton}"
                                         Tag="进卤水启动" />
                                 </StackPanel>
-                                <!--<Button
-                                    Width="90" Height="20" Panel.ZIndex="99" Click="open_Click"
-                                    Content="进卤水启动" FontSize="12" Foreground="White"
-                                    Style="{StaticResource ButtonStyle}"
-                                    Tag="进卤水启动" />-->
-                                <TextBlock
-                                    Height="20" Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    d:Foreground="Red" FontSize="16"
-                                    Foreground="{Binding DeviceStatus.IsSetStartEnterBrine, Converter={StaticResource BoolToColorConverter}}"
-                                    Text="⬛" TextAlignment="Center" />
-
                             </StackPanel>
                         </StackPanel>
                         <!--#endregion-->
@@ -1441,64 +1290,12 @@
                         Direction="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
-                    <TextBlock
-                        Canvas.Left="85" Canvas.Top="166" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetFans, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
-                    <TextBlock
-                        Canvas.Left="85" Canvas.Top="260" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetCompressorRunning, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
-                    <TextBlock
-                        Canvas.Left="170" Canvas.Top="106" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetColdWaterTankVacuumValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
-                    <TextBlock
-                        Canvas.Left="214" Canvas.Top="158" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetColdWaterTankInWaterValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
-                    <TextBlock
-                        Canvas.Left="569" Canvas.Top="110" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetColdWaterTankInAirValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
-                    <TextBlock
-                        Canvas.Left="705" Canvas.Top="159" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetHotGasEmptyValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
-                    <TextBlock
-                        Canvas.Left="680" Canvas.Top="240" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetReactOutHotGasValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
-
-                    <TextBlock
-                        Canvas.Left="550" Canvas.Top="262" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetReactDrainValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
-                    <TextBlock
-                        Canvas.Left="460" Canvas.Top="295" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetReactOutColdValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="251" Canvas.Top="282" Canvas.Right="384.8" Height="20"
                         HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetBrineTankZero, Converter={StaticResource BoolToColorConverter}}"
                         Text="⬛" TextAlignment="Center" />
 
-
-                    <TextBlock
-                        Canvas.Left="618" Canvas.Top="379" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetReactInCleanWaterValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="318" Canvas.Top="455" Canvas.Right="384.8" Height="20"
                         HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
@@ -1509,12 +1306,6 @@
                         HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetBrineTankZero, Converter={StaticResource BoolToColorConverter}}"
                         Text="⬛" TextAlignment="Center" />
-                    <TextBlock
-                        Canvas.Left="588" Canvas.Top="460" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetReactInBrineWaterValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
-
                     <TextBlock
                         Canvas.Left="844" Canvas.Top="392" Canvas.Right="384.8" Height="20"
                         HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
@@ -1535,27 +1326,13 @@
                         HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactHomeBit, Converter={StaticResource BoolToColorConverter}}"
                         Text="⬛" TextAlignment="Center" Visibility="Collapsed" />
-                    <TextBlock
-                        Canvas.Left="887" Canvas.Top="332" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetReactReverse, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
+
                     <TextBlock
                         Canvas.Left="996" Canvas.Top="264" Canvas.Right="384.8" Height="20"
                         HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactTurnMotorJogging, Converter={StaticResource BoolToColorConverter}}"
                         Text="⬛" TextAlignment="Center" />
-                    <TextBlock
-                        Canvas.Left="989" Canvas.Top="152" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetReactTurnMotor, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
 
-                    <TextBlock
-                        Canvas.Left="878" Canvas.Top="88" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetReactPressureReliefValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⬛" TextAlignment="Center" />
                     <bpa:PipeLineTL
                         Canvas.Left="730" Canvas.Top="290.5" Canvas.Right="260" Width="20"
                         Height="20" HorizontalAlignment="Center" VerticalAlignment="Top"
@@ -1627,23 +1404,17 @@
                                     Foreground="White" Text="℃" />
                                 <RadioButton
                                     Width="100" Height="30" HorizontalAlignment="Right" VerticalAlignment="Center"
-                                    BorderThickness="0" Click="TempSet_CLick" Content="启动" Foreground="White"
                                     helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactHeat}"
+                                    BorderThickness="0" Click="TempSet_CLick" Content="启动" Foreground="White"
                                     Style="{StaticResource radiobutton}"
                                     Tag="反应釜升温" />
                                 <RadioButton
-                                    Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
-                                    Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
+                                    Width="100" Height="30" Margin="40,0,0,0"
+                                    helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactHeat, Converter={StaticResource BoolInverterConverter}}"
+                                    BorderThickness="0" Click="TempCLose_CLick" Content="停止" Foreground="White"
+                                    IsChecked="True"
                                     Style="{StaticResource radiobutton}"
-                                    helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactHeat,Converter={StaticResource BoolInverterConverter}}"
                                     Tag="反应釜升温" />
-                                <TextBlock
-                                    Margin="15,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
-                                    Text="当前状态：" TextAlignment="Center" />
-                                <TextBlock
-                                    HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="20"
-                                    Foreground="{Binding DeviceStatus.IsSetReactHeat, Converter={StaticResource BoolToColorConverter}}"
-                                    Text="⬛" TextAlignment="Center" />
                             </StackPanel>
                         </WrapPanel>
                         <!--#endregion-->
@@ -1663,23 +1434,17 @@
                                     Foreground="White" Text="℃" />
                                 <RadioButton
                                     Width="100" Height="30" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                    helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactCool}"
                                     BorderThickness="0" Click="TempSet_CLick" Content="启动" Foreground="White"
                                     Style="{StaticResource radiobutton}"
-                                    helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactCool}"
                                     Tag="反应釜降温" />
                                 <RadioButton
-                                    Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
-                                    Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
+                                    Width="100" Height="30" Margin="40,0,0,0"
+                                    helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactCool, Converter={StaticResource BoolInverterConverter}}"
+                                    BorderThickness="0" Click="TempCLose_CLick" Content="停止" Foreground="White"
+                                    IsChecked="True"
                                     Style="{StaticResource radiobutton}"
-                                    helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetReactCool,Converter={StaticResource BoolInverterConverter}}"
                                     Tag="反应釜降温" />
-                                <TextBlock
-                                    Margin="15,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
-                                    Text="当前状态：" TextAlignment="Center" />
-                                <TextBlock
-                                    HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="20"
-                                    Foreground="{Binding DeviceStatus.IsSetReactCool, Converter={StaticResource BoolToColorConverter}}"
-                                    Text="⬛" TextAlignment="Center" />
                             </StackPanel>
                         </WrapPanel>
                         <!--#endregion-->
@@ -1699,23 +1464,17 @@
                                     Foreground="White" Text="℃" />
                                 <RadioButton
                                     Width="100" Height="30" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                    helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetCWTCool}"
                                     BorderThickness="0" Click="TempSet_CLick" Content="启动" Foreground="White"
                                     Style="{StaticResource radiobutton}"
-                                    helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetCWTCool}"
                                     Tag="冷凝水罐降温" />
                                 <RadioButton
-                                    Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
-                                    Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
+                                    Width="100" Height="30" Margin="40,0,0,0"
+                                    helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetCWTCool, Converter={StaticResource BoolInverterConverter}}"
+                                    BorderThickness="0" Click="TempCLose_CLick" Content="停止" Foreground="White"
+                                    IsChecked="True"
                                     Style="{StaticResource radiobutton}"
-                                    helper:RadioButtonHelper.ExecuteState="{Binding DeviceStatus.IsSetCWTCool,Converter={StaticResource BoolInverterConverter}}"
                                     Tag="冷凝水罐降温" />
-                                <TextBlock
-                                    Margin="15,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"
-                                    Text="当前状态：" TextAlignment="Center" />
-                                <TextBlock
-                                    HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="20"
-                                    Foreground="{Binding DeviceStatus.IsSetCWTCool, Converter={StaticResource BoolToColorConverter}}"
-                                    Text="⬛" TextAlignment="Center" />
                             </StackPanel>
                         </WrapPanel>
                         <!--#endregion-->