From f275857dd99c70fc5a50343503bbefd667c9ccd8 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Wed, 13 Nov 2024 13:34:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=AE=A1=E9=81=93=E6=96=B9?=
 =?UTF-8?q?=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/ReactionKettle50LView.xaml           | 142 ++++++++++--------
 1 file changed, 80 insertions(+), 62 deletions(-)

diff --git a/BPASmartClient.Academy/View/ReactionKettle50LView.xaml b/BPASmartClient.Academy/View/ReactionKettle50LView.xaml
index 7230ef09..d7dbe00d 100644
--- a/BPASmartClient.Academy/View/ReactionKettle50LView.xaml
+++ b/BPASmartClient.Academy/View/ReactionKettle50LView.xaml
@@ -294,6 +294,21 @@
                 Grid.Row="1" Margin="10" Stretch="Uniform">
                 <Canvas Width="1000" Height="490">
                     <!--#region 开关控制按钮-->
+                    <!--#region 压缩空气进气阀-->
+                    <bpa:PipeLineTL
+                        Canvas.Left="742" Canvas.Top="384" Canvas.Right="238.3" Width="20"
+                        Height="10" 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"
+                        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"
                         Height="30" HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -301,7 +316,6 @@
                         Fill="{Binding DeviceStatus.ReactInSteamValue, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <!--#region 开关控制按钮-->
-                    <!--#region 开关控制按钮-->
                     <bpa:PipeLineH
                         Canvas.Left="332" Canvas.Top="22" Canvas.Right="260.7" Width="100"
                         Height="5" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
@@ -313,8 +327,7 @@
                         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:PipeLineV>
+                        LineWidth="1" RenderTransformOrigin="0.5,0.5" />
                     <bpa:PipeLineH
                         Canvas.Left="133" Canvas.Top="69" Width="152" Height="5"
                         HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
@@ -618,7 +631,7 @@
                             Tag="反应釜出冷却水阀" />
                     </StackPanel>
                     <StackPanel
-                        Canvas.Left="469" Canvas.Top="370" HorizontalAlignment="Left" VerticalAlignment="Center"
+                        Canvas.Left="556" Canvas.Top="369" HorizontalAlignment="Left" VerticalAlignment="Top"
                         Panel.ZIndex="99" Orientation="Vertical">
                         <RadioButton
                             Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
@@ -631,6 +644,20 @@
                             Style="{StaticResource radiobutton}"
                             Tag="反应釜进清水阀" />
                     </StackPanel>
+                    <StackPanel
+                        Canvas.Left="479" Canvas.Top="369" 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="913" Canvas.Top="71" HorizontalAlignment="Left" VerticalAlignment="Top"
                         Panel.ZIndex="99" Orientation="Vertical">
@@ -736,13 +763,6 @@
                         RenderTransformOrigin="-3.206,-0.55"
                         Style="{StaticResource ButtonStyle}"
                         Tag="进卤水启动" />
-                    <Button
-                        Canvas.Left="589" Canvas.Top="366" Width="76" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="99" BorderThickness="0"
-                        Click="open_Click" Content="清洗启动" FontSize="8" Foreground="White"
-                        RenderTransformOrigin="-3.206,-0.55"
-                        Style="{StaticResource ButtonStyle}"
-                        Tag="清洗启动按钮" />
                     <!--#region 进卤水阀、压缩空气进气阀连接处-->
                     <Image
                         Canvas.Left="429" Canvas.Top="59" Width="235" Height="264"
@@ -863,26 +883,26 @@
                     <!--#region 冷凝水罐进气阀-->
                     <bpa:PipeLineV
                         Canvas.Left="591" Canvas.Top="73" Canvas.Right="404.2" Width="5"
-                        Height="137" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
-                        Direction="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
+                        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"
-                        Direction="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
+                        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="1"
-                        Direction="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
+                        Height="5" 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="1"
-                        Direction="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
+                        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="10" Speed="1.5" />
                     <bpa:HandValve
@@ -904,9 +924,9 @@
                     <bpa:PipeLineH
                         Canvas.Left="601" Canvas.Top="215" Canvas.Right="339.4" Width="78"
                         Height="5" HorizontalAlignment="Left" VerticalAlignment="Center"
-                        Direction="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
+                        Direction="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
-                        LineWidth="1" Speed="1" />
+                        LineWidth="1" Speed="0.23" />
                     <bpa:HandValve
                         Canvas.Left="640.6" Canvas.Top="207" Canvas.Right="343.4" Width="16"
                         Height="16" HorizontalAlignment="Center" VerticalAlignment="Top"
@@ -917,12 +937,6 @@
                         VerticalAlignment="Top" FontSize="12" Foreground="White" Text="热气排空阀"
                         TextAlignment="Center" />
                     <!--#region 抽真空阀-->
-                    <bpa:PipeLineTL
-                        Canvas.Left="730" Canvas.Top="290.5" Canvas.Right="260" Width="10"
-                        Height="10" 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:PipeLineH
                         Canvas.Left="600.3" Canvas.Top="295.5" Canvas.Right="269.7" Width="130"
                         Height="5" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
@@ -930,7 +944,7 @@
                         Fill="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <bpa:PipeLineTR
-                        Canvas.Left="590.8" Canvas.Top="290.5" Canvas.Right="399.2" Width="10"
+                        Canvas.Left="591" Canvas.Top="290.5" Canvas.Right="399.2" Width="10"
                         Height="10" HorizontalAlignment="Center" VerticalAlignment="Top"
                         Direction="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactOutHotGasValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
@@ -1024,37 +1038,42 @@
                             </MultiBinding>
                         </bpa:PipeLineV.Direction>
                     </bpa:PipeLineV>
-                    <bpa:PipeLineTL
-                        Canvas.Left="741.7" Canvas.Top="384.3" Canvas.Right="238.3" Width="20"
-                        Height="10" 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:PipeLineH
-                        Canvas.Left="549" Canvas.Top="389" Canvas.Right="272.9" Width="198"
-                        Height="5" HorizontalAlignment="Center" VerticalAlignment="Center" d:Direction="1"
+                        Canvas.Left="641" Canvas.Top="389" Canvas.Right="272.9" Width="106"
+                        Height="5" 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="554" Canvas.Top="382" Canvas.Right="384" Width="16"
+                        Canvas.Left="644" Canvas.Top="382" Canvas.Right="384" Width="16"
                         Height="16" HorizontalAlignment="Left" VerticalAlignment="Center"
                         EdgeColor="{Binding DeviceStatus.ReactInCleanWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactInCleanWaterValve}" />
                     <TextBlock
-                        Canvas.Left="538" Canvas.Top="367" HorizontalAlignment="Left" VerticalAlignment="Top"
+                        Canvas.Left="628" Canvas.Top="367" HorizontalAlignment="Left" VerticalAlignment="Center"
                         FontSize="12" Foreground="White" Text="进清水阀" TextAlignment="Center" />
                     <bpa:PipeLineV
                         Canvas.Left="751.5" Canvas.Top="385" Canvas.Right="277.3" Width="5"
                         Height="29" 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="1" Speed="1.5" />
+                        LineWidth="1" Speed="1.5">
+                        <bpa:PipeLineV.Fill>
+                            <MultiBinding Converter="{StaticResource MultiBoolDeviceControl}" ConverterParameter="2">
+                                <Binding Path="DeviceStatus.ReactPressureAirInValve" />
+                                <Binding Path="DeviceStatus.ReactInBrineWaterValve" />
+                            </MultiBinding>
+                        </bpa:PipeLineV.Fill>
+                        <bpa:PipeLineV.Direction>
+                            <MultiBinding Converter="{StaticResource MultiBoolDeviceControl}" ConverterParameter="5">
+                                <Binding Path="DeviceStatus.ReactPressureAirInValve" />
+                                <Binding Path="DeviceStatus.ReactInBrineWaterValve" />
+                            </MultiBinding>
+                        </bpa:PipeLineV.Direction>
+                    </bpa:PipeLineV>
                     <!--#region  进卤水阀-->
                     <bpa:PipeLineV
                         Canvas.Left="751.5" Canvas.Top="414" Canvas.Right="277.3" Width="5"
-                        Height="20" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
+                        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}}"
                         LineWidth="1" Speed="1" />
@@ -1071,13 +1090,6 @@
                     <TextBlock
                         Canvas.Left="205" Canvas.Top="465" Canvas.Right="206.5" HorizontalAlignment="Left"
                         VerticalAlignment="Top" Foreground="White" Text="卤水泵" />
-                    <!--#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"
-                        Direction="{Binding DeviceStatus.ReactPressureAirInValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
-                        Fill="{Binding DeviceStatus.ReactPressureAirInValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
-                        LineWidth="10" Speed="1.5" />
                     <bpa:PipeLineH
                         Canvas.Left="379" Canvas.Top="415" Canvas.Right="286.9" Width="368"
                         Height="5" HorizontalAlignment="Center" VerticalAlignment="Center" d:Direction="1"
@@ -1116,18 +1128,12 @@
                         Direction="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1.5" />
-                    <bpa:PipeLineBL
-                        Canvas.Left="237" Canvas.Top="51" Width="10" Height="10"
-                        HorizontalAlignment="Left" VerticalAlignment="Center"
-                        Direction="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
-                        Fill="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
-                        LineWidth="10" Speed="2" />
                     <bpa:PipeLineH
                         Canvas.Left="220" Canvas.Top="51" Canvas.Right="260.7" Width="519"
-                        Height="5" HorizontalAlignment="Left" VerticalAlignment="Center"
+                        Height="5" 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" />
+                        LineWidth="1" Speed="1.55" />
                     <bpa:PipeLineH
                         Canvas.Left="252" Canvas.Top="203" Width="26" Height="5"
                         HorizontalAlignment="Center" VerticalAlignment="Center" d:Direction="1"
@@ -1296,9 +1302,9 @@
                         </StackPanel>
                     </GroupBox>
                     <bpa:PipeLineTR
-                        Canvas.Left="590.8" Canvas.Top="209.532" Canvas.Right="399.2" Width="10"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
-                        Direction="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
+                        Canvas.Left="591" Canvas.Top="210" Canvas.Right="399.2" Width="10"
+                        Height="10" 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" />
                     <TextBlock
@@ -1367,7 +1373,7 @@
                         Foreground="{Binding DeviceStatus.IsSetReactPressureAirInValve, Converter={StaticResource BoolToColorConverter}}"
                         Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="554" Canvas.Top="393" Canvas.Right="384.8" Height="20"
+                        Canvas.Left="644" Canvas.Top="393" Canvas.Right="384.8" Height="20"
                         HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactInCleanWaterValve, Converter={StaticResource BoolToColorConverter}}"
                         Text="⬛" TextAlignment="Center" />
@@ -1387,8 +1393,8 @@
                         Foreground="{Binding DeviceStatus.IsSetReactInBrineWaterValve, Converter={StaticResource BoolToColorConverter}}"
                         Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="678" Canvas.Top="366" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="462" Canvas.Top="379" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetStartClean, Converter={StaticResource BoolToColorConverter}}"
                         Text="⬛" TextAlignment="Center" />
                     <TextBlock
@@ -1436,6 +1442,18 @@
                         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="10"
+                        Height="10" 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"
+                        HorizontalAlignment="Left" VerticalAlignment="Center"
+                        Direction="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
+                        Fill="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
+                        LineWidth="10" Speed="2" />
                     <!--#endregion-->
                 </Canvas>
             </Viewbox>