ui界面优化

修复vat performance bug

Venus/Venus_Core/SerializeHelper.cs

@@ -454,6 +454,12 @@ namespace Venus_Unity
         /// <param name="path"></param>
         public void WriteToJsonFile(string content, string path)
         {
+            FileInfo fi = new FileInfo(path);
+            var di = fi.Directory;
+            if (!di.Exists)
+            {
+                di.Create();
+            }
             if (!File.Exists(path))  // 判断是否已有相同文件 
             {
                 FileStream fs1 = new FileStream(path, FileMode.Create, FileAccess.ReadWrite);
@@ -461,6 +467,7 @@ namespace Venus_Unity
                 fs1.Dispose();
                 fs1.Close();
             }
+           
             File.WriteAllText(path, ConvertJsonString(content));
         }
 

Venus/Venus_MainPages/Views/EfemView.xaml.cs

@@ -1,25 +1,6 @@
-using Aitex.Core.Common;
-using MECF.Framework.Common.CommonData;
-using MECF.Framework.Common.Equipment;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Venus_MainPages.ViewModels;
-using Venus_Themes.CustomControls;
-using Venus_Unity;
-using static Venus_Themes.UserControls.EFEM;
+
 
 namespace Venus_MainPages.Views
 {
@@ -32,41 +13,6 @@ namespace Venus_MainPages.Views
         public EfemView()
         {
             InitializeComponent();
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-
-        }
-
-        //private async void Button_Click(object sender, RoutedEventArgs e)
-        //{
-        //    //DoubleAnimation doubleAnimation = new DoubleAnimation();
-        //    //efem1.CurrentRobotPosition = RobotPosition.Original;
-        //    //efem1.RobotATAction = (WaferRobotTAction)Enum.Parse(typeof(WaferRobotTAction), cb1.Text);
-        //   // efem1.GoToPosition();
-
-        //}
-
-        //private async void Button_Click_1(object sender, RoutedEventArgs e)
-        //{
-        //    // robot1.RobotXAction = WaferRobotXAction.Extend;
-        //    //efem1.RobotAXAction = WaferRobotXAction.Extend;
-        //    //(this.DataContext as EfemViewModel).Robot1TAction = WaferRobotTAction.LP1;
-        //    //await Task.Delay(2000);
-        //    //(this.DataContext as EfemViewModel).Robot2TAction = WaferRobotTAction.LP2;
-        //    efem1.RobotAXAction = WaferRobotXAction.Extend;
-        //}
-
-        //private void Button_Click_2(object sender, RoutedEventArgs e)
-        //{
-        //    efem1.RobotAXAction = WaferRobotXAction.Retract;
-
-        //}
-
-        //private void Button_Click_3(object sender, RoutedEventArgs e)
-        //{
-        //    efem1.CurrentRobotPosition = (RobotPosition)Enum.Parse(typeof(RobotPosition), cb2.Text);
-        //}
+        }       
     }
 }

Venus/Venus_MainPages/Views/GasLeakCheckView.xaml

@@ -1365,7 +1365,7 @@
         </Canvas >
 
         <Canvas Visibility="{Binding GasIs8,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource bool2VisibilityConverter}}" Canvas.Left="500" Canvas.Top="110">
-            <Grid Width="380" Height="440" Background="White"  unity:GridOptions.ShowBorder="True"  unity:GridOptions.LineBrush="#afb4db">
+            <Grid Width="380" Height="440" Background="White"  unity:GridOptions.ShowBorder="True"  unity:GridOptions.LineBrush="#E5E6E7">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="40"/>
                     <RowDefinition/>
@@ -1390,7 +1390,7 @@
                     <ColumnDefinition Width="3*"/>
                     <ColumnDefinition Width="2*"/>
                 </Grid.ColumnDefinitions>
-                <TextBlock Grid.Row="0" Grid.ColumnSpan="2" Text="Leak Check Setting" FontSize="22"   Padding="90,5,0,0" Background="#6A82AD"/>
+                <TextBlock Grid.Row="0" Grid.ColumnSpan="2" Text="Leak Check Setting" FontSize="22"   Padding="90,5,0,0" Background="#FFFFFF"/>
                 <TextBlock Grid.Row="1"  Text="Pumping Time(s)" FontSize="15"   VerticalAlignment="Center" Padding="10" />
                 <TextBlock Grid.Row="2"  Text="Leak Check Time(s)" FontSize="15"   VerticalAlignment="Center" Padding="10" />
                 <TextBlock Grid.Row="3"  Text="{Binding PressureType, StringFormat=Leak Rate Limit({0}/min)}" FontSize="15"   VerticalAlignment="Center" Padding="10" />
@@ -1477,20 +1477,7 @@
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
                 </DataGridTextColumn>
-                <!--<DataGridTextColumn Width="120" Binding="{Binding EndPressure}"   CanUserSort="False" CanUserReorder="False" IsReadOnly="True" >
-                    <DataGridTextColumn.HeaderTemplate >
-                        <DataTemplate>
-                            <TextBlock Text="StopPressure" />
-                        </DataTemplate>
-                    </DataGridTextColumn.HeaderTemplate>
-                </DataGridTextColumn>
-                <DataGridTextColumn Width="120" Binding="{Binding LeakCheckTime}"   CanUserSort="False" CanUserReorder="False" IsReadOnly="True" >
-                    <DataGridTextColumn.HeaderTemplate >
-                        <DataTemplate>
-                            <TextBlock Text="Leak Check Time(s)" />
-                        </DataTemplate>
-                    </DataGridTextColumn.HeaderTemplate>
-                </DataGridTextColumn>-->
+
                 <DataGridTextColumn Width="120" Binding="{Binding LeakRate}"   CanUserSort="False" CanUserReorder="False" IsReadOnly="True" >
                     <DataGridTextColumn.HeaderTemplate >
                         <DataTemplate>

Venus/Venus_MainPages/Views/OperationOverView.xaml

@@ -348,8 +348,8 @@
                     </TextBlock.Text>
                 </TextBlock>
             </Grid>
-            <TextBlock Canvas.Top="465" Canvas.Left="230" Text="LLA" Visibility="{Binding LLAIsInstalled,Converter={StaticResource bool2VisibilityConverter}}"></TextBlock>
-            <TextBlock Canvas.Top="465" Canvas.Left="910" Text="LLB" Visibility="{Binding LLBIsInstalled,Converter={StaticResource bool2VisibilityConverter}}"></TextBlock>
+            <!--<TextBlock Canvas.Top="465" Canvas.Left="230" Text="LLA" Visibility="{Binding LLAIsInstalled,Converter={StaticResource bool2VisibilityConverter}}"></TextBlock>
+            <TextBlock Canvas.Top="465" Canvas.Left="910" Text="LLB" Visibility="{Binding LLBIsInstalled,Converter={StaticResource bool2VisibilityConverter}}"></TextBlock>-->
             <userControls:FOUPFrontView UnitData="{Binding LLAModuleInfo}" VerticalAlignment="Top" Canvas.Top="470" Canvas.Left="180" Visibility="{Binding LLAIsInstalled,Converter={StaticResource bool2VisibilityConverter}}" ShowTitle="True" IsEnabled="{Binding RtDataValues[LLA.IsOnline],Converter={StaticResource BoolToBool}}"/>
             <userControls:FOUPFrontView UnitData="{Binding LLBModuleInfo}" VerticalAlignment="Top" Canvas.Top="470" Canvas.Left="870" Visibility="{Binding LLBIsInstalled,Converter={StaticResource bool2VisibilityConverter}}" ShowTitle="True" IsEnabled="{Binding RtDataValues[LLB.IsOnline],Converter={StaticResource BoolToBool}}"/>
 

Venus/Venus_MainPages/Views/OverKepler2200AView.xaml

@@ -1144,21 +1144,21 @@
 
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="3*"/>
                 </Grid.ColumnDefinitions>
-                <TextBlock Grid.Row="0" Text="Recipe Name"        FontSize="15"  Padding="10,2,0,0"  Background="#FAFAFA"/>
-                <TextBlock Grid.Row="1" Text="Step Num/All"        FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>
-                <TextBlock Grid.Row="2" Text="Step Type"          FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>
-                <TextBlock Grid.Row="3" Text="Step Description"          FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>
-                <TextBlock Grid.Row="4" Text="Step Elpased Time"  FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>
-                <TextBlock Grid.Row="5" Text="Step Time(s)"       FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>
+                <TextBlock Grid.Row="0" Text="Recipe Name"        FontSize="15"  Padding="10,4,0,0"  Background="#FAFAFA"/>
+                <TextBlock Grid.Row="1" Text="Step Num/All"        FontSize="15"  Padding="10,4,0,0" Background="#FAFAFA"/>
+                <TextBlock Grid.Row="2" Text="Step Type"          FontSize="15"  Padding="10,4,0,0" Background="#FAFAFA"/>
+                <TextBlock Grid.Row="3" Text="Step Description"          FontSize="15"  Padding="10,4,0,0" Background="#FAFAFA"/>
+                <TextBlock Grid.Row="4" Text="Step Elpased Time"  FontSize="15"  Padding="10,4,0,0" Background="#FAFAFA"/>
+                <TextBlock Grid.Row="5" Text="Step Time(s)"       FontSize="15"  Padding="10,4,0,0" Background="#FAFAFA"/>
                 <!--<TextBlock Grid.Row="6" Text="Next Step"       FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>-->
-                <TextBlock Grid.Row="6" Text="Cycle Num/All"  FontSize="15" Padding="10,2,0,0" Background="#FAFAFA"/>
+                <TextBlock Grid.Row="6" Text="Cycle Num/All"  FontSize="15" Padding="10,4,0,0" Background="#FAFAFA"/>
 
 
-                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeName}" FontSize="15" Padding="10,2,0,0" Background="#FFFFFF"/>
-                <TextBlock Grid.Row="1" Grid.Column="1"   FontSize="15" Padding="10,2,0,0" Background="#FFFFFF">
+                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeName}" FontSize="15" Padding="10,4,0,0" Background="#FFFFFF"/>
+                <TextBlock Grid.Row="1" Grid.Column="1"   FontSize="15" Padding="10,4,0,0" Background="#FFFFFF">
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}{0}/{1}">
                             <Binding Path="CurrentRecipeResult.RecipeStepNumber"></Binding>

Venus/Venus_MainPages/Views/OverKepler2200BView.xaml

@@ -1159,21 +1159,21 @@
 
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="3*"/>
                 </Grid.ColumnDefinitions>
-                <TextBlock Grid.Row="0" Text="Recipe Name"         FontSize="15"  Padding="10,2,0,0"  Background="#FAFAFA"/>
-                <TextBlock Grid.Row="1" Text="Step Num/All"        FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>
-                <TextBlock Grid.Row="2" Text="Step Type"           FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>
-                <TextBlock Grid.Row="3" Text="Step Description"    FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>
-                <TextBlock Grid.Row="4" Text="Step Elpased Time"   FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>
-                <TextBlock Grid.Row="5" Text="Step Time(s)"        FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>
+                <TextBlock Grid.Row="0" Text="Recipe Name"         FontSize="15"  Padding="10,4,0,0"  Background="#FAFAFA"/>
+                <TextBlock Grid.Row="1" Text="Step Num/All"        FontSize="15"  Padding="10,4,0,0" Background="#FAFAFA"/>
+                <TextBlock Grid.Row="2" Text="Step Type"           FontSize="15"  Padding="10,4,0,0" Background="#FAFAFA"/>
+                <TextBlock Grid.Row="3" Text="Step Description"    FontSize="15"  Padding="10,4,0,0" Background="#FAFAFA"/>
+                <TextBlock Grid.Row="4" Text="Step Elpased Time"   FontSize="15"  Padding="10,4,0,0" Background="#FAFAFA"/>
+                <TextBlock Grid.Row="5" Text="Step Time(s)"        FontSize="15"  Padding="10,4,0,0" Background="#FAFAFA"/>
                 <!--<TextBlock Grid.Row="6" Text="Next Step"           FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>-->
-                <TextBlock Grid.Row="6" Text="Cycle Num/All"       FontSize="15"  Padding="10,2,0,0" Background="#FAFAFA"/>
+                <TextBlock Grid.Row="6" Text="Cycle Num/All"       FontSize="15"  Padding="10,4,0,0" Background="#FAFAFA"/>
 
 
-                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeName}" FontSize="15" Padding="10,2,0,0" Background="#FFFFFF"/>
-                <TextBlock Grid.Row="1" Grid.Column="1"   FontSize="15" Padding="10,2,0,0" Background="#FFFFFF">
+                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeName}" FontSize="15" Padding="10,4,0,0" Background="#FFFFFF"/>
+                <TextBlock Grid.Row="1" Grid.Column="1"   FontSize="15" Padding="10,4,0,0" Background="#FFFFFF">
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}{0}/{1}">
                             <Binding Path="CurrentRecipeResult.RecipeStepNumber"></Binding>

Venus/Venus_MainPages/Views/TMView.xaml

@@ -228,8 +228,8 @@
 
 
         <Canvas Canvas.Top="100" Canvas.Left="20">
-            <userControls:FOUPFrontView UnitData="{Binding LLAModuleInfo}" VerticalAlignment="Top" Canvas.Top="490" Canvas.Left="366" Visibility="{Binding LLAIsInstalled,Converter={StaticResource bool2VisibilityConverter}}"/>
-            <userControls:FOUPFrontView UnitData="{Binding LLBModuleInfo}" VerticalAlignment="Top" Canvas.Top="490" Canvas.Left="546" Visibility="{Binding LLBIsInstalled,Converter={StaticResource bool2VisibilityConverter}}"/>
+            <userControls:FOUPFrontView UnitData="{Binding LLAModuleInfo}" VerticalAlignment="Top" Canvas.Top="510" Canvas.Left="358" Visibility="{Binding LLAIsInstalled,Converter={StaticResource bool2VisibilityConverter}}"/>
+            <userControls:FOUPFrontView UnitData="{Binding LLBModuleInfo}" VerticalAlignment="Top" Canvas.Top="510" Canvas.Left="554" Visibility="{Binding LLBIsInstalled,Converter={StaticResource bool2VisibilityConverter}}"/>
 
             <Canvas Canvas.Top="-300" Canvas.Left="00" Width="450" Height="800">
                 <!--<userControls:MainTM Width="300" Height="250" Canvas.Left="380" Canvas.Top="90"/>-->

Venus/Venus_MainPages/Views/WaferAssociationUnit.xaml

@@ -6,6 +6,8 @@
              xmlns:unity="clr-namespace:Venus_MainPages.Unity"
              xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              mc:Ignorable="d" 
+             xmlns:customControls="clr-namespace:Venus_Themes.CustomControls;assembly=Venus_Themes"
+             
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              d:DesignHeight="450" d:DesignWidth="800" x:Name="WaferUnit">
     <Grid>
@@ -18,7 +20,7 @@
                 <RowDefinition Height="Auto"></RowDefinition>
                 <RowDefinition></RowDefinition>
             </Grid.RowDefinitions>
-            <Grid unity:GridOptions.ShowBorder="True" unity:GridOptions.LineBrush="Black"  unity:GridOptions.LineThickness="1">
+            <Grid unity:GridOptions.ShowBorder="True" unity:GridOptions.LineBrush="#E0E4E7" unity:GridOptions.LineThickness="2"  Background="#F5F7FA">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="30"></RowDefinition>
                     <RowDefinition Height="30"></RowDefinition>
@@ -32,28 +34,28 @@
 
                 <StackPanel Grid.Row="0" Orientation="Horizontal">
                     <TextBlock Text="Lot ID:" TextWrapping="Wrap"  Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="75"></TextBlock>
-                    <TextBox Text="{Binding WAInfo.LotId, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TextWrapping="Wrap"  Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="200" IsEnabled="False"></TextBox>
+                    <TextBox Text="{Binding WAInfo.LotId, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TextWrapping="Wrap"  Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="300" IsEnabled="False" Margin="5 0 0 0"></TextBox>
                 </StackPanel>
                 <StackPanel Grid.Row="1" Orientation="Horizontal">
                     
                     <TextBlock Text="Sequence:"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="80"></TextBlock>
 
-                    <ComboBox Width="240" x:Name="cb"  DropDownOpened="cb_DropDownOpened"  SelectionChanged="cb_SelectionChanged"/>
+                    <customControls:CustomComBobox Width="300" x:Name="cb"  DropDownOpened="cb_DropDownOpened"  SelectionChanged="cb_SelectionChanged" Margin="0 2 0 2"/>
 
 
                 </StackPanel>
                 <StackPanel Grid.Row="2" Orientation="Horizontal">
                     <TextBlock Text="Pre Clean:"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="80"></TextBlock>
-                    <ComboBox Width="240" x:Name="preComboBox"  DropDownOpened="preComboBox_DropDownOpened"  SelectionChanged="preComboBox_SelectionChanged"/>
+                    <customControls:CustomComBobox Width="300" x:Name="preComboBox"  DropDownOpened="preComboBox_DropDownOpened"  SelectionChanged="preComboBox_SelectionChanged" Margin="0 2 0 2"/>
                 </StackPanel>
                 <StackPanel Grid.Row="3" Orientation="Horizontal">
                     <TextBlock Text="Post Clean:"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="80"></TextBlock>
-                    <ComboBox Width="240" x:Name="postComboBox" DropDownOpened="postComboBox_DropDownOpened"  SelectionChanged="postComboBox_SelectionChanged"/>
+                    <customControls:CustomComBobox Width="300" x:Name="postComboBox" DropDownOpened="postComboBox_DropDownOpened"  SelectionChanged="postComboBox_SelectionChanged" Margin="0 3 0 3"/>
                 </StackPanel>
 
                 <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                     <Button Content="Select All"    Height="25"    Command="{Binding SelectAllCommand}"   CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}" Width="125" Click="SelectAllButton_Click"/>
-                    <Button Content="DeSelect All"  Height="25"    Command="{Binding UnSelectAllCommand}" CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}" Width="125" Click="UnSelectAllButton_Click"/>
+                    <Button Content="DeSelect All"  Height="25"    Command="{Binding UnSelectAllCommand}" CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}" Width="125" Click="UnSelectAllButton_Click" Margin="1 0 0 0"/>
                 </StackPanel>
                 
                 <Grid Grid.Row="5">
@@ -63,18 +65,16 @@
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="2*"/>
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" Text="Name" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center"></TextBlock>
+                    <TextBlock Grid.Column="0" Text="Name:" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center"></TextBlock>
+                    <TextBox   Grid.Column="1" IsEnabled="True" Text="{Binding WAInfo.JobID, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TextAlignment="Center" VerticalContentAlignment="Center" Margin="-10 3 5 3"/>
+                    <TextBlock Grid.Column="2" Text="Status:"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center"></TextBlock>
+                    <TextBox   Grid.Column="3" IsEnabled="True" Text="{Binding WAInfo.JobStatus, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TextAlignment="Center" VerticalContentAlignment="Center" Margin="-10 3 0 3"/>
 
-                    <TextBox Grid.Column="1" IsEnabled="True" Text="{Binding WAInfo.JobID, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TextAlignment="Center" VerticalContentAlignment="Center"/>
-
-                    <TextBox Grid.Column="3" IsEnabled="True" Text="{Binding WAInfo.JobStatus, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TextAlignment="Center" VerticalContentAlignment="Center"/>
-
-                    <TextBlock Text="Status" Grid.Column="2" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center"></TextBlock>
                    
                 </Grid>
                 <StackPanel Grid.Row="6" Orientation="Horizontal"  HorizontalAlignment="Center" VerticalAlignment="Center" >
                     <Button Content="Create Job" Width="120" Height="25"  Command="{Binding CreateJobCommand}" CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}"/>
-                    <Button Content="Abort Job"  Width="120" Height="25"  Command="{Binding AbortJobCommand}"  CommandParameter="{Binding WAInfo.JobID,RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"/>
+                    <Button Content="Abort Job"  Width="120" Height="25"  Command="{Binding AbortJobCommand}"  CommandParameter="{Binding WAInfo.JobID,RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="1 0 0 0"/>
                 </StackPanel>
                 <StackPanel Grid.Row="7" Orientation="Horizontal"  VerticalAlignment="Center" HorizontalAlignment="Center">
                     <Button Content="Start" Width="100" Height="25" Command="{Binding StartCommand}"  CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}"/>
@@ -88,26 +88,26 @@
                  ItemsSource="{Binding ElementName=WaferUnit,Path=WAInfo.ModuleData.WaferManager.Wafers}" Name="list1">
                 <ListBox.Resources>
                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource ResourceKey={x:Type ListBoxItem}}">
-                        <Setter Property="Rectangle.StrokeThickness" Value="0"/>
+                        <Setter Property="Rectangle.StrokeThickness" Value="1"/>
                     </Style>
                 </ListBox.Resources>
                 <ListBox.ItemTemplate>
                     <DataTemplate>
-                        <Grid Height="18">
+                        <Grid Height="18" Background="#F5F7FA">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                             </Grid.ColumnDefinitions>
-                            <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1"  Width="30" Padding="5,1">
+                            <Border BorderBrush="#E0E4E7" BorderThickness="1 1 1 0"  Width="30" Padding="5,1">
                                 <TextBlock Name="txtSlotIndex" Text="{Binding SlotIndex}" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center"></TextBlock>
                             </Border>
-                            <Border Grid.Column="1" BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Width="250" >
+                            <Border Grid.Column="1" BorderBrush="#E0E4E7" BorderThickness="0,0,1,1" Width="250" >
                                 <Border.Style>
                                     <Style>
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding WaferStatus}" Value="0">
-                                                <Setter Property="Border.Background" Value="AliceBlue"/>
+                                                <Setter Property="Border.Background" Value="#F5F7FA"/>
                                             </DataTrigger>
                                             <DataTrigger Binding="{Binding WaferStatus}" Value="1">
                                                 <Setter Property="Border.Background" Value="SkyBlue"/>
@@ -117,8 +117,8 @@
                                 </Border.Style>
                                 <TextBlock Name="txtSeqName" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=Text}" Text="{Binding SequenceName}" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
                             </Border>
-                           
-                            <Border  Grid.Column="2" BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,1,1,1"  Width="110" Padding="5,1" >
+
+                            <Border  Grid.Column="2" BorderBrush="Silver" BorderThickness="0 1 1 0"  Width="110" Padding="5,1" >
                                 <Button Width="60" Height="14"  Command="{Binding Path=DataContext.SetSequenceCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ListBox}}" CommandParameter="{Binding}" IsEnabled="{Binding ElementName=WaferUnit,Path=ButtonIsEnable}">
                                     <Button.Style>
                                         <Style TargetType="{x:Type Button}" BasedOn="{StaticResource ResourceKey={x:Type Button}}">
@@ -141,17 +141,7 @@
                 </ListBox.ItemTemplate>
             </ListBox>
 
-            <!--<Grid>
-                <Grid.Style>
-                    <Style>
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding WAInfo.ModuleData.IsInstalled, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Value="false">
-                                <Setter Property="Grid.Visibility" Value="Collapsed"/>
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </Grid.Style>
-            </Grid>-->
+
         </Grid>
     </Grid>
 </UserControl>

Venus/Venus_RT/Modules/PMs/PMProcessRoutine.cs

@@ -317,7 +317,7 @@ namespace Venus_RT.Modules.PMs
 
         private bool PreparePressure()
         {
-            if (_chamber.ProcessPressure < BasePressure)
+            if (_chamber.ProcessPressure < BasePressure && RtInstance.ConfigType==ConfigType.Kepler2200)
             {
                 _needPumpDown = false;
                 return true;
@@ -328,7 +328,7 @@ namespace Venus_RT.Modules.PMs
 
         private bool IsPressureReady()
         {
-            if (_needPumpDown == false)
+            if (_needPumpDown == false && RtInstance.ConfigType == ConfigType.Kepler2200)
             {
                 return true;
             }

Venus/Venus_Setup/Venus_RT.iss

@@ -34,7 +34,7 @@ Name: "chinesesimp"; MessagesFile: "compiler:Default.isl"
 
 [Files]
 Source: "..\Venus_RT\bin\Release\*";Excludes:"Config,Recipes,Logs,Objects,PartialPressureResult,VATPerformanceResult"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs
-Source: "..\Venus_RT\bin\Release\Config\*"; Excludes:"*.data,*.bak";DestDir: "{app}\Config";  Flags: recursesubdirs
+Source: "..\Venus_RT\bin\Release\Config\*"; Excludes:"*.data,*.bak,IoProviderConfig.xml";DestDir: "{app}\Config";  Flags: recursesubdirs
 
 
 [Icons]

Venus/Venus_Themes/Styles/Listview.xaml

@@ -12,7 +12,7 @@
     <SolidColorBrush x:Key="Listview_BG_Highlight" Color="#FF3399FF"/>
     <SolidColorBrush x:Key="Listview_BG_First" Color="#FFEEEEEE"/>
     <SolidColorBrush x:Key="Listview_BG_Second" Color="#FFDEDEDE"/>
-    <SolidColorBrush x:Key="Listview_Header_BG" Color="#FF95A7C6"/>
+    <SolidColorBrush x:Key="Listview_Header_BG" Color="#FFFFFF"/>
 
     <SolidColorBrush x:Key="Listview_Content_BD" Color="#FF999999"/>
 
@@ -95,10 +95,10 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="ListView.AlternationIndex" Value="0">
-                <Setter Property="Background" Value="{DynamicResource Listview_BG_First}"/>
+                <Setter Property="Background" Value="#F5F7FA"/>
             </Trigger>
             <Trigger Property="ListView.AlternationIndex" Value="1">
-                <Setter Property="Background" Value="{DynamicResource Listview_BG_Second}"/>
+                <Setter Property="Background" Value="#FFFFFF"/>
             </Trigger>
         </Style.Triggers>
     </Style>

Venus/Venus_Themes/UserControls/FOUPFrontView.xaml

@@ -14,8 +14,8 @@
     </UserControl.Resources>
     <Grid>
         <StackPanel>
-            <TextBlock Text="{Binding UnitData.ModuleData.ModuleID, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" FontFamily="Arial" Width="90" Height="16" TextAlignment="Center" FontSize="14" 
-                       TextWrapping="Wrap" FontWeight="{Binding UnitData.UnitFontWeight, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" 
+            <TextBlock Text="{Binding UnitData.ModuleID, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" FontFamily="Arial" Width="90" Height="16" TextAlignment="Center" FontSize="14" 
+                       TextWrapping="Wrap" FontWeight="{Binding UnitData.UnitFontWeight, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="0 0 0 5"
                        Foreground="{Binding UnitData.UnitNameForeground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding ShowTitle, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}},Converter={StaticResource bool2VisibilityConverter}}">
             </TextBlock>
             <Border BorderThickness="1" BorderBrush="{DynamicResource FOUP_OuterBD}" Background="White" HorizontalAlignment="Center" VerticalAlignment="Center" Width="130" Margin="0,0,0,5">