10L第二套画面显示修改

BPASmartClient.Academy/View/ReactionKettle50LView.xaml

@@ -983,19 +983,19 @@
                         Canvas.Left="744" Canvas.Top="225" Canvas.Right="250.9" Width="5"
                         Height="122" HorizontalAlignment="Center" VerticalAlignment="Top"
                         Direction="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
-                        Fill="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=6, 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"
                         Direction="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}"
-                        Fill="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=6, 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"
                         Direction="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}"
-                        Fill="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=6, Converter={StaticResource deviceConvert}}"
+                        Fill="{Binding DeviceStatus.ReactOutColdValve, ConverterParameter=7, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="16" />
                     <bpa:HandValve
                         Canvas.Left="434" Canvas.Top="345" Canvas.Right="360" Width="16"
@@ -1286,134 +1286,134 @@
                         LineWidth="10" Speed="1.5" />
                     <TextBlock
                         Canvas.Left="85" Canvas.Top="166" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetFans, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="170" Canvas.Top="106" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetColdWaterTankVacuumValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="210" Canvas.Top="135" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetColdWaterTankInWaterValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="629" Canvas.Top="112" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetColdWaterTankInAirValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="636" Canvas.Top="168" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetHotGasEmptyValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="625" Canvas.Top="249" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactOutHotGasValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="480" Canvas.Top="213" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetStartEmptyWater, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="482" Canvas.Top="263" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactDrainValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="427" Canvas.Top="258" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactOutColdValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="200" Canvas.Top="255" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetBrineTankZero, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="209" Canvas.Top="382" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetStartEnterBrine, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="382" Canvas.Top="383" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactPressureAirInValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="549" Canvas.Top="393" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactInCleanWaterValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="318" Canvas.Top="455" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetBrinePumpState, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="39" Canvas.Top="462" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetBrineTankZero, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="588" Canvas.Top="460" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactInBrineWaterValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="678" Canvas.Top="366" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetStartClean, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="819" Canvas.Top="437" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetGoAddPosition, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="894" Canvas.Top="439" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactEnter, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="819" Canvas.Top="372" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactOut, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="894" Canvas.Top="372" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactHomeBit, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="968" Canvas.Top="373" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactReverse, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="941" Canvas.Top="307" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactTurnMotorJogging, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="934" Canvas.Top="120" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactTurnMotor, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="934" Canvas.Top="48" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetVacuumDistill, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="797" Canvas.Top="85" Canvas.Right="384.8" Height="20"
-                        d:Foreground="Red" FontSize="16"
+                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactPressureReliefValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                        Text="⚫" TextAlignment="Center" />
                     <!--#endregion-->
                 </Canvas>
             </Viewbox>