From 598b052daeb30f3608bdce46806b9a4e1c44c0cd Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Fri, 22 Nov 2024 11:19:14 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=8F=8D=E5=BA=94=E9=87=9C=E9=A1=B9=E7=9B=AE=E4=B8=93?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=8E=A7=E4=BB=B6=EF=BC=8C=E5=B9=B6=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E4=BA=86=E4=B8=8B=E8=83=BD=E4=B8=8D=E8=83=BD=E7=94=A8?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomControls/ValveWithCommandState.xaml |  37 +++
 .../ValveWithCommandState.xaml.cs             |  70 +++++
 .../View/ReactionKettle50LView.xaml           | 260 +++++++++++-------
 3 files changed, 273 insertions(+), 94 deletions(-)
 create mode 100644 BPASmartClient.Academy/CustomControls/ValveWithCommandState.xaml
 create mode 100644 BPASmartClient.Academy/CustomControls/ValveWithCommandState.xaml.cs

diff --git a/BPASmartClient.Academy/CustomControls/ValveWithCommandState.xaml b/BPASmartClient.Academy/CustomControls/ValveWithCommandState.xaml
new file mode 100644
index 00000000..014010d0
--- /dev/null
+++ b/BPASmartClient.Academy/CustomControls/ValveWithCommandState.xaml
@@ -0,0 +1,37 @@
+<UserControl
+    x:Class="BPASmartClient.Academy.CustomControls.ValveWithCommandState"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:bpa="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.Academy.CustomControls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="32"
+    d:DesignWidth="32" mc:Ignorable="d">
+    <UserControl.Resources>
+        <Style x:Key="BaseHandValveStyle" TargetType="bpa:HandValve">
+            <Setter Property="Width" Value="32" />
+            <Setter Property="Height" Value="32" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style x:Key="CommandStateStyle" TargetType="TextBlock">
+            <Setter Property="Height" Value="16" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="Margin" Value="0,3,6,0" />
+            <Setter Property="TextAlignment" Value="Center" />
+            <Setter Property="Text" Value="⬛" />
+        </Style>
+    </UserControl.Resources>
+    <Grid>
+        <bpa:HandValve
+            EdgeColor="{Binding Path=EdgeColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ValveWithCommandState}}}"
+            OpenEnable="{Binding Path=OpenEnable, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ValveWithCommandState}}}"
+            Style="{StaticResource BaseHandValveStyle}" />
+        <TextBlock
+            d:Foreground="Red"
+            Foreground="{Binding Path=CommandColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:ValveWithCommandState}}}"
+            Style="{StaticResource CommandStateStyle}" />
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.Academy/CustomControls/ValveWithCommandState.xaml.cs b/BPASmartClient.Academy/CustomControls/ValveWithCommandState.xaml.cs
new file mode 100644
index 00000000..3ca8b70d
--- /dev/null
+++ b/BPASmartClient.Academy/CustomControls/ValveWithCommandState.xaml.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.Academy.CustomControls
+{
+    /// <summary>
+    /// ValveWithCommandState.xaml 的交互逻辑
+    /// </summary>
+    public partial class ValveWithCommandState : UserControl
+    {
+        public ValveWithCommandState()
+        {
+            InitializeComponent();
+        }
+
+
+
+        public bool OpenEnable
+        {
+            get { return (bool)GetValue(OpenEnableProperty); }
+            set { SetValue(OpenEnableProperty, value); }
+        }
+        /// <summary>
+        /// 阀门开关状态
+        /// </summary>
+        public static readonly DependencyProperty OpenEnableProperty =
+            DependencyProperty.Register("OpenEnable", typeof(bool), typeof(ValveWithCommandState), new PropertyMetadata(false));
+
+
+
+        public Color EdgeColor
+        {
+            get { return (Color)GetValue(EdgeColorProperty); }
+            set { SetValue(EdgeColorProperty, value); }
+        }
+        /// <summary>
+        /// 阀门颜色
+        /// </summary>
+        public static readonly DependencyProperty EdgeColorProperty =
+            DependencyProperty.Register("EdgeColor", typeof(Color), typeof(ValveWithCommandState), new PropertyMetadata(Color.FromArgb(byte.MaxValue, 91, 92, 95)));
+
+
+
+
+
+        public Brush CommandColor
+        {
+            get { return (Brush)GetValue(CommandColorProperty); }
+            set { SetValue(CommandColorProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for CommandColor.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty CommandColorProperty =
+            DependencyProperty.Register("CommandColor", typeof(Brush), typeof(ValveWithCommandState), new PropertyMetadata(Brushes.Red));
+
+
+    }
+}
diff --git a/BPASmartClient.Academy/View/ReactionKettle50LView.xaml b/BPASmartClient.Academy/View/ReactionKettle50LView.xaml
index de78762a..21bca591 100644
--- a/BPASmartClient.Academy/View/ReactionKettle50LView.xaml
+++ b/BPASmartClient.Academy/View/ReactionKettle50LView.xaml
@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:bpa="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:cc="clr-namespace:BPASmartClient.Academy.CustomControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:local="clr-namespace:BPASmartClient.Academy.View"
@@ -140,7 +141,7 @@
                                                 <PathFigureCollection>
                                                     <PathFigure StartPoint="20,8">
                                                         <LineSegment Point="30,8" />
-                                                        <LineSegment Point="30,10" />
+                                                        <LineSegment Point="30,12" />
                                                         <LineSegment Point="26.7,10" />
                                                         <BezierSegment
                                                             Point1="26.7,10" Point2="24,8" Point3="20,8" />
@@ -239,7 +240,67 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <Style x:Key="NotchedSigalInArrow" TargetType="TextBlock" />
+        <Style x:Key="BaseHandValveStyle" TargetType="bpa:HandValve">
+            <Setter Property="Width" Value="32" />
+            <Setter Property="Height" Value="32" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style x:Key="CommandStateStyle" TargetType="TextBlock">
+            <Setter Property="Height" Value="20" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="16" />
+            <Setter Property="Margin" Value="0,8,6,0" />
+            <Setter Property="TextAlignment" Value="Center" />
+            <Setter Property="Text" Value="⬛" />
+        </Style>
+        <Style x:Key="BasePipeLineHStyle" TargetType="bpa:PipeLineH">
+            <Setter Property="Height" Value="10" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="LineWidth" Value="1" />
+            <Setter Property="Speed" Value="1" />
+        </Style>
+        <Style x:Key="BasePipeLineVStyle" TargetType="bpa:PipeLineV">
+            <Setter Property="Width" Value="10" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="LineWidth" Value="1" />
+            <Setter Property="Speed" Value="1" />
+        </Style>
+        <Style x:Key="BasePipeLineBLStyle" TargetType="bpa:PipeLineBL">
+            <Setter Property="Width" Value="20" />
+            <Setter Property="Height" Value="20" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="LineWidth" Value="1" />
+            <Setter Property="Speed" Value="1" />
+        </Style>
+        <Style x:Key="BasePipeLineBRStyle" TargetType="bpa:PipeLineBR">
+            <Setter Property="Width" Value="20" />
+            <Setter Property="Height" Value="20" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="LineWidth" Value="1" />
+            <Setter Property="Speed" Value="1" />
+        </Style>
+        <Style x:Key="BasePipeLineTRStyle" TargetType="bpa:PipeLineTR">
+            <Setter Property="Width" Value="20" />
+            <Setter Property="Height" Value="20" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="LineWidth" Value="1" />
+            <Setter Property="Speed" Value="1" />
+        </Style>
+        <Style x:Key="BasePipeLineTLStyle" TargetType="bpa:PipeLineTL">
+            <Setter Property="Width" Value="20" />
+            <Setter Property="Height" Value="20" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="LineWidth" Value="1" />
+            <Setter Property="Speed" Value="1" />
+        </Style>
     </UserControl.Resources>
     <Grid>
         <!--#region 设备未连接时的遮罩-->
@@ -299,20 +360,20 @@
                     <!--#region 压缩空气进气阀-->
                     <bpa:PipeLineTL
                         Canvas.Left="742" Canvas.Top="384" Canvas.Right="238.3" Width="20"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
+                        Height="20" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
                         Direction="{Binding DeviceStatus.ReactInCleanWaterValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInCleanWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
                     <!--#region 压缩空气进气阀-->
                     <bpa:PipeLineTL
-                        Canvas.Left="746.5" Canvas.Top="410" Canvas.Right="277.3" Width="10"
-                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
+                        Canvas.Left="746.5" Canvas.Top="410" Canvas.Right="277.3" Width="20"
+                        Height="20" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
                         Direction="{Binding DeviceStatus.ReactPressureAirInValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactPressureAirInValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
                     <!--#region 开关控制按钮-->
                     <bpa:PipeLineV
-                        Canvas.Left="744" Canvas.Top="31" Canvas.Right="250.9" Width="5"
+                        Canvas.Left="744" Canvas.Top="31" Canvas.Right="250.9" Width="10"
                         Height="30" HorizontalAlignment="Center" VerticalAlignment="Center"
                         Direction="{Binding DeviceStatus.ReactInSteamValue, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInSteamValue, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
@@ -320,18 +381,18 @@
                     <!--#region 开关控制按钮-->
                     <bpa:PipeLineH
                         Canvas.Left="332" Canvas.Top="22" Canvas.Right="260.7" Width="100"
-                        Height="5" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
+                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
                         Direction="{Binding DeviceStatus.ReactInSteamValue, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInSteamValue, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="25" />
                     <bpa:PipeLineV
-                        Canvas.Left="242" Canvas.Top="59" Width="5" Height="140"
+                        Canvas.Left="242" Canvas.Top="59" Width="10" Height="140"
                         HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
                         Direction="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" RenderTransformOrigin="0.5,0.5" />
                     <bpa:PipeLineH
-                        Canvas.Left="133" Canvas.Top="69" Width="152" Height="5"
+                        Canvas.Left="133" Canvas.Top="69" Width="152" Height="10"
                         HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
                         Direction="{Binding DeviceStatus.ColdWaterTankVacuumValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankVacuumValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
@@ -339,28 +400,28 @@
                     <!--#region 开关控制按钮-->
                     <bpa:PipeLineH
                         Canvas.Left="115" Canvas.Top="456" Canvas.Right="257.5" Width="95"
-                        Height="5" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
+                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
                         Direction="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="10" />
                     <!--#region 开关控制按钮-->
                     <bpa:PipeLineBR
-                        Canvas.Left="216" Canvas.Top="438" Canvas.Right="272.3" Width="11"
-                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
+                        Canvas.Left="216" Canvas.Top="438" Canvas.Right="272.3" Width="20"
+                        Height="20" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
                         Direction="{Binding DeviceStatus.BrinePumpState, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.BrinePumpState, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
                     <!--#region 开关控制按钮-->
                     <bpa:PipeLineH
                         Canvas.Left="226" Canvas.Top="438" Canvas.Right="257.5" Width="366"
-                        Height="5" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
+                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
                         Direction="{Binding DeviceStatus.BrinePumpState, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.BrinePumpState, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="10" />
                     <!--#region 开关控制按钮-->
                     <bpa:PipeLineTL
-                        Canvas.Left="746.5" Canvas.Top="433" Canvas.Right="272.3" Width="10"
-                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
+                        Canvas.Left="746.5" Canvas.Top="433" Canvas.Right="272.3" Width="20"
+                        Height="20" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
                         Direction="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
@@ -818,7 +879,7 @@
 
                     <!--#region 冷却水出水阀-->
                     <bpa:PipeLineV
-                        Canvas.Left="735" Canvas.Top="224.571" Canvas.Right="260" Width="5"
+                        Canvas.Left="735" Canvas.Top="224.571" Canvas.Right="260" Width="10"
                         Height="67" HorizontalAlignment="Center" VerticalAlignment="Top" LineWidth="1">
                         <bpa:PipeLineV.Fill>
                             <MultiBinding Converter="{StaticResource MultiBoolDeviceControl}" ConverterParameter="2">
@@ -835,32 +896,32 @@
                     </bpa:PipeLineV>
                     <!--#region 冷凝水罐进气阀-->
                     <bpa:PipeLineV
-                        Canvas.Left="591" Canvas.Top="73" Canvas.Right="404.2" Width="5"
+                        Canvas.Left="591" Canvas.Top="73" Canvas.Right="404.2" Width="10"
                         Height="137" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
                         Direction="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <bpa:PipeLineBL
-                        Canvas.Left="585.8" Canvas.Top="63.4" Canvas.Right="404.2" Width="10"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
+                        Canvas.Left="585.8" Canvas.Top="63.4" Canvas.Right="404.2" Width="20"
+                        Height="20" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
                         Direction="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
                     <bpa:PipeLineH
                         Canvas.Left="349" Canvas.Top="63" Canvas.Right="413.9" Width="238"
-                        Height="5" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
+                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
                         Direction="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <bpa:PipeLineBR
-                        Canvas.Left="339" Canvas.Top="63" Canvas.Right="480.2" Width="10"
-                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
+                        Canvas.Left="339" Canvas.Top="63" Canvas.Right="480.2" Width="20"
+                        Height="20" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
                         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="16"
-                        Height="16" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Canvas.Left="603" Canvas.Top="114" Canvas.Right="380.8" Width="32"
+                        Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
                         EdgeColor="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ColdWaterTankInAirValve}"
                         Tag="冷凝水进气阀">
@@ -877,13 +938,13 @@
                     <!--#region 热气排空阀-->
                     <bpa:PipeLineH
                         Canvas.Left="601" Canvas.Top="215" Canvas.Right="339.4" Width="78"
-                        Height="5" HorizontalAlignment="Left" VerticalAlignment="Center"
+                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center"
                         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="16"
-                        Height="16" HorizontalAlignment="Left" VerticalAlignment="Center"
+                        Canvas.Left="662" Canvas.Top="207" Canvas.Right="343.4" Width="32"
+                        Height="32" HorizontalAlignment="Left" VerticalAlignment="Center"
                         EdgeColor="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.HotGasEmptyValve}"
                         Tag="热气排空阀" />
@@ -894,25 +955,25 @@
                     <!--#region 抽真空阀-->
                     <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"
+                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
                         Direction="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <bpa:PipeLineTR
-                        Canvas.Left="591" Canvas.Top="290.5" Canvas.Right="399.2" Width="10"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Canvas.Left="591" Canvas.Top="290.5" Canvas.Right="399.2" Width="20"
+                        Height="20" HorizontalAlignment="Center" VerticalAlignment="Top"
                         Direction="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
                     <bpa:PipeLineV
-                        Canvas.Left="591" Canvas.Top="210" Canvas.Right="404.2" Width="5"
+                        Canvas.Left="591" Canvas.Top="210" Canvas.Right="404.2" Width="10"
                         Height="81" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
                         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="16"
-                        Height="16" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Canvas.Left="635.883" Canvas.Top="288.036" Canvas.Right="380.8" Width="32"
+                        Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
                         EdgeColor="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactOutHotGasValve}"
                         Tag="抽真空阀" />
@@ -923,26 +984,26 @@
                         TextAlignment="Center" />
                     <!--#region 反应釜排水阀-->
                     <bpa:PipeLineV
-                        Canvas.Left="735" Canvas.Top="292" Canvas.Right="260" Width="5"
+                        Canvas.Left="735" Canvas.Top="292" Canvas.Right="260" Width="10"
                         Height="22" HorizontalAlignment="Center" VerticalAlignment="Top"
                         Direction="{Binding DeviceStatus.ReactDrainValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactDrainValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <bpa:PipeLineTL
                         Canvas.Left="725" Canvas.Top="313" Canvas.Right="255" Width="20"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Height="20" HorizontalAlignment="Center" VerticalAlignment="Top"
                         Direction="{Binding DeviceStatus.ReactDrainValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactDrainValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
                     <bpa:PipeLineH
                         Canvas.Left="505" Canvas.Top="318" Canvas.Right="269" Width="226"
-                        Height="5" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
+                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
                         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="16"
-                        Height="16" HorizontalAlignment="Left" VerticalAlignment="Center"
+                        Canvas.Left="514" Canvas.Top="310" Canvas.Right="339" Width="32"
+                        Height="32" HorizontalAlignment="Left" VerticalAlignment="Center"
                         EdgeColor="{Binding DeviceStatus.ReactDrainValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactDrainValve}"
                         Tag="反应釜排水阀" />
@@ -951,26 +1012,26 @@
                         FontSize="12" Foreground="White" Text="反应釜排水阀" TextAlignment="Center" />
                     <!--#region 冷却水、疏水-->
                     <bpa:PipeLineV
-                        Canvas.Left="744" Canvas.Top="225" Canvas.Right="250.9" Width="5"
+                        Canvas.Left="744" Canvas.Top="225" Canvas.Right="250.9" Width="10"
                         Height="122" HorizontalAlignment="Center" VerticalAlignment="Top"
                         Direction="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=7, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <bpa:PipeLineTL
                         Canvas.Left="734" Canvas.Top="347" Canvas.Right="245.9" Width="20"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Height="20" HorizontalAlignment="Center" VerticalAlignment="Top"
                         Direction="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=7, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
                     <bpa:PipeLineH
                         Canvas.Left="340" Canvas.Top="352" Canvas.Right="260.6" Width="399"
-                        Height="5" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
+                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
                         Direction="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=7, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="16" />
                     <bpa:HandValve
-                        Canvas.Left="406" Canvas.Top="345" Canvas.Right="360" Width="16"
-                        Height="16" HorizontalAlignment="Left" VerticalAlignment="Center"
+                        Canvas.Left="406" Canvas.Top="336" Canvas.Right="360" Width="32"
+                        Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
                         EdgeColor="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactOutColdValve}"
                         Tag="反应釜出冷却水阀" />
@@ -979,7 +1040,7 @@
                         FontSize="12" Foreground="White" Text="冷却水、疏水" TextAlignment="Center" />
                     <!--#region 进清水阀、进卤水阀、压缩空气进气阀进连接处-->
                     <bpa:PipeLineV
-                        Canvas.Left="751.7" Canvas.Top="224.571" Canvas.Right="243.3" Width="5"
+                        Canvas.Left="751.7" Canvas.Top="224.571" Canvas.Right="243.3" Width="10"
                         Height="160" HorizontalAlignment="Center" VerticalAlignment="Top" LineWidth="1">
                         <bpa:PipeLineV.Fill>
                             <MultiBinding Converter="{StaticResource MultiBoolDeviceControl}" ConverterParameter="2">
@@ -999,13 +1060,13 @@
                     <!--#region 进清水阀-->
                     <bpa:PipeLineH
                         Canvas.Left="641" Canvas.Top="389" Canvas.Right="272.9" Width="106"
-                        Height="5" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
+                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
                         Direction="{Binding DeviceStatus.ReactInCleanWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInCleanWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <bpa:HandValve
-                        Canvas.Left="644" Canvas.Top="382" Canvas.Right="384" Width="16"
-                        Height="16" HorizontalAlignment="Left" VerticalAlignment="Center"
+                        Canvas.Left="646" Canvas.Top="373" Canvas.Right="384" Width="32"
+                        Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
                         EdgeColor="{Binding DeviceStatus.ReactInCleanWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactInCleanWaterValve}"
                         Tag="反应釜进清水阀" />
@@ -1013,7 +1074,7 @@
                         Canvas.Left="628" Canvas.Top="362" HorizontalAlignment="Center" VerticalAlignment="Top"
                         FontSize="12" Foreground="White" Text="进清水阀" TextAlignment="Center" />
                     <bpa:PipeLineV
-                        Canvas.Left="751.5" Canvas.Top="385" Canvas.Right="277.3" Width="5"
+                        Canvas.Left="751.5" Canvas.Top="385" Canvas.Right="277.3" Width="10"
                         Height="29" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
                         LineWidth="1" Speed="1.5">
                         <bpa:PipeLineV.Fill>
@@ -1031,7 +1092,7 @@
                     </bpa:PipeLineV>
                     <!--#region  进卤水阀-->
                     <bpa:PipeLineV
-                        Canvas.Left="751.5" Canvas.Top="414" Canvas.Right="277.3" Width="5"
+                        Canvas.Left="751.5" Canvas.Top="414" Canvas.Right="277.3" Width="10"
                         Height="20" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
                         Direction="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
@@ -1049,25 +1110,40 @@
                     <TextBlock
                         Canvas.Left="205" Canvas.Top="465" Canvas.Right="206.5" HorizontalAlignment="Left"
                         VerticalAlignment="Top" Foreground="White" Text="卤水泵" />
+                    <cc:ValveWithCommandState MouseLeftButtonDown="Canvas_MouseDown"
+                        Canvas.Left="394" Canvas.Top="369"
+                        CommandColor="{Binding DeviceStatus.IsSetReactPressureAirInValve, Converter={StaticResource BoolToColorConverter}}"
+                        EdgeColor="{Binding DeviceStatus.ReactPressureAirInValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
+                        OpenEnable="{Binding DeviceStatus.ReactPressureAirInValve}" />
+
+
+                    <Grid
+                        Canvas.Left="384" Canvas.Top="399" Panel.ZIndex="8">
+                        <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="5" HorizontalAlignment="Center" VerticalAlignment="Center" d:Direction="1"
+                        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" />
-                    <bpa:HandValve
-                        Canvas.Left="383.99" Canvas.Top="407.437" Canvas.Right="400" Width="16"
-                        Height="16" HorizontalAlignment="Center" VerticalAlignment="Top"
-                        EdgeColor="{Binding DeviceStatus.ReactPressureAirInValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
-                        OpenEnable="{Binding DeviceStatus.ReactPressureAirInValve}"
-                        Tag="反应釜压缩空气进气阀" />
+
                     <TextBlock
                         Canvas.Left="350" Canvas.Top="423" HorizontalAlignment="Left" VerticalAlignment="Top"
                         FontSize="12" Foreground="White" Text="压缩空气进气阀" TextAlignment="Center" />
 
                     <!--#region 冷却水进水阀-->
                     <bpa:PipeLineV
-                        Canvas.Left="744" Canvas.Top="61" Canvas.Right="255.9" Width="5"
+                        Canvas.Left="744" Canvas.Top="61" Canvas.Right="255.9" Width="10"
                         Height="140" HorizontalAlignment="Center" VerticalAlignment="Top" LineWidth="1">
                         <bpa:PipeLineV.Fill>
                             <MultiBinding Converter="{StaticResource MultiBoolToColorConverter}" ConverterParameter="Lime,Red">
@@ -1083,32 +1159,32 @@
                         </bpa:PipeLineV.Direction>
                     </bpa:PipeLineV>
                     <bpa:PipeLineBL
-                        Canvas.Left="739.1" Canvas.Top="51.0" Canvas.Right="250.9" Width="10"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Canvas.Left="739.1" Canvas.Top="51.0" Canvas.Right="250.9" Width="20"
+                        Height="20" HorizontalAlignment="Center" VerticalAlignment="Top"
                         Direction="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
                     <bpa:PipeLineH
                         Canvas.Left="220" Canvas.Top="51" Canvas.Right="260.7" Width="519"
-                        Height="5" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
+                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
                         Direction="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="1.55" />
                     <bpa:PipeLineH
-                        Canvas.Left="252" Canvas.Top="203" Width="26" Height="5"
+                        Canvas.Left="252" Canvas.Top="203" Width="26" Height="10"
                         HorizontalAlignment="Center" VerticalAlignment="Center" d:Direction="1"
                         Direction="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <bpa:PipeLineTR
-                        Canvas.Left="242" Canvas.Top="198" Width="10" Height="10"
+                        Canvas.Left="242" Canvas.Top="198" Width="20" Height="20"
                         HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
                         Direction="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1" />
                     <bpa:HandValve
-                        Canvas.Left="670" Canvas.Top="44" Width="16" Height="16"
-                        HorizontalAlignment="Left" VerticalAlignment="Center"
+                        Canvas.Left="670" Canvas.Top="36" Width="32" Height="32"
+                        HorizontalAlignment="Center" VerticalAlignment="Top"
                         EdgeColor="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactInColdValve}" />
                     <TextBlock
@@ -1117,13 +1193,13 @@
 
                     <!--#region 风机-->
                     <bpa:PipeLineBL
-                        Canvas.Left="285" Canvas.Top="69" Width="10" Height="10"
+                        Canvas.Left="285" Canvas.Top="69" Width="20" Height="20"
                         HorizontalAlignment="Left" VerticalAlignment="Center"
                         Direction="{Binding DeviceStatus.ColdWaterTankVacuumValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankVacuumValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1" />
                     <bpa:PipeLineH
-                        Canvas.Left="74" Canvas.Top="69" Width="54" Height="5"
+                        Canvas.Left="74" Canvas.Top="69" Width="54" Height="10"
                         HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
                         Direction="{Binding DeviceStatus.Fans, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.Fans, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
@@ -1147,22 +1223,22 @@
                         Canvas.Left="38" Canvas.Top="138" HorizontalAlignment="Center" VerticalAlignment="Top"
                         Foreground="White" Text="真空泵" />
                     <bpa:HandValve
-                        Canvas.Left="121.876" Canvas.Top="61.412" Canvas.Right="343.4" Width="16"
-                        Height="16" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Canvas.Left="122" Canvas.Top="54" Canvas.Right="343.4" Width="32"
+                        Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
                         EdgeColor="{Binding DeviceStatus.ColdWaterTankVacuumValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ColdWaterTankVacuumValve}"
                         Tag="冷凝水罐真空阀" />
                     <TextBlock
-                        Canvas.Left="88" Canvas.Top="77" HorizontalAlignment="Left" VerticalAlignment="Top"
+                        Canvas.Left="93" Canvas.Top="80" HorizontalAlignment="Left" VerticalAlignment="Center"
                         FontSize="12" Foreground="White" Text="冷凝水管负压阀" TextAlignment="Center" />
                     <bpa:PipeLineH
                         Canvas.Left="437" Canvas.Top="22" Canvas.Right="260.7" Width="303"
-                        Height="5" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
+                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
                         Direction="{Binding DeviceStatus.ReactInSteamValue, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInSteamValue, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="25" />
                     <bpa:HandValve
-                        Canvas.Left="360" Canvas.Top="14.331" Width="16" Height="16"
+                        Canvas.Left="360" Canvas.Top="7" Width="32" Height="32"
                         HorizontalAlignment="Center" VerticalAlignment="Top"
                         EdgeColor="{Binding DeviceStatus.ReactInSteamValue, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactInSteamValue}" />
@@ -1170,34 +1246,34 @@
                         Canvas.Left="336" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="12"
                         Foreground="White" Text="蒸汽比例阀" TextAlignment="Center" />
                     <bpa:HandValve
-                        Canvas.Left="429.972" Canvas.Top="14.331" Width="16" Height="16"
-                        HorizontalAlignment="Left" VerticalAlignment="Center"
+                        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" />
                     <bpa:PipeLineBL
-                        Canvas.Left="739.1" Canvas.Top="21.963" Canvas.Right="250.9" Width="10"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Center"
+                        Canvas.Left="739.1" Canvas.Top="21.963" Canvas.Right="250.9" Width="20"
+                        Height="20" HorizontalAlignment="Center" VerticalAlignment="Center"
                         Direction="{Binding DeviceStatus.ReactInSteamValue, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInSteamValue, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
                     <bpa:PipeLineV
-                        Canvas.Left="366" Canvas.Top="111" Canvas.Right="404.2" Width="5"
+                        Canvas.Left="366" Canvas.Top="111" Canvas.Right="404.2" Width="10"
                         Height="236" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
                         Direction="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <bpa:PipeLineBL
-                        Canvas.Left="361" Canvas.Top="101" Canvas.Right="404.2" Width="10"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
+                        Canvas.Left="361" Canvas.Top="101" Canvas.Right="404.2" Width="20"
+                        Height="20" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
                         Direction="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
                     <bpa:PipeLineTL
                         Canvas.Left="356" Canvas.Top="347" Canvas.Right="238.3" Width="20"
-                        Height="10" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
+                        Height="20" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
                         Direction="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
@@ -1206,8 +1282,8 @@
                         VerticalAlignment="Center" FontSize="12" Foreground="White" Text="反应釜泄压阀"
                         TextAlignment="Center" />
                     <bpa:HandValve
-                        Canvas.Left="234" Canvas.Top="175" Canvas.Right="343.4" Width="16"
-                        Height="16" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Canvas.Left="226" Canvas.Top="175" Canvas.Right="343.4" Width="32"
+                        Height="32" HorizontalAlignment="Left" VerticalAlignment="Center"
                         EdgeColor="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ColdWaterTankInWaterValve}"
                         Tag="冷凝水罐进水阀">
@@ -1217,7 +1293,7 @@
                     </bpa:HandValve>
                     <bpa:PipeLineH
                         Canvas.Left="603" Canvas.Top="438" Canvas.Right="257.5" Width="144"
-                        Height="5" HorizontalAlignment="Center" VerticalAlignment="Center" d:Direction="1"
+                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" d:Direction="1"
                         Direction="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="10" />
@@ -1227,8 +1303,8 @@
                         Text="冷&#xA;凝&#xA;水&#xA;罐&#xA;进&#xA;水&#xA;阀"
                         TextAlignment="Center" />
                     <bpa:HandValve
-                        Canvas.Left="590.8" Canvas.Top="430.945" Canvas.Right="253.9" Width="16"
-                        Height="16" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Canvas.Left="587" Canvas.Top="423" Canvas.Right="253.9" Width="32"
+                        Height="32" HorizontalAlignment="Center" VerticalAlignment="Top"
                         EdgeColor="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactInBrineWaterValve}"
                         Tag="反应釜进卤水阀">
@@ -1423,8 +1499,8 @@
                     </GroupBox>
                     <!--#endregion-->
                     <bpa:PipeLineTR
-                        Canvas.Left="591" Canvas.Top="210" Canvas.Right="399.2" Width="10"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
+                        Canvas.Left="591" Canvas.Top="210" Canvas.Right="399.2" Width="20"
+                        Height="20" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
                         Direction="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
@@ -1480,11 +1556,7 @@
                         Foreground="{Binding DeviceStatus.IsSetBrineTankZero, Converter={StaticResource BoolToColorConverter}}"
                         Text="⬛" TextAlignment="Center" />
 
-                    <TextBlock
-                        Canvas.Left="384" Canvas.Top="389" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
-                        Foreground="{Binding DeviceStatus.IsSetReactPressureAirInValve, 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"
@@ -1548,13 +1620,13 @@
                         Foreground="{Binding DeviceStatus.IsSetReactPressureReliefValve, Converter={StaticResource BoolToColorConverter}}"
                         Text="⬛" TextAlignment="Center" />
                     <bpa:PipeLineTL
-                        Canvas.Left="730" Canvas.Top="290.5" Canvas.Right="260" Width="10"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Canvas.Left="730" Canvas.Top="290.5" Canvas.Right="260" Width="20"
+                        Height="20" HorizontalAlignment="Center" VerticalAlignment="Top"
                         Direction="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
                     <bpa:PipeLineBL
-                        Canvas.Left="237" Canvas.Top="51" Width="10" Height="10"
+                        Canvas.Left="233" Canvas.Top="50" Width="20" Height="20"
                         HorizontalAlignment="Left" VerticalAlignment="Center"
                         Direction="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"