correct role

VirgoUI/MainView.xaml

@@ -140,7 +140,7 @@
                             <DropShadowEffect/>
                         </TextBlock.Effect>
                     </TextBlock>
-                    <Grid Grid.Column="1" Margin="10,8,0,8">
+                    <Grid Grid.Column="1" Margin="10,8,0,8" IsEnabled="{Binding PageEnabled}">
                         <Grid.RowDefinitions>
                             <RowDefinition/>
                             <RowDefinition/>
@@ -371,7 +371,7 @@
                                 <Border BorderBrush="{DynamicResource TopFrame_TableBD_Shadow}" BorderThickness="0,0,1,1" CornerRadius="0,0,5,0" Padding="5,2"/>
                             </Border>
                         </Grid>
-                        <StackPanel Grid.Column="7" Grid.RowSpan="3" VerticalAlignment="Center">
+                        <StackPanel Grid.Column="7" Grid.RowSpan="3" VerticalAlignment="Bottom" Margin="0,0,0,6">
                             <Grid Margin="5,0,0,0">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition />

VirgoUI/MainViewModel.cs

@@ -38,6 +38,7 @@ using VirgoCommon;
 using VirgoUI.Client.Models.History.Statistics;
 using VirgoUI.Client.Models.Operate.WaferAssociation;
 using VirgoUI.Client.Models.PMs;
+using VirgoUI.Client.Models.Sys;
 using Cali = Caliburn.Micro.Core;
 
 namespace VirgoUI.Client

VirgoUI/Models/Operate/Overview/OverView.xaml

@@ -228,6 +228,7 @@
 
                     </Canvas>
                 </Viewbox>
+                <Image HorizontalAlignment="Left" Height="100" Margin="754,643,0,0" VerticalAlignment="Top" Width="100"/>
             </Grid>
 
             <TabControl Grid.Column="1" Margin="0,5,0,85">

VirgoUI/Models/PMs/RecipeEditorView.xaml

@@ -29,40 +29,40 @@
                 <StackPanel VerticalAlignment="Bottom" IsEnabled="{Binding PageEnabled}">
                     <StackPanel Orientation="Horizontal">
                         <Button Content="New" Width="85" Height="30" Style="{StaticResource MiddleButton}" Click="ButtonNew">
- 
+
                         </Button>
                         <Button Content="Rename" Margin="10,0,0,0" Width="85" Height="30" Style="{StaticResource MiddleButton}" Click="ButtonRename">
- 
+
                         </Button>
                         <Button Content="Delete" Margin="10,0,0,0" Width="85" Height="30" Style="{StaticResource MiddleButton}" Click="ButtonDelete">
- 
+
                         </Button>
                     </StackPanel>
 
                     <TextBlock Text="Recipe List" Margin="5" FontFamily="Arial" FontSize="14" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
                 </StackPanel>
-                
+
             </Border>
-        <Border Grid.Row="1" BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Padding="5,1">
+            <Border Grid.Row="1" BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Padding="5,1">
                 <TreeView Name="treeViewRcpList" Margin="0,6" SelectedItemChanged="treeViewRcpList_SelectedItemChanged" MouseRightButtonDown="treeViewRcpList_MouseRightButtonDown" MouseMove="TreeViewRcpList_MouseMove"
                       FontSize="14" BorderThickness="1" BorderBrush="Black" Canvas.Top="140" Canvas.Left="4" Opacity="1" Background="LightSteelBlue" PreviewMouseDown="TreeViewRcpList_MouseDown"  AllowDrop="True" 
                       DragEnter="TreeViewRcpList_DragEnter"  DragOver="TreeViewRcpList_DragEnter" DragLeave="TreeViewRcpList_DragEnter" Drop="TreeViewRcpList_Drop">
-                <TreeView.ItemContainerStyle>
-                    <Style TargetType="{x:Type TreeViewItem}">
-                        <EventSetter Event="TreeViewItem.PreviewMouseRightButtonDown" Handler="TreeViewItem_MouseRightButtonDown" />
-                    </Style>
-                </TreeView.ItemContainerStyle>
-            </TreeView>
+                    <TreeView.ItemContainerStyle>
+                        <Style TargetType="{x:Type TreeViewItem}">
+                            <EventSetter Event="TreeViewItem.PreviewMouseRightButtonDown" Handler="TreeViewItem_MouseRightButtonDown" />
+                        </Style>
+                    </TreeView.ItemContainerStyle>
+                </TreeView>
             </Border>
         </Grid>
- 
+
         <GridSplitter Grid.Column="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Background="Transparent" />
-        <Grid x:Name="gridDisplay" Grid.Column="2">
+        <Grid x:Name="gridDisplay" Grid.Column="2" IsEnabled="{Binding PageEnabled}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="40" />
                 <RowDefinition Height="706*" />
             </Grid.RowDefinitions>
-            <StackPanel Grid.Row="0" Orientation="Horizontal" IsEnabled="{Binding PageEnabled}">
+            <StackPanel Grid.Row="0" Orientation="Horizontal">
                 <Label  Content="{DynamicResource GlobalLableCurrentRecipe}" FontSize="15" Height="31" HorizontalAlignment="Left" HorizontalContentAlignment="Center" Margin="5,3,0,0" Name="label2" VerticalAlignment="Top"  FontWeight="Normal" />
 
                 <Label Height="31" Margin="22,3,0,0" Name="labelSelectedRecipe" VerticalAlignment="Top"  Content="{Binding Path=CurrentRecipeName}" FontSize="15" HorizontalContentAlignment="Left" HorizontalAlignment="Left"   FontWeight="Normal" />
@@ -73,12 +73,16 @@
                             <MenuItem Name="SaveToSingle" Click="SaveToSingle_Click"/>
                             <MenuItem Name="SaveToDouble" Click="SaveToDouble_Click" />
                         </ContextMenu>
-                        </Button.ContextMenu>
+                    </Button.ContextMenu>
                 </Button>
             </StackPanel>
 
             <Grid Grid.Row="1">
-                <core:RecipeEditorControl x:Name="tableRecipeGrid" FontSize="12" BorderThickness="1" BorderBrush="Black" Margin="0,0,0,6" />
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="13*"/>
+                    <ColumnDefinition Width="1601*"/>
+                </Grid.ColumnDefinitions>
+                <core:RecipeEditorControl x:Name="tableRecipeGrid" FontSize="12" BorderThickness="1" BorderBrush="Black" Margin="0,0,0,6" Grid.ColumnSpan="2" />
             </Grid>
         </Grid>
     </Grid>

VirgoUI/Models/Recipe/Sequence/SequenceView.xaml

@@ -323,7 +323,7 @@
                 </TreeView>
             </Border>
         </Grid>
-        <Grid Grid.Column="1">
+        <Grid Grid.Column="1" IsEnabled="{Binding PageEnabled}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition />
@@ -380,7 +380,7 @@
                     <RowDefinition />
                 </Grid.RowDefinitions>
                 <Grid>
-                    <StackPanel Orientation="Horizontal" IsEnabled="{Binding PageEnabled}">
+                    <StackPanel Orientation="Horizontal">
                         <Button Content="Append" Width="90" Height="30" IsEnabled="{Binding EnableStep}">
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="Click">

VirgoUI/Models/Utility/Role/RoleView.xaml

@@ -181,7 +181,6 @@
                                   ScrollViewer.VerticalScrollBarVisibility="Auto"
                                   ScrollViewer.CanContentScroll="True"
                                   ItemsSource="{Binding Path=TreeSelectedRole.MenuCollection}">
-
                             <ListView.View>
                                 <GridView>
                                     <GridViewColumn Width="200" Header="Menu Name" DisplayMemberBinding="{Binding Name}"/>
@@ -189,7 +188,7 @@
                                         <GridViewColumn.CellTemplate>
                                             <DataTemplate >
                                                 <ComboBox Width="140" x:Name="combPermission"
-                                                DisplayMemberPath="StringPermission"
+                                                DisplayMemberPath="StringPermission" IsEnabled="{Binding PageEnabled}"
                                                 SelectedIndex="{Binding DisplayIndexPermission}"                                                                          
                                                 ItemsSource="{Binding DataContext.PermissionDictionary,
                                                 RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}">

VirgoUI/Models/Utility/SystemConfig/SystemConfigView.xaml

@@ -121,12 +121,12 @@
 
         </GridSplitter>
 
-        <Grid Grid.Column="1" Margin="10,0,0,0">
+        <Grid Grid.Column="1" Margin="10,0,0,0" IsEnabled="{Binding PageEnabled}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition />
             </Grid.RowDefinitions>
-            <StackPanel Orientation="Horizontal" IsEnabled="{Binding PageEnabled}">
+            <StackPanel Orientation="Horizontal">
                 <Border  BorderBrush="{DynamicResource Table_BD}" BorderThickness="1" Margin="0,3,0,0" Background="{DynamicResource Table_BG_Content}" Width="220">
                     <TextBlock  TextAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0"  TextWrapping="Wrap" Text="{Binding CurrentNodeName}"></TextBlock>
                 </Border>