bug修改

BPASmartClient.Academy/Model/DeviceCtrl.cs

@@ -135,7 +135,7 @@ namespace BPASmartClient.Academy.Model
         private bool _vx103 = false;
         public bool VX104 { get { return _vx104; } set { _vx104 = value; OnPropertyChanged(); } }
         private bool _vx104 = false;
-        public bool VX105 { get { return _vx100; } set { _vx100 = value; OnPropertyChanged(); } }
+        public bool VX105 { get { return _vx105; } set { _vx105 = value; OnPropertyChanged(); } }
         private bool _vx105 = false;
 
         public bool VX106 { get { return _vx106; } set { _vx106 = value; OnPropertyChanged(); } }

BPASmartClient.Academy/View/DeviceMotionView.xaml.cs

@@ -110,7 +110,7 @@ namespace BPASmartClient.Academy.View
         private void Open_Click(object sender, RoutedEventArgs e)
         {
             RadioButton radioButton = sender as RadioButton;
-            if (radioButton.Content.ToString().Contains("配料搅拌"))
+            if (radioButton.Content.ToString().Contains("配料釜搅拌"))
             {
                 hzSet.Visibility = Visibility.Visible;
                 motorName.Text = "配料搅拌频率:";

BPASmartClient.Academy/View/DeviceMotion_2View.xaml

@@ -861,7 +861,7 @@
                                 </StackPanel>
                                 <TextBlock
                                     Margin="3,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" d:Foreground="Red"
-                                    Foreground="{Binding DeviceStatus.反应釜排空阀, Converter={StaticResource BoolToColorConverter}}"
+                                    Foreground="{Binding DeviceStatus.排空阀, Converter={StaticResource BoolToColorConverter}}"
                                     Text="⬛" TextAlignment="Center" />
                             </StackPanel>
                             <StackPanel

BPASmartClient.Academy/View/DeviceMotion_2View.xaml.cs

@@ -98,7 +98,7 @@ namespace BPASmartClient.Academy.View
         private void Open_Click(object sender, RoutedEventArgs e)
         {
             RadioButton radioButton = sender as RadioButton;
-            if (radioButton.Content.ToString().Contains("配料搅拌"))
+            if (radioButton.Content.ToString().Contains("配料釜搅拌"))
             {
                 hzSet.Visibility = Visibility.Visible;
                 motorName.Text = "配料搅拌频率:";

BPASmartClient.Academy/View/ReactionKettle50LView.xaml

@@ -1394,15 +1394,28 @@
                             <!--#endregion-->
                             <!--#region 进卤水启动-->
                             <StackPanel
-                                Width="127" Margin="0,5" Orientation="Horizontal">
-                                <Button
+                                Width="127" Margin="10,5,0,5" Orientation="Horizontal">
+                                <StackPanel
+                                    HorizontalAlignment="Center" VerticalAlignment="Center" Panel.ZIndex="99" Orientation="Vertical">
+                                    <RadioButton
+                                        Width="90" Height="20" Margin="0,0,0,2" BorderThickness="0"
+                                        Click="open_Click" Content="进卤水启动:开" FontSize="8" Foreground="White"
+                                        Style="{StaticResource radiobutton}"
+                                        Tag="进卤水启动" />
+                                    <RadioButton
+                                        Width="90" Height="20" BorderThickness="0" Click="close_Click"
+                                        Content="进卤水启动:关" FontSize="8" Foreground="White" IsChecked="True"
+                                        Style="{StaticResource radiobutton}"
+                                        Tag="进卤水启动" />
+                                </StackPanel>
+                                <!--<Button
                                     Width="90" Height="20" Panel.ZIndex="99" Click="open_Click"
                                     Content="进卤水启动" FontSize="12" Foreground="White"
                                     Style="{StaticResource ButtonStyle}"
-                                    Tag="进卤水启动" />
+                                    Tag="进卤水启动" />-->
                                 <TextBlock
-                                    Height="20" HorizontalAlignment="Center" VerticalAlignment="Center" d:Foreground="Red"
-                                    FontSize="16"
+                                    Height="20" Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                    d:Foreground="Red" FontSize="16"
                                     Foreground="{Binding DeviceStatus.IsSetStartEnterBrine, Converter={StaticResource BoolToColorConverter}}"
                                     Text="⬛" TextAlignment="Center" />