Browse Source

add DETMOperationView in UI

zhouhr 1 year ago
parent
commit
662fb997fa

+ 8 - 0
Venus/Venus_MainPages/Venus_MainPages.csproj

@@ -164,6 +164,7 @@
     <Compile Include="ViewModels\ButterflyValveViewModel.cs" />
     <Compile Include="ViewModels\CleanRecipeViewModel.cs" />
     <Compile Include="ViewModels\DataHistoryViewModel.cs" />
+    <Compile Include="ViewModels\DETMOperationViewModel.cs" />
     <Compile Include="ViewModels\EfemViewModel.cs" />
     <Compile Include="ViewModels\EventViewModel.cs" />
     <Compile Include="ViewModels\FAViewModel.cs" />
@@ -211,6 +212,9 @@
     <Compile Include="Views\DataHistoryView.xaml.cs">
       <DependentUpon>DataHistoryView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\DETMOperationView.xaml.cs">
+      <DependentUpon>DETMOperationView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\EfemView.xaml.cs">
       <DependentUpon>EfemView.xaml</DependentUpon>
     </Compile>
@@ -385,6 +389,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\DETMOperationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\EfemView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

+ 4 - 6
Venus/Venus_MainPages/Views/DETMOperationView.xaml

@@ -573,7 +573,7 @@
                 <TabItem Header="VCEB" Style="{StaticResource CustomTab}">
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height=".5*"/>
+                            <RowDefinition Height="*"/>
                             <RowDefinition Height="*"/>
                             <RowDefinition Height="*"/>
                             <RowDefinition Height="*"/>
@@ -613,7 +613,7 @@
                                 </Grid>
                             </Grid>
                         </Border>
-                        <Border  Grid.Row="1" Grid.Column="0"  Background="#95b3d7" Margin="5" Padding="20,40" CornerRadius="5">
+                        <Border  Grid.Row="1" Grid.Column="0"  Background="#95b3d7" Margin="5" Padding="20,10" CornerRadius="5">
                             <Grid>
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="*"/>
@@ -632,7 +632,7 @@
                                 <Button Grid.Column="2" Grid.Row="2"  Command="{Binding VCEClear}">Clear Error</Button>
                             </Grid>
                         </Border>
-                        <Border Grid.Row="2" Grid.Column="0" Padding="20,40"  Background="#95b3d7" Margin="5" CornerRadius="5">
+                        <Border Grid.Row="2" Grid.Column="0" Padding="20,10"  Background="#95b3d7" Margin="5" CornerRadius="5">
                             <Grid>
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="*"/>
@@ -657,7 +657,7 @@
                                 <Button Grid.Column="2" Grid.Row="2" Command="{Binding HOMECommand}">Home  plant</Button>
                             </Grid>
                         </Border>
-                        <Border  Grid.Row="3" Grid.Column="0"  Padding="20,40"  Background="#95b3d7" Margin="5" CornerRadius="5">
+                        <Border  Grid.Row="3" Grid.Column="0"  Padding="20,10"  Background="#95b3d7" Margin="5" CornerRadius="5">
                             <Grid>
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="*"/>
@@ -699,10 +699,8 @@
                                     <ColumnDefinition Width=".3*"/>
                                     <ColumnDefinition Width="*"/>
                                 </Grid.ColumnDefinitions>
-                                <TextBlock Grid.Row="0" Grid.Column="0" TextAlignment="Center" VerticalAlignment="Center">Status</TextBlock>
                                 <TextBlock Grid.Row="1" Grid.Column="0" TextAlignment="Center" VerticalAlignment="Center">Action Info</TextBlock>
                                 <TextBox Grid.Row="1" Grid.Column="2"   TextAlignment="Center" VerticalAlignment="Center">HOME OK</TextBox>
-                                <TextBox Grid.Row="0" Grid.Column="2"   TextAlignment="Center" VerticalAlignment="Center">offline</TextBox>
                                 <Grid Grid.Column="4" Grid.RowSpan="2">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="*"></RowDefinition>

+ 2 - 0
Venus/Venus_RT/Venus_RT.csproj

@@ -236,6 +236,7 @@
     <Compile Include="Modules\EntityErrorRaiseTrigger.cs" />
     <Compile Include="Modules\PMs\Fdc.cs" />
     <Compile Include="Modules\PMs\PMHeatRoutine.cs" />
+    <Compile Include="Modules\PMs\VenusVentRoutine.cs" />
     <Compile Include="Modules\SMIF\SMIFEntity.cs" />
     <Compile Include="Devices\TM\HongHuTM.cs" />
     <Compile Include="Devices\TM\ITransferRobot.cs" />
@@ -412,6 +413,7 @@
     <Content Include="Config\SESequenceFormat.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Resource Include="Config\TM\DeviceModelVenusDE_MF.xml" />
     <Content Include="Config\TM\DeviceModelVenusSE_MF.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>