diff --git a/BPASmartClient.Academy/Themes/Generic.xaml b/BPASmartClient.Academy/Themes/Generic.xaml index 37a14815..22911508 100644 --- a/BPASmartClient.Academy/Themes/Generic.xaml +++ b/BPASmartClient.Academy/Themes/Generic.xaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:bpa="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource" xmlns:helper="clr-namespace:BPASmartClient.Academy.Themes" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" > + + \ No newline at end of file diff --git a/BPASmartClient.Academy/View/ReactionKettle50LView.xaml b/BPASmartClient.Academy/View/ReactionKettle50LView.xaml index 9452d5b1..aab498f2 100644 --- a/BPASmartClient.Academy/View/ReactionKettle50LView.xaml +++ b/BPASmartClient.Academy/View/ReactionKettle50LView.xaml @@ -258,6 +258,14 @@ + + + @@ -345,13 +357,17 @@ Canvas.Left="13" Canvas.Top="156" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="99" Orientation="Vertical"> @@ -359,13 +375,17 @@ Canvas.Left="247" Canvas.Top="446" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="99" Orientation="Vertical"> @@ -387,13 +407,17 @@ Canvas.Left="813" Canvas.Top="322" HorizontalAlignment="Left" VerticalAlignment="Center" Panel.ZIndex="99" Orientation="Vertical"> @@ -496,171 +520,36 @@ Canvas.Left="800" Canvas.Top="78" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="99" Orientation="Vertical"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -820,21 +709,21 @@ Direction="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=5, Converter={StaticResource deviceConvert}}" Fill="{Binding DeviceStatus.ColdWaterTankInAirValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}" LineWidth="10" Speed="1.5" /> - - + - - + + + Canvas.Left="616" Canvas.Top="72" Canvas.Right="384.8" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="冷 凝 水 罐 进 气 阀" /> - + Canvas.Left="639" Canvas.Top="192" Canvas.Right="312.8" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="热气排空阀" /> - + Canvas.Left="618" Canvas.Top="272" Canvas.Right="384.8" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="抽真空阀" /> - + Canvas.Left="491" Canvas.Top="290" VerticalAlignment="Top" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="反应釜排水阀" /> - + Canvas.Left="388" Canvas.Top="322" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="冷却水、疏水" /> - + Canvas.Left="628" Canvas.Top="362" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="进清水阀" /> + Canvas.Left="574" Canvas.Top="447" Canvas.Right="240" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="进卤水阀" /> @@ -1009,41 +907,20 @@ + Canvas.Left="205" Canvas.Top="465" Canvas.Right="206.5" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="卤水泵" /> - - - - - - - + Canvas.Left="350" Canvas.Top="423" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="压缩空气进气阀" /> + Canvas.Left="640" Canvas.Top="30" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="冷却水进水阀" /> - + + Canvas.Left="93" Canvas.Top="83" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="冷凝水管负压阀" /> + Canvas.Left="336" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="蒸汽比例阀" /> + Canvas.Left="417" d:Visibility="Visible" + Style="{StaticResource ValveAnnotationTextStyle}" + Text="蒸汽阀" /> - + - + - - + + - + - - + Tag="反应釜进卤水阀" /> @@ -1248,7 +1130,7 @@ @@ -1270,11 +1152,6 @@ Style="{StaticResource radiobutton}" Tag="排水启动" /> - @@ -1296,11 +1173,6 @@ Style="{StaticResource radiobutton}" Tag="清洗启动按钮" /> - @@ -1322,11 +1194,6 @@ Style="{StaticResource radiobutton}" Tag="真空蒸馏" /> - @@ -1334,23 +1201,20 @@ - @@ -1358,23 +1222,20 @@ - @@ -1382,54 +1243,42 @@ - - + + Width="100" HorizontalAlignment="Center" VerticalAlignment="Center" Panel.ZIndex="99" + Orientation="Vertical"> - - - @@ -1441,64 +1290,12 @@ Direction="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=1, Converter={StaticResource deviceConvert}}" Fill="{Binding DeviceStatus.HotGasEmptyValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}" LineWidth="10" Speed="1.5" /> - - - - - - - - - - - - - - - + - - - - @@ -1663,23 +1434,17 @@ Foreground="White" Text="℃" /> - - @@ -1699,23 +1464,17 @@ Foreground="White" Text="℃" /> - -