Browse Source

git-svn-id: http://10.4.3.168:50001/svn/Furnace@25 dbcde07d-dcf5-c148-8a84-ac3097b7778e

Xiongbing 7 months ago
parent
commit
64b607f6e5

+ 1 - 0
Branch/NTP02/Furnace/FurnaceUI/Common/ConstantsCommon.cs

@@ -17,6 +17,7 @@ namespace FurnaceUI.Common
         public const string ED = "ED";
         public const string None = "None";
         public const string NTP = "NTP";
+        public const string NTP02 = "NTP02";
         public const string ELK = "ELK";
         public const string SIBCN = "SiBCN";
         public const string TiN = "TiN";

+ 263 - 0
Branch/NTP02/Furnace/FurnaceUI/Views/Operations/StatusView.xaml

@@ -1242,6 +1242,269 @@
                     </i:EventTrigger>
                 </i:Interaction.Triggers>
             </Button>
+            <Button  Visibility="{Binding IsNTP02Visibility}" Grid.Row="0" Grid.Column="0"  Margin="0,5,5,-11" Style="{StaticResource MainArea_Button}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" >
+                <ContentControl   >
+                    <Canvas  >
+                        <TextBlock Text="Gas" HorizontalAlignment="Center" Style="{StaticResource TextBlock_Title}" VerticalAlignment="Bottom"  FontSize="16" Margin="0" Canvas.Left="60"/>
+                        <Image Source="/FurnaceUI;component/Resources/images/icons/Gas44.png" Width="30" Canvas.Left="1"/>
+                        <Grid x:Name="PM1_Info5" Grid.Column="1" Visibility="{Binding IsPMAVisibility}" Height="460" Canvas.Top="30">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="0"/>
+                                <RowDefinition Height="20"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                                <RowDefinition Height="23"/>
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="60"/>
+                                <ColumnDefinition Width="60"/>
+                                <ColumnDefinition Width="60"/>
+                            </Grid.ColumnDefinitions>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="1" Grid.Column="0">
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="2" Grid.Column="0" >
+                                <Label Content="{Binding VG21Data.DisplayName}"  Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center"  VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="3" Grid.Column="0" >
+                                <Label Content="{Binding VG22Data.DisplayName}"  Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center"  VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="4" Grid.Column="0" >
+                                <Label Content="{Binding MFC1Data.DisplayName}"  Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center"  VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="5" Grid.Column="0" >
+                                <Label Content="{Binding MFC2Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="6" Grid.Column="0" >
+                                <Label Content="{Binding MFC3Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="7" Grid.Column="0" >
+                                <Label Content="{Binding MFC4Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="8" Grid.Column="0" >
+                                <Label Content="{Binding MFC5Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="9" Grid.Column="0" >
+                                <Label Content="{Binding MFC6Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="10" Grid.Column="0" >
+                                <Label Content="{Binding MFC7Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="11" Grid.Column="0" >
+                                <Label Content="{Binding MFC8Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="12" Grid.Column="0" >
+                                <Label Content="{Binding MFC9Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="13" Grid.Column="0" >
+                                <Label Content="{Binding MFC10Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="14" Grid.Column="0" >
+                                <Label Content="{Binding MFC11Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="15" Grid.Column="0" >
+                                <Label Content="{Binding MFC12Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="16" Grid.Column="0" >
+                                <Label Content="{Binding MFC13Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="17" Grid.Column="0" >
+                                <Label Content="{Binding MFC14Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="18" Grid.Column="0" >
+                                <Label Content="{Binding MFC15Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="19" Grid.Column="0" >
+                                <Label Content="{Binding MFC16Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="20" Grid.Column="0" >
+                                <Label Content="{Binding MFC51Data.DisplayName}" Foreground="{DynamicResource FG_Black}" FontSize="13" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,1,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="1" Grid.Column="1">
+                                <TextBlock Text="Actual" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,1,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="1" Grid.Column="2">
+                                <TextBlock Text="Set" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="2" Grid.Column="1">
+                                <TextBlock Text="{Binding VG21Data.FeedBack,StringFormat={}{0:f3}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="2" Grid.Column="2">
+                                <TextBlock Text="{Binding VG21Data.SetPoint,StringFormat={}{0:f3}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="1">
+                                <TextBlock Text="{Binding VG22Data.FeedBack,StringFormat={}{0:f3}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="2">
+                                <TextBlock Text="{Binding VG22Data.SetPoint,StringFormat={}{0:f3}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC1Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC1Data.SetPoint,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="5" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC2Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="5" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC2Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="6" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC3Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="6" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC3Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="7" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC4Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="7" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC4Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="8" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC5Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="8" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC5Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="9" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC6Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="9" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC6Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="10" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC7Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="10" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC7Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="11" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC8Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="11" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC8Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="12" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC9Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="12" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC9Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="13" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC10Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="13" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC10Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="14" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC11Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="14" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC11Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="15" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC12Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="15" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC12Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="16" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC13Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="16" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC13Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="17" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC14Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="17" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC14Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="18" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC15Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="18" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC15Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="19" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC16Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="19" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC16Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="20" Grid.Column="1">
+                                <TextBlock Text="{Binding MFC51Data.FeedBack,StringFormat={}{0:f1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="20" Grid.Column="2">
+                                <TextBlock Text="{Binding MFC51Data.SetPoint,StringFormat={}{0:f1}}"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                            </Border>
+                            <Label Content="{Binding DefaultUnit}" Grid.Row="2" Grid.Column="3"/>
+                            <Label Content="{Binding DefaultUnit}" Grid.Row="3" Grid.Column="3"/>
+                            <Label Content="{Binding MFC1Data.Unit}" Grid.Row="4" Grid.Column="3"/>
+                            <Label Content="{Binding MFC2Data.Unit}" Grid.Row="5" Grid.Column="3"/>
+                            <Label Content="{Binding MFC3Data.Unit}" Grid.Row="6" Grid.Column="3"/>
+                            <Label Content="{Binding MFC4Data.Unit}" Grid.Row="7" Grid.Column="3"/>
+                            <Label Content="{Binding MFC5Data.Unit}" Grid.Row="8" Grid.Column="3"/>
+                            <Label Content="{Binding MFC6Data.Unit}" Grid.Row="9" Grid.Column="3"/>
+                            <Label Content="{Binding MFC7Data.Unit}" Grid.Row="10" Grid.Column="3"/>
+                            <Label Content="{Binding MFC8Data.Unit}" Grid.Row="11" Grid.Column="3"/>
+                            <Label Content="{Binding MFC9Data.Unit}" Grid.Row="12" Grid.Column="3"/>
+                            <Label Content="{Binding MFC10Data.Unit}" Grid.Row="13" Grid.Column="3"/>
+                            <Label Content="{Binding MFC11Data.Unit}" Grid.Row="14" Grid.Column="3"/>
+                            <Label Content="{Binding MFC12Data.Unit}" Grid.Row="15" Grid.Column="3"/>
+                            <Label Content="{Binding MFC13Data.Unit}" Grid.Row="16" Grid.Column="3"/>
+                            <Label Content="{Binding MFC14Data.Unit}" Grid.Row="17" Grid.Column="3"/>
+                            <Label Content="{Binding MFC15Data.Unit}" Grid.Row="18" Grid.Column="3"/>
+                            <Label Content="{Binding MFC16Data.Unit}" Grid.Row="19" Grid.Column="3"/>
+                            <Label Content="{Binding MFC51Data.Unit}" Grid.Row="20" Grid.Column="3"/>
+                            <Grid.Resources>
+                                <Style TargetType="Label">
+                                    <Setter Property="HorizontalContentAlignment" Value="Left"/>
+                                    <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                </Style>
+                            </Grid.Resources>
+                        </Grid>
+                    </Canvas>
+
+                </ContentControl>
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="Click">
+                        <cal:ActionMessage MethodName="SwitchPage">
+                            <cal:Parameter Value="Gas"/>
+                        </cal:ActionMessage>
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+            </Button>
+
             <Button  Visibility="{Binding IsELKVisibility}"  Grid.Row="0" Grid.Column="0" Margin="0,5,5,-11" Style="{StaticResource MainArea_Button}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" >
                 <ContentControl   >
                    

+ 15 - 1
Branch/NTP02/Furnace/FurnaceUI/Views/Operations/StatusViewModel.cs

@@ -608,6 +608,20 @@ namespace FurnaceUI.Views.Operations
                 NotifyOfPropertyChange(nameof(IsNTPVisibility));
             }
         }
+
+        private Visibility _IsNTP02Visibility;
+        public Visibility IsNTP02Visibility
+        {
+            get => _IsNTP02Visibility;
+            set
+            {
+                _IsNTP02Visibility = value;
+                NotifyOfPropertyChange(nameof(IsNTP02Visibility));
+            }
+        }
+
+        
+
         private Visibility _isSiBCNVisibility;
         public Visibility IsSiBCNVisibility
         {
@@ -1634,7 +1648,7 @@ namespace FurnaceUI.Views.Operations
             IsELKVisibility = toolType.Equals(ConstantsCommon.ELK) ? Visibility.Visible : Visibility.Collapsed;
             IsNTPVisibility = toolType.Equals(ConstantsCommon.NTP) ? Visibility.Visible : Visibility.Collapsed;
             IsSiBCNVisibility = toolType.Equals(ConstantsCommon.SIBCN) ? Visibility.Visible : Visibility.Collapsed;
-
+            IsNTP02Visibility= toolType.Equals(ConstantsCommon.NTP02) ? Visibility.Visible : Visibility.Collapsed;
 
         }