修改

BPASmartClient.Academy/View/ReactionKettle50LView.xaml

@@ -292,6 +292,51 @@
                 Grid.Row="1" Margin="10" Stretch="Uniform">
                 <Canvas Width="1000" Height="490">
                     <!--#region 开关控制按钮-->
+                    <bpa:PipeLineH
+                        Canvas.Left="600.5" Canvas.Top="214.5" Canvas.Right="339.4" Width="42"
+                        Height="5"
+                        Direction="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
+                        Fill="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
+                        LineWidth="1" Speed="10" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                    <!--#region 开关控制按钮-->
+                    <bpa:PipeLineH
+                        Canvas.Left="681" Canvas.Top="51.3" Canvas.Right="261" Width="58.5"
+                        Height="5" HorizontalAlignment="Center" VerticalAlignment="Center" d:Direction="1"
+                        Direction="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
+                        Fill="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
+                        LineWidth="1" Speed="2" />
+                    <bpa:PipeLineH
+                        Canvas.Left="52" Canvas.Top="22" Canvas.Right="260.7" Width="310"
+                        Height="5" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1"
+                        LineWidth="1" Speed="25" />
+                    <bpa:PipeLineH
+                        Canvas.Left="371" Canvas.Top="22" Canvas.Right="260.7" Width="61"
+                        Height="5" 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="189.5" Canvas.Top="177" Width="5" Height="22"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
+                        Direction="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
+                        Fill="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
+                        LineWidth="1" RenderTransformOrigin="0.5,0.5">
+                        <bpa:PipeLineV.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform ScaleY="-1" />
+                                <SkewTransform />
+                                <RotateTransform />
+                                <TranslateTransform />
+                            </TransformGroup>
+                        </bpa:PipeLineV.RenderTransform>
+                    </bpa:PipeLineV>
+                    <bpa:PipeLineH
+                        Canvas.Left="133" Canvas.Top="69" Width="107" Height="5"
+                        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}}"
+                        LineWidth="1" />
+                    <!--#region 开关控制按钮-->
                     <bpa:PipeLineH
                         Canvas.Left="115" Canvas.Top="456" Canvas.Right="257.5" Width="95"
                         Height="5" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
@@ -312,7 +357,7 @@
                         LineWidth="1" Speed="10" />
                     <!--#region 开关控制按钮-->
                     <bpa:PipeLineTL
-                        Canvas.Left="713" Canvas.Top="433" Canvas.Right="272.3" Width="10"
+                        Canvas.Left="712.7" Canvas.Top="433" Canvas.Right="272.3" Width="10"
                         Height="10" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
                         Direction="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
@@ -600,8 +645,8 @@
                         Tag="卤水配制罐重量清零" />
                     <!--#region 进卤水阀、压缩空气进气阀连接处-->
                     <bpa:PipeLineBR
-                        Canvas.Left="717.7" Canvas.Top="389.3" Canvas.Right="272.3" Width="9"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
+                        Canvas.Left="718" Canvas.Top="389" Canvas.Right="272.3" Width="9"
+                        Height="11" HorizontalAlignment="Center" VerticalAlignment="Center" d:Direction="1"
                         LineWidth="10" Speed="1.5" />
                     <Image
                         Canvas.Left="384" Canvas.Top="59" Width="235" Height="264"
@@ -748,8 +793,8 @@
                         Height="10" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
                         LineWidth="10" Speed="1.5" />
                     <bpa:PipeLineH
-                        Canvas.Left="600.6" Canvas.Top="214.71" Canvas.Right="339.4" Width="78"
-                        Height="5" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Canvas.Left="652" Canvas.Top="215" Canvas.Right="339.4" Width="27"
+                        Height="5" 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="10" />
@@ -809,12 +854,12 @@
                         LineWidth="10" Speed="1.5" />
                     <bpa:PipeLineH
                         Canvas.Left="433" Canvas.Top="318" Canvas.Right="269" Width="298"
-                        Height="6" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
+                        Height="5" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
                         Direction="{Binding DeviceStatus.ReactDrainValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
                         Fill="{Binding DeviceStatus.ReactDrainValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" />
                     <bpa:HandValve
-                        Canvas.Left="445" Canvas.Top="311" Canvas.Right="339" Width="16"
+                        Canvas.Left="445" Canvas.Top="310.5" Canvas.Right="339" Width="16"
                         Height="16" HorizontalAlignment="Center" VerticalAlignment="Top"
                         EdgeColor="{Binding DeviceStatus.ReactDrainValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         OpenEnable="{Binding DeviceStatus.ReactDrainValve}" />
@@ -867,7 +912,7 @@
                         LineWidth="1" />
                     <!--#region 进清水阀-->
                     <bpa:PipeLineH
-                        Canvas.Left="549" Canvas.Top="389" Canvas.Right="272.9" Width="178"
+                        Canvas.Left="549" Canvas.Top="389.5" Canvas.Right="272.9" Width="178"
                         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}}"
@@ -934,23 +979,20 @@
                         Height="169" HorizontalAlignment="Center" VerticalAlignment="Top" LineWidth="1" />
                     <bpa:PipeLineBL
                         Canvas.Left="739.1" Canvas.Top="51.3" Canvas.Right="250.9" Width="10"
-                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top" LineWidth="10"
-                        Speed="1.5" />
+                        Height="10" HorizontalAlignment="Center" VerticalAlignment="Top"
+                        Direction="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
+                        Fill="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
+                        LineWidth="10" Speed="1.5" />
                     <bpa:PipeLineBL
                         Canvas.Left="184.502" Canvas.Top="51.3" Width="10" Height="10"
                         HorizontalAlignment="Center" VerticalAlignment="Top" LineWidth="10" Speed="2" />
                     <bpa:PipeLineH
-                        Canvas.Left="31.329" Canvas.Top="51.3" Canvas.Right="260.7" Width="709"
-                        Height="5" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="2"
-                        Direction="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
-                        Fill="{Binding DeviceStatus.ReactInColdValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
-                        LineWidth="1" Speed="1" />
+                        Canvas.Left="31" Canvas.Top="51" Canvas.Right="260.7" Width="642"
+                        Height="5" HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="2"
+                        LineWidth="1" Speed="2" />
                     <bpa:PipeLineV
-                        Canvas.Left="189.5" Canvas.Top="61" Width="5" Height="137"
-                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
-                        Direction="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
-                        Fill="{Binding DeviceStatus.ColdWaterTankInWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
-                        LineWidth="1" />
+                        Canvas.Left="189.5" Canvas.Top="61" Width="5" Height="107"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Direction="1" LineWidth="1" />
                     <bpa:PipeLineH
                         Canvas.Left="199.1" Canvas.Top="203.154" Width="33.5" Height="5"
                         HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
@@ -980,16 +1022,17 @@
                         Fill="{Binding DeviceStatus.ColdWaterTankVacuumValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="10" Speed="1" />
                     <bpa:PipeLineH
-                        Canvas.Left="73.9" Canvas.Top="69.222" Width="167" Height="5"
-                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
-                        Direction="{Binding DeviceStatus.ColdWaterTankVacuumValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
-                        Fill="{Binding DeviceStatus.ColdWaterTankVacuumValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
+                        Canvas.Left="74" Canvas.Top="69" Width="54" Height="5"
+                        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}}"
                         LineWidth="1" />
                     <CheckBox
-                        Canvas.Left="-1" Canvas.Top="49" HorizontalAlignment="Left" VerticalAlignment="Top"
+                        Canvas.Left="-1" Canvas.Top="49" Width="92" Height="81"
+                        HorizontalAlignment="Left" VerticalAlignment="Top"
                         IsChecked="{Binding DeviceStatus.Fans}"
                         IsEnabled="False"
-                        Style="{StaticResource wind}" Height="81" Width="92" />
+                        Style="{StaticResource wind}" />
                     <TextBlock
                         Canvas.Left="101" Canvas.Top="206" Canvas.Right="384.8" Height="20"
                         HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
@@ -1011,8 +1054,8 @@
                         Canvas.Left="88" Canvas.Top="77" HorizontalAlignment="Left" VerticalAlignment="Top"
                         FontSize="12" Foreground="White" Text="冷凝水管负压阀" TextAlignment="Center" />
                     <bpa:PipeLineH
-                        Canvas.Left="31.329" Canvas.Top="22.031" Canvas.Right="260.7" Width="709"
-                        Height="5" HorizontalAlignment="Center" VerticalAlignment="Top" d:Direction="1"
+                        Canvas.Left="437" Canvas.Top="22" Canvas.Right="260.7" Width="303"
+                        Height="5" 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" />