10L第二套画面显示修改

BPASmartClient.Academy/Converter/DeviceCtrlConvert.cs

@@ -110,7 +110,7 @@ namespace BPASmartClient.Academy.Converter
                     return 0;
                 }
             }
-            else //冷凝水颜色
+            else if (parameter.ToString() == "6")//冷凝水颜色
             {
                 if (value is bool)
                 {
@@ -129,6 +129,25 @@ namespace BPASmartClient.Academy.Converter
                     return Color.FromRgb(255, 255, 255);
                 }
             }
+            else //冷凝水、疏水管道颜色
+            {
+                if (value is bool)
+                {
+                    bool value_get = (bool)value;
+                    if (value_get)
+                    {
+                        return Color.FromRgb(0, 255, 0);
+                    }
+                    else
+                    {
+                       return Color.FromRgb(227, 26, 26);
+                    }
+                }
+                else
+                {
+                   return Color.FromRgb(227, 26, 26);
+                }
+            }
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

BPASmartClient.Academy/Model/DeviceCtrl.cs

@@ -8,7 +8,109 @@ namespace BPASmartClient.Academy.Model
 {
     public class DeviceCtrl:NotifyBase
     {
-        
+        #region 按钮变量
+        public bool 配料罐搅拌电机 { get { return m_配料罐搅拌电机; } set { m_配料罐搅拌电机 = value; OnPropertyChanged(); } }
+        private bool m_配料罐搅拌电机;
+
+        public bool 反应釜搅拌电机 { get { return m_反应釜搅拌电机; } set { m_反应釜搅拌电机 = value; OnPropertyChanged(); } }
+        private bool m_反应釜搅拌电机;
+
+        public bool 真空泵 { get { return m_真空泵; } set { m_真空泵 = value; OnPropertyChanged(); } }
+        private bool m_真空泵;
+
+        public bool 进料阀 { get { return m_进料阀; } set { m_进料阀 = value; OnPropertyChanged(); } }
+        private bool m_进料阀;
+
+        public bool 蒸馏阀 { get { return m_蒸馏阀; } set { m_蒸馏阀 = value; OnPropertyChanged(); } }
+        private bool m_蒸馏阀;
+
+        public bool 回油阀 { get { return m_回油阀; } set { m_回油阀 = value; OnPropertyChanged(); } }
+        private bool m_回油阀;
+
+        public bool 回水阀 { get { return m_回水阀; } set { m_回水阀 = value; OnPropertyChanged(); } }
+        private bool m_回水阀;
+
+        public bool 汇馏阀 { get { return m_汇馏阀; } set { m_汇馏阀 = value; OnPropertyChanged(); } }
+        private bool m_汇馏阀;
+
+        public bool 排馏阀 { get { return m_排馏阀; } set { m_排馏阀 = value; OnPropertyChanged(); } }
+        private bool m_排馏阀;
+
+        public bool 冷凝器冷却阀 { get { return m_冷凝器冷却阀; } set { m_冷凝器冷却阀 = value; OnPropertyChanged(); } }
+        private bool m_冷凝器冷却阀;
+
+        public bool 配料釜蒸汽阀 { get { return m_配料釜蒸汽阀; } set { m_配料釜蒸汽阀 = value; OnPropertyChanged(); } }
+        private bool m_配料釜蒸汽阀;
+
+        public bool 反应釜蒸汽阀 { get { return m_反应釜蒸汽阀; } set { m_反应釜蒸汽阀 = value; OnPropertyChanged(); } }
+        private bool m_反应釜蒸汽阀;
+
+        public bool 反应釜蒸汽疏水阀 { get { return m_反应釜蒸汽疏水阀; } set { m_反应釜蒸汽疏水阀 = value; OnPropertyChanged(); } }
+        private bool m_反应釜蒸汽疏水阀;
+
+        public bool 反应釜冷却水阀 { get { return m_反应釜冷却水阀; } set { m_反应釜冷却水阀 = value; OnPropertyChanged(); } }
+        private bool m_反应釜冷却水阀;
+
+        public bool 配料罐自动升温 { get { return m_配料罐自动升温; } set { m_配料罐自动升温 = value; OnPropertyChanged(); } }
+        private bool m_配料罐自动升温;
+
+        public bool 反应釜自动升温 { get { return m_反应釜自动升温; } set { m_反应釜自动升温 = value; OnPropertyChanged(); } }
+        private bool m_反应釜自动升温;
+
+        public bool 系统启动 { get { return m_系统启动; } set { m_系统启动 = value; OnPropertyChanged(); } }
+        private bool m_系统启动;
+
+        public bool 手自动 { get { return m_手自动; } set { m_手自动 = value; OnPropertyChanged(); } }
+        private bool m_手自动;
+
+        public bool 反应釜冷却水排水阀 { get { return m_反应釜冷却水排水阀; } set { m_反应釜冷却水排水阀 = value; OnPropertyChanged(); } }
+        private bool m_反应釜冷却水排水阀;
+
+        public bool 分馏真空阀 { get { return m_分馏真空阀; } set { m_分馏真空阀 = value; OnPropertyChanged(); } }
+        private bool m_分馏真空阀;
+
+        public bool 蒸馏真空阀 { get { return m_蒸馏真空阀; } set { m_蒸馏真空阀 = value; OnPropertyChanged(); } }
+        private bool m_蒸馏真空阀;
+
+        public bool 空压机启动 { get { return m_空压机启动; } set { m_空压机启动 = value; OnPropertyChanged(); } }
+        private bool m_空压机启动;
+
+        public bool 水罐重量清零 { get { return m_水罐重量清零; } set { m_水罐重量清零 = value; OnPropertyChanged(); } }
+        private bool m_水罐重量清零;
+
+        public bool 反应釜自动降温 { get { return m_反应釜自动降温; } set { m_反应釜自动降温 = value; OnPropertyChanged(); } }
+        private bool m_反应釜自动降温;
+
+        public bool 反应釜出料阀 { get { return m_反应釜出料阀; } set { m_反应釜出料阀 = value; OnPropertyChanged(); } }
+        private bool m_反应釜出料阀;
+        public bool 反应釜排空阀 { get { return m_反应釜排空阀; } set { m_反应釜排空阀 = value; OnPropertyChanged(); } }
+        private bool m_反应釜排空阀;
+
+        public bool 配料釜蒸汽输水旁通阀 { get { return m_配料釜蒸汽输水旁通阀; } set { m_配料釜蒸汽输水旁通阀 = value; OnPropertyChanged(); } }
+        private bool m_配料釜蒸汽输水旁通阀;
+
+        public bool 反应釜蒸汽输水旁通阀 { get { return m_反应釜蒸汽输水旁通阀; } set { m_反应釜蒸汽输水旁通阀 = value; OnPropertyChanged(); } }
+        private bool m_反应釜蒸汽输水旁通阀;
+
+        public bool 心跳 { get { return m_心跳; } set { m_心跳 = value; OnPropertyChanged(); } }
+        private bool m_心跳;
+
+        public bool 闪蒸 { get { return m_闪蒸; } set { m_闪蒸 = value; OnPropertyChanged(); } }
+        private bool m_闪蒸;
+
+        public bool 真空蒸馏 { get { return m_真空蒸馏; } set { m_真空蒸馏 = value; OnPropertyChanged(); } }
+        private bool m_真空蒸馏;
+
+        public bool 真空下料 { get { return m_真空下料; } set { m_真空下料 = value; OnPropertyChanged(); } }
+        private bool m_真空下料;
+
+        public bool 二次闪蒸 { get { return m_二次闪蒸; } set { m_二次闪蒸 = value; OnPropertyChanged(); } }
+        private bool m_二次闪蒸;
+
+        public bool 排空阀 { get { return m_排空阀; } set { m_排空阀 = value; OnPropertyChanged(); } }
+        private bool m_排空阀;
+
+        #endregion
         public bool M101 { get { return _m101; } set { _m101 = value;OnPropertyChanged(); } }
         private bool _m101 = false;
         private int myVar;

BPASmartClient.Academy/Model/Simens_PLC.cs

@@ -259,6 +259,61 @@ namespace BPASmartClient.Academy.Model
                     deviceCtrl.OpenValue = o.Content;
                 });
                 PipeDetect();
+
+                siemens.Read<bool[]>("DB1.DBX1000.0", 32).OnSuccess((s) =>
+                {
+                    #region V1000
+                    deviceCtrl.配料罐搅拌电机 = s.Content[0];
+                    deviceCtrl.反应釜搅拌电机 = s.Content[1];
+                    deviceCtrl.真空泵 = s.Content[2];
+                    deviceCtrl.进料阀 = s.Content[3];
+                    deviceCtrl.蒸馏阀 = s.Content[4];
+                    deviceCtrl.回油阀 = s.Content[5];
+                    deviceCtrl.回水阀 = s.Content[6];
+                    deviceCtrl.汇馏阀 = s.Content[7];
+                    #endregion
+
+                    #region V1001
+                    deviceCtrl.排馏阀 = s.Content[8];
+                    deviceCtrl.冷凝器冷却阀 = s.Content[9];
+                    deviceCtrl.配料釜蒸汽阀 = s.Content[10];
+                    deviceCtrl.反应釜蒸汽阀 = s.Content[11];
+                    deviceCtrl.反应釜蒸汽疏水阀 = s.Content[12];
+                    deviceCtrl.反应釜冷却水阀 = s.Content[13];
+                    deviceCtrl.配料罐自动升温 = s.Content[14];
+                    deviceCtrl.反应釜自动升温 = s.Content[15];
+                    #endregion
+
+                    #region V1002
+                    deviceCtrl.系统启动 = s.Content[16];
+                    deviceCtrl.手自动 = s.Content[17];
+                    deviceCtrl.反应釜冷却水排水阀 = s.Content[18];
+                    deviceCtrl.分馏真空阀 = s.Content[19];
+                    deviceCtrl.蒸馏真空阀 = s.Content[20];
+                    deviceCtrl.空压机启动 = s.Content[21];
+                    //deviceCtrl.配料罐搅拌电机 = s.Content[22];
+                    deviceCtrl.水罐重量清零 = s.Content[23];
+                    #endregion
+
+                    #region V1003
+                    deviceCtrl.反应釜自动降温 = s.Content[24];
+                    deviceCtrl.反应釜出料阀 = s.Content[25];
+                    deviceCtrl.反应釜排空阀 = s.Content[26];
+                    deviceCtrl.配料釜蒸汽输水旁通阀 = s.Content[27];
+                    deviceCtrl.反应釜蒸汽输水旁通阀 = s.Content[28];
+                    //deviceCtrl.配料罐搅拌电机 = s.Content[29];
+                    //deviceCtrl.配料罐搅拌电机 = s.Content[30];
+                    deviceCtrl.心跳 = s.Content[31]; 
+                    #endregion
+                });
+                siemens.Read<bool[]>("DB1.DBX3000.0", 5).OnSuccess((s) =>
+                {
+                    deviceCtrl.闪蒸 = s.Content[0];
+                    deviceCtrl.真空蒸馏 = s.Content[1];
+                    deviceCtrl.真空下料 = s.Content[2];
+                    deviceCtrl.二次闪蒸 = s.Content[3];
+                    deviceCtrl.排空阀 = s.Content[4];
+                });
                 Thread.Sleep(100);
             }
         }

BPASmartClient.Academy/View/DeviceMotionView.xaml

@@ -101,8 +101,8 @@
             </Border>
         </Grid>
         <Grid
-            x:Name="ooo" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsHitTestVisible="False"
-            Opacity="0.5">
+            x:Name="ooo" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" d:IsHitTestVisible="True"
+            d:Opacity="1" IsHitTestVisible="False" Opacity="0.5">
             <Grid.RowDefinitions>
                 <RowDefinition />
                 <RowDefinition Height="0" />
@@ -389,7 +389,7 @@
                             <bpa:PipeLineH
                                 Width="65" Height="8" Margin="607,68,402,154"
                                 Direction="{Binding DeviceStatus.VX106, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
-                                Fill="{Binding DeviceStatus.VX106, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
+                                Fill="{Binding DeviceStatus.VX106, Converter={StaticResource deviceConvert}, ConverterParameter=6}"
                                 LineWidth="2" />
                             <bpa:HandValve
                                 x:Name="VX106" Width="30" Height="20" Margin="617,58,402,154"
@@ -509,7 +509,7 @@
                             <bpa:PipeLineV
                                 Width="12" Height="50" Margin="105,290,402,154"
                                 Direction="{Binding DeviceStatus.VX111, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
-                                Fill="{Binding DeviceStatus.VX111, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
+                                Fill="{Binding DeviceStatus.VX111, Converter={StaticResource deviceConvert}, ConverterParameter=6}"
                                 LineWidth="4" />
                             <bpa:HandValve
                                 x:Name="VX111" Width="35" Height="35" Margin="89,297,402,154"
@@ -530,16 +530,28 @@
                             <bpa:PipeLineH
                                 Width="95" Height="12" Margin="105,278,402,154"
                                 Direction="{Binding PipeLine.PipeH_3.Direction}"
-                                Fill="{Binding PipeLine.PipeH_3.Fill, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="4" />
+                                LineWidth="4">
+                                <bpa:PipeLineH.Fill>
+                                    <MultiBinding Converter="{StaticResource MultiBoolToColorConverter}" ConverterParameter="Lime,Red">
+                                        <Binding Path="DeviceStatus.VX111" />
+                                        <Binding Path="DeviceStatus.VX108" />
+                                    </MultiBinding>
+                                </bpa:PipeLineH.Fill>
+                            </bpa:PipeLineH>
                             <!--#endregion-->
 
                             <!--#region  阀门10-11连接-->
                             <bpa:PipeLineH
                                 Width="95" Height="12" Margin="265,278,402,154"
                                 Direction="{Binding PipeLine.PipeH_2.Direction}"
-                                Fill="{Binding PipeLine.PipeH_2.Fill, Converter={StaticResource deviceConvert}, ConverterParameter=6}"
-                                LineWidth="4" />
+                                LineWidth="4">
+                                <bpa:PipeLineH.Fill>
+                                    <MultiBinding Converter="{StaticResource MultiBoolToColorConverter}" ConverterParameter="Lime,Red">
+                                        <Binding Path="DeviceStatus.VX110" />
+                                        <Binding Path="DeviceStatus.VX109" />
+                                    </MultiBinding>
+                                </bpa:PipeLineH.Fill>
+                            </bpa:PipeLineH>
                             <!--#endregion-->
 
                             <!--#region  阀门13分馏真空阀-->

BPASmartClient.Academy/View/DeviceMotion_2View.xaml

@@ -388,7 +388,7 @@
                             <bpa:PipeLineH
                                 Width="65" Height="8" Margin="607,68,402,154"
                                 Direction="{Binding DeviceStatus.VX106, Converter={StaticResource deviceConvert}, ConverterParameter=5}"
-                                Fill="{Binding DeviceStatus.VX106, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
+                                Fill="{Binding DeviceStatus.VX106, Converter={StaticResource deviceConvert}, ConverterParameter=6}"
                                 LineWidth="2" />
                             <bpa:HandValve
                                 x:Name="VX106" Width="30" Height="20" Margin="617,58,402,154"
@@ -406,7 +406,8 @@
                                 Canvas.Left="179" Canvas.Top="74" Width="30" Height="25"
                                 OpenEnable="{Binding DeviceStatus.VX107}" />
                             <TextBlock
-                                Canvas.Left="160" Canvas.Top="54" Foreground="White" Text="配料釜蒸汽阀" />
+                                Canvas.Left="151" Canvas.Top="53" Foreground="White" RenderTransformOrigin="0.325,0.551"
+                                Text="配料釜蒸汽阀" />
                             <!--#endregion-->
 
                             <!--#region  阀门9 反应釜蒸汽阀-->
@@ -508,7 +509,7 @@
                             <bpa:PipeLineV
                                 Width="12" Height="50" Margin="105,290,402,154"
                                 Direction="{Binding DeviceStatus.VX111, Converter={StaticResource deviceConvert}, ConverterParameter=1}"
-                                Fill="{Binding DeviceStatus.VX111, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
+                                Fill="{Binding DeviceStatus.VX111, Converter={StaticResource deviceConvert}, ConverterParameter=6}"
                                 LineWidth="4" />
                             <bpa:HandValve
                                 x:Name="VX111" Width="35" Height="35" Margin="89,297,402,154"
@@ -529,16 +530,28 @@
                             <bpa:PipeLineH
                                 Width="95" Height="12" Margin="105,278,402,154"
                                 Direction="{Binding PipeLine.PipeH_3.Direction}"
-                                Fill="{Binding PipeLine.PipeH_3.Fill, Converter={StaticResource deviceConvert}, ConverterParameter=2}"
-                                LineWidth="4" />
+                                LineWidth="4">
+                                <bpa:PipeLineH.Fill>
+                                    <MultiBinding Converter="{StaticResource MultiBoolToColorConverter}" ConverterParameter="Lime,Red">
+                                        <Binding Path="DeviceStatus.VX111" />
+                                        <Binding Path="DeviceStatus.VX108" />
+                                    </MultiBinding>
+                                </bpa:PipeLineH.Fill>
+                            </bpa:PipeLineH>
                             <!--#endregion-->
 
                             <!--#region  阀门10-11连接-->
                             <bpa:PipeLineH
                                 Width="95" Height="12" Margin="265,278,402,154"
                                 Direction="{Binding PipeLine.PipeH_2.Direction}"
-                                Fill="{Binding PipeLine.PipeH_2.Fill, Converter={StaticResource deviceConvert}, ConverterParameter=6}"
-                                LineWidth="4" />
+                                LineWidth="4">
+                                <bpa:PipeLineH.Fill>
+                                    <MultiBinding Converter="{StaticResource MultiBoolToColorConverter}" ConverterParameter="Lime,Red">
+                                        <Binding Path="DeviceStatus.VX110" />
+                                        <Binding Path="DeviceStatus.VX109" />
+                                    </MultiBinding>
+                                </bpa:PipeLineH.Fill>
+                            </bpa:PipeLineH>
                             <!--#endregion-->
 
                             <!--#region  阀门13分馏真空阀-->
@@ -617,7 +630,7 @@
 
                             <!--#region  反应釜搅拌-->
                             <TextBlock
-                                Canvas.Left="170" Canvas.Top="150"
+                                Canvas.Left="187" Canvas.Top="150" HorizontalAlignment="Left" VerticalAlignment="Center"
                                 Foreground="{Binding DeviceStatus.M102, Converter={StaticResource deviceConvert}, ConverterParameter=4}"
                                 Text="反应釜搅拌" />
 
@@ -751,16 +764,16 @@
                                 Foreground="{Binding DeviceStatus.ByPassMaterial, Converter={StaticResource BoolToColorConverter}}"
                                 Text="⚫" TextAlignment="Center" />
                             <TextBlock
-                                Canvas.Left="245" Canvas.Top="53.5" Canvas.Right="384.8" HorizontalAlignment="Center"
-                                VerticalAlignment="Top" Foreground="White" Text="配料釜旁通阀" TextAlignment="Center" />
+                                Canvas.Left="237" Canvas.Top="52" Canvas.Right="384.8" HorizontalAlignment="Center"
+                                VerticalAlignment="Top" Foreground="White" Text="配料釜旁通阀反馈" TextAlignment="Center" />
                             <TextBlock
-                                Canvas.Left="-80" Canvas.Top="20" HorizontalAlignment="Center" VerticalAlignment="Top"
+                                Canvas.Left="-75" Canvas.Top="27" HorizontalAlignment="Left" VerticalAlignment="Center"
                                 d:Foreground="Red"
                                 Foreground="{Binding DeviceStatus.ByPassReact, Converter={StaticResource BoolToColorConverter}}"
                                 Text="⚫" TextAlignment="Center" />
                             <TextBlock
-                                Canvas.Left="-107" Canvas.Top="40" Canvas.Right="384.8" HorizontalAlignment="Center"
-                                VerticalAlignment="Top" Foreground="White" Text="反应釜旁通阀" TextAlignment="Center" />
+                                Canvas.Left="-116" Canvas.Top="42" Canvas.Right="384.8" HorizontalAlignment="Left"
+                                VerticalAlignment="Center" Foreground="White" Text="反应釜旁通阀反馈" TextAlignment="Center" />
                             <!--#endregion-->
 
                             <!--#region  水罐重量清零-->
@@ -907,7 +920,7 @@
                                     Tag="9" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="150" Canvas.Top="0" Orientation="Vertical">
+                                Canvas.Left="144" Canvas.Top="1" Orientation="Vertical">
                                 <RadioButton
                                     Width="90" Height="25" Margin="0,0,0,2" BorderThickness="0"
                                     Click="Open_Click" Content="配料釜蒸汽阀:开" FontSize="10" Foreground="White"
@@ -1072,7 +1085,8 @@
                                     Tag="35" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="-120" Canvas.Top="60" Orientation="Vertical">
+                                Canvas.Left="-113" Canvas.Top="60" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                Orientation="Vertical">
                                 <RadioButton
                                     Width="90" Height="22" Margin="0,0,0,2" BorderThickness="0"
                                     Click="Open_Click" Content="反应釜旁通阀:开" FontSize="10" Foreground="White"
@@ -1120,7 +1134,8 @@
                                     Tag="1" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="705" Canvas.Top="20" Orientation="Vertical">
+                                Canvas.Left="705" Canvas.Top="38" HorizontalAlignment="Center" VerticalAlignment="Top"
+                                Orientation="Vertical">
                                 <RadioButton
                                     Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
                                     Click="new_Click" Content="真空下料:开" FontSize="8" Foreground="White"
@@ -1135,7 +1150,8 @@
                                     Tag="2" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="785" Canvas.Top="20" Orientation="Vertical">
+                                Canvas.Left="785" Canvas.Top="38" HorizontalAlignment="Center" VerticalAlignment="Top"
+                                Orientation="Vertical">
                                 <RadioButton
                                     Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
                                     Click="new_Click" Content="二次闪蒸:开" FontSize="8" Foreground="White"
@@ -1150,7 +1166,8 @@
                                     Tag="3" />
                             </StackPanel>
                             <StackPanel
-                                Canvas.Left="745" Canvas.Top="70" Orientation="Vertical">
+                                Canvas.Left="745" Canvas.Top="84" HorizontalAlignment="Center" VerticalAlignment="Top"
+                                Orientation="Vertical">
                                 <RadioButton
                                     Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
                                     Click="new_Click" Content="排空阀:开" FontSize="8" Foreground="White"
@@ -1164,6 +1181,170 @@
                                     Style="{StaticResource radiobutton}"
                                     Tag="4" />
                             </StackPanel>
+                            <TextBlock
+                                Canvas.Left="-22" Canvas.Top="75" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.反应釜蒸汽输水旁通阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="-35" Canvas.Top="184" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.空压机启动, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="-79" Canvas.Top="253" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.反应釜蒸汽阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="-17" Canvas.Top="133" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.进料阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="-35" Canvas.Top="8" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.配料罐搅拌电机, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="168" Canvas.Top="66" HorizontalAlignment="Center" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.配料釜蒸汽阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="318" Canvas.Top="160" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.蒸馏阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="207" Canvas.Top="163" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.反应釜搅拌电机, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="-5" Canvas.Top="307" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.反应釜冷却水排水阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="171" Canvas.Top="324" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.反应釜出料阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="310" Canvas.Top="302" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.反应釜蒸汽疏水阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="420" Canvas.Top="243" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.反应釜冷却水阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="505" Canvas.Top="186" HorizontalAlignment="Center" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.回水阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="536" Canvas.Top="140" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.回油阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="650" Canvas.Top="46" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.冷凝器冷却阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="622" Canvas.Top="225" HorizontalAlignment="Center" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.汇馏阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="805" Canvas.Top="197" HorizontalAlignment="Center" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.分馏真空阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="665" Canvas.Top="309" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.蒸馏真空阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="632" Canvas.Top="334" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.排馏阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="540" Canvas.Top="350" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.水罐重量清零, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="838" Canvas.Top="332" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.真空泵, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="732" Canvas.Top="99" HorizontalAlignment="Center" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.反应釜排空阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="298" Canvas.Top="68" HorizontalAlignment="Center" VerticalAlignment="Top"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.配料釜蒸汽输水旁通阀, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="734" Canvas.Top="25" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.真空下料, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="815" Canvas.Top="25" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.二次闪蒸, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="815" Canvas.Top="9" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.真空蒸馏, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="734" Canvas.Top="9" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.闪蒸, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⬛" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="685" Canvas.Top="100" Width="18" HorizontalAlignment="Left"
+                                VerticalAlignment="Top" d:Foreground="Red"
+                                Foreground="{Binding DeviceStatus.VX115, Converter={StaticResource BoolToColorConverter}}"
+                                Text="⚫" TextAlignment="Center" />
+                            <TextBlock
+                                Canvas.Left="641" Canvas.Top="115" Canvas.Right="384.8" Width="103"
+                                HorizontalAlignment="Left" VerticalAlignment="Top" Foreground="White" Text="反应釜排空阀反馈"
+                                TextAlignment="Center" />
+                            <!--#endregion-->
+
+                            <!--#region 显示图例-->
+                            <!--<GroupBox
+                                Canvas.Left="860" Canvas.Top="465" Foreground="White" Header="显示图例">
+                                <StackPanel Orientation="Vertical">
+                                    <TextBlock
+                                        HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10" Foreground="Red"
+                                        Text=" ⬛  ：该阀/电机/功能指令为关闭" TextAlignment="Center" />
+                                    <TextBlock
+                                        HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10" Foreground="Green"
+                                        Text=" ⬛  ：该阀/电机/功能指令为打开" TextAlignment="Center" />
+                                    <TextBlock
+                                        HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10" Foreground="Red"
+                                        Text="⚫  ：该阀/电机/功能当前反馈状态为关闭" TextAlignment="Center" />
+                                    <TextBlock
+                                        HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10" Foreground="Green"
+                                        Text="⚫  ：该阀/电机/功能当前反馈状态为打开" TextAlignment="Center" />
+                                </StackPanel>
+                            </GroupBox>-->
                             <!--#endregion-->
                         </Canvas>
                     </Viewbox>
@@ -1241,12 +1422,12 @@
                                                     Style="{StaticResource radiobutton}" />
                                                 <RadioButton
                                                     Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
-                                                    Click="TempCLose_CLick" Content="停止" Foreground="White"
-                                                    IsChecked="True"
+                                                    Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
                                                     Style="{StaticResource radiobutton}" />
                                             </StackPanel>
                                         </WrapPanel>
-                                        <WrapPanel x:Name="wokTemp" Margin="0,15,0,0" Visibility="Collapsed">
+                                        <WrapPanel
+                                            x:Name="wokTemp" Margin="0,15,0,0" Visibility="Collapsed">
                                             <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
                                                 <TextBlock
                                                     Margin="40,0,20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
@@ -1263,12 +1444,12 @@
                                                     Style="{StaticResource radiobutton}" />
                                                 <RadioButton
                                                     Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
-                                                    Click="TempCLose_CLick" Content="停止" Foreground="White"
-                                                    IsChecked="True"
+                                                    Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
                                                     Style="{StaticResource radiobutton}" />
                                             </StackPanel>
                                         </WrapPanel>
-                                        <WrapPanel x:Name="wokCooling" Margin="0,15,0,0" Visibility="Collapsed">
+                                        <WrapPanel
+                                            x:Name="wokCooling" Margin="0,15,0,0" Visibility="Collapsed">
                                             <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
                                                 <TextBlock
                                                     Margin="40,0,20,0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
@@ -1285,8 +1466,7 @@
                                                     Style="{StaticResource radiobutton}" />
                                                 <RadioButton
                                                     Width="100" Height="30" Margin="40,0,0,0" BorderThickness="0"
-                                                    Click="TempCLose_CLick" Content="停止" Foreground="White"
-                                                    IsChecked="True"
+                                                    Click="TempCLose_CLick" Content="停止" Foreground="White" IsChecked="True"
                                                     Style="{StaticResource radiobutton}" />
                                             </StackPanel>
                                         </WrapPanel>

BPASmartClient.Academy/View/ReactionKettle50LView.xaml

@@ -660,7 +660,7 @@
                             Tag="反应釜压缩空气进气阀" />
                     </StackPanel>
                     <StackPanel
-                        Canvas.Left="509" Canvas.Top="446" HorizontalAlignment="Left" VerticalAlignment="Top"
+                        Canvas.Left="503" Canvas.Top="446" HorizontalAlignment="Left" VerticalAlignment="Center"
                         Panel.ZIndex="99" Orientation="Vertical">
                         <RadioButton
                             Width="70" Height="20" Margin="0,0,0,2" BorderThickness="0"
@@ -948,8 +948,8 @@
                         OpenEnable="{Binding DeviceStatus.ReactOutHotGasValve}" />
                     <!--  之前抽真空阀叫排热空气阀，后面改了  -->
                     <TextBlock
-                        Canvas.Left="613" Canvas.Top="272" Canvas.Right="384.8" HorizontalAlignment="Left"
-                        VerticalAlignment="Top" FontSize="12" Foreground="White" Text="抽真空阀"
+                        Canvas.Left="618" Canvas.Top="272" Canvas.Right="384.8" HorizontalAlignment="Left"
+                        VerticalAlignment="Center" FontSize="12" Foreground="White" Text="抽真空阀"
                         TextAlignment="Center" />
                     <!--#region 反应釜排水阀-->
                     <bpa:PipeLineV
@@ -1059,8 +1059,8 @@
                         Fill="{Binding DeviceStatus.ReactInBrineWaterValve, ConverterParameter=2, Converter={StaticResource deviceConvert}}"
                         LineWidth="1" Speed="1" />
                     <TextBlock
-                        Canvas.Left="583.798" Canvas.Top="446.79" Canvas.Right="240" HorizontalAlignment="Center"
-                        VerticalAlignment="Top" FontSize="12" Foreground="White" Text="进卤水阀" />
+                        Canvas.Left="574" Canvas.Top="447" Canvas.Right="240" HorizontalAlignment="Left"
+                        VerticalAlignment="Center" FontSize="12" Foreground="White" Text="进卤水阀" />
                     <bpa:MotorTwo
                         Canvas.Left="244" Canvas.Top="463" Canvas.Right="197.5" Width="25"
                         Height="12" HorizontalAlignment="Center" VerticalAlignment="Top">
@@ -1098,7 +1098,7 @@
                         Canvas.Left="744" Canvas.Top="61" Canvas.Right="255.9" Width="5"
                         Height="140" HorizontalAlignment="Center" VerticalAlignment="Top" LineWidth="1">
                         <bpa:PipeLineV.Fill>
-                            <MultiBinding Converter="{StaticResource MultiBoolToColorConverter}" ConverterParameter="Green,Red">
+                            <MultiBinding Converter="{StaticResource MultiBoolToColorConverter}" ConverterParameter="Lime,Red">
                                 <Binding Path="DeviceStatus.ReactInColdValve" />
                                 <Binding Path="DeviceStatus.ReactInSteamValue" />
                             </MultiBinding>
@@ -1278,6 +1278,22 @@
                             </TransformGroup>
                         </bpa:Joint.RenderTransform>
                     </bpa:Joint>
+                    <GroupBox Header="显示图例" Canvas.Left="860" Canvas.Top="465" Foreground="White">
+                        <StackPanel Orientation="Vertical">
+                            <TextBlock
+                                 HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10"
+                                Foreground="Red" Text=" ⬛  ：该阀/电机/功能指令为关闭" TextAlignment="Center" />
+                            <TextBlock
+                                 HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10"
+                                Foreground="Green" Text=" ⬛  ：该阀/电机/功能指令为打开" TextAlignment="Center" />
+                            <TextBlock
+                                 HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10"
+                                Foreground="Red" Text="⚫  ：该阀/电机/功能当前反馈状态为关闭" TextAlignment="Center" />
+                            <TextBlock
+                                 HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="10"
+                                Foreground="Green" Text="⚫  ：该阀/电机/功能当前反馈状态为打开" TextAlignment="Center" />
+                        </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"
@@ -1288,132 +1304,132 @@
                         Canvas.Left="85" Canvas.Top="166" Canvas.Right="384.8" Height="20"
                         HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetFans, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="170" Canvas.Top="106" Canvas.Right="384.8" Height="20"
                         HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetColdWaterTankVacuumValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="210" Canvas.Top="135" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="217" Canvas.Top="137" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetColdWaterTankInWaterValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="629" Canvas.Top="112" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="624" Canvas.Top="112" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetColdWaterTankInAirValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="636" Canvas.Top="168" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="640" Canvas.Top="173" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetHotGasEmptyValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="625" Canvas.Top="249" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="634" Canvas.Top="254" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactOutHotGasValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="480" Canvas.Top="213" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="491" Canvas.Top="211" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetStartEmptyWater, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="482" Canvas.Top="263" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="490" Canvas.Top="262" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactDrainValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="427" Canvas.Top="258" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="435" Canvas.Top="262" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactOutColdValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="200" Canvas.Top="255" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="206" Canvas.Top="258" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetBrineTankZero, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="209" Canvas.Top="382" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="213" Canvas.Top="388" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetStartEnterBrine, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="382" Canvas.Top="383" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        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" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="549" Canvas.Top="393" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="554" 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" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="318" Canvas.Top="455" Canvas.Right="384.8" Height="20"
                         HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetBrinePumpState, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="39" Canvas.Top="462" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="49" Canvas.Top="465" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetBrineTankZero, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
                         Canvas.Left="588" Canvas.Top="460" Canvas.Right="384.8" Height="20"
                         HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactInBrineWaterValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        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"
                         Foreground="{Binding DeviceStatus.IsSetStartClean, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="819" Canvas.Top="437" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="827" Canvas.Top="435" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetGoAddPosition, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="894" Canvas.Top="439" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="898" Canvas.Top="434" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactEnter, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="819" Canvas.Top="372" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="825" Canvas.Top="372" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactOut, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="894" Canvas.Top="372" Canvas.Right="384.8" Height="20"
+                        Canvas.Left="897" Canvas.Top="372" Canvas.Right="384.8" Height="20"
                         HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactHomeBit, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="968" Canvas.Top="373" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="972" Canvas.Top="372" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactReverse, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="941" Canvas.Top="307" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="950" Canvas.Top="305" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactTurnMotorJogging, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="934" Canvas.Top="120" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="938" Canvas.Top="124" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Center" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactTurnMotor, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="934" Canvas.Top="48" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="938" Canvas.Top="52" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetVacuumDistill, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <TextBlock
-                        Canvas.Left="797" Canvas.Top="85" Canvas.Right="384.8" Height="20"
-                        HorizontalAlignment="Left" VerticalAlignment="Top" d:Foreground="Red" FontSize="16"
+                        Canvas.Left="802" Canvas.Top="84" Canvas.Right="384.8" Height="20"
+                        HorizontalAlignment="Left" VerticalAlignment="Center" d:Foreground="Red" FontSize="16"
                         Foreground="{Binding DeviceStatus.IsSetReactPressureReliefValve, Converter={StaticResource BoolToColorConverter}}"
-                        Text="⚫" TextAlignment="Center" />
+                        Text="⬛" TextAlignment="Center" />
                     <!--#endregion-->
                 </Canvas>
             </Viewbox>