GasUI界面添加WAT 展示

Furnace/FurnaceGasPanelUI/Views/Maintenances/ELK/GasPanelView.xaml

@@ -570,6 +570,7 @@
                     <ColumnDefinition Width="10"/>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="20"/>
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition/>
@@ -660,22 +661,31 @@
                         </i:EventTrigger>
                     </i:Interaction.Triggers>
                 </Button>
-                <TextBlock
-                    Grid.Row="0"
-                    Grid.Column="4"
-                    HorizontalAlignment="Center"
-                    FontFamily="Calibri"
-                    FontSize="12">
-                    WAT
-                </TextBlock>
+                <Border  HorizontalAlignment="Center"     Grid.ColumnSpan="2"   Grid.Row="0"   Grid.Column="4" >
+                    <TextBlock Text="WAT"    FontFamily="Calibri"    FontSize="12"></TextBlock>
+                </Border>
+
+                <Border  Grid.Row="0" Grid.Column="3"      Grid.RowSpan="2"      Margin="47,5,29,4"      BorderBrush="Gray"      BorderThickness="1,1,0,0" Grid.ColumnSpan="2"/>
+                <Border  Grid.Row="0" Grid.Column="4"      Grid.RowSpan="2"      Margin="47,5,0,4"      BorderBrush="Gray"      BorderThickness="0,1,1,0" Grid.ColumnSpan="2"/>
+                <Button
+               Grid.Row="3"
+               Grid.Column="4"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Center"
+               Background="{Binding WATBrush}"
+               Content="WAT"
+               FontFamily="Calibri"
+               FontSize="12">
+                   
+                </Button>
                 <deviceControl:AITSensor
-                    Grid.Row="3"
-                    Grid.Column="4"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    EnableToolTip="False"
-                    GreenColor="True"
-                    LightOnValue="{Binding VAC7}"/>
+           Grid.Row="3"
+           Grid.Column="5"
+           HorizontalAlignment="Center"
+           VerticalAlignment="Center"
+           EnableToolTip="False"
+           GreenColor="True"
+           LightOnValue="{Binding WATILK}"/>
             </Grid>
         </Canvas>
         <Border

Furnace/FurnaceGasPanelUI/Views/Maintenances/ELK/GasPanelViewModel.cs

@@ -375,6 +375,8 @@ namespace FurnaceGasPanelUI.Views.Maintenances.ELK
                 return backGroundStr;
             }
         }
+        [Subscription("PM1.SensorWAT.Value")]
+        public bool WATILK { get; set; }
         [Subscription("PM1.IsCEXHOn")]
         public bool IsCEXHOn { get; set; }
         public string CEXHBrush
@@ -388,6 +390,21 @@ namespace FurnaceGasPanelUI.Views.Maintenances.ELK
                 return backGroundStr;
             }
         }
+
+        [Subscription("PM1.IsWATOn")]
+        public bool IsWATOn { get; set; }
+        public string WATBrush
+        {
+            get
+            {
+                if (IsWATOn)
+                {
+                    return "Green";
+                }
+                return backGroundStr;
+            }
+        }
+
         [Subscription("PM1.IsF2ClnOn")]
         public bool IsF2ClnOn { get; set; }
         public string F2ClnBrush
@@ -1538,6 +1555,9 @@ namespace FurnaceGasPanelUI.Views.Maintenances.ELK
                 case "DEPO":
                     dialog.IsOpen = IsDEPOOn;
                     break;
+                case "WAT":
+                    dialog.IsOpen = IsWATOn;
+                    break;
             }
 
             dialog.Owner = WinOwner;