diff --git a/Views/Grading/GradingLoading.xaml b/Views/Grading/GradingLoading.xaml
index 03b840d..44c9997 100644
--- a/Views/Grading/GradingLoading.xaml
+++ b/Views/Grading/GradingLoading.xaml
@@ -328,457 +328,31 @@
         </Border>
 
         <Border Grid.Row="2" Grid.Column="0" Style="{StaticResource BorderRowStyle}" >
-            <DataGrid ItemsSource="{Binding DtResults,Mode=TwoWay}" FontSize="20" Visibility="Hidden"
-                      AutoGenerateColumns="False"
-                      HeadersVisibility="Column"
-                      Background="Transparent"
-                      BorderThickness="0"
-                      CanUserSortColumns="False"
-                      CanUserResizeColumns="False"
-                      GridLinesVisibility="None"
-                      HorizontalScrollBarVisibility="Hidden"
-                      VerticalScrollBarVisibility="Hidden"
-                      ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-                      ScrollViewer.VerticalScrollBarVisibility="Hidden"
-                      FocusVisualStyle="{x:Null}"
-                      IsReadOnly="True"  
-                      RowStyle="{StaticResource CustomDataGridRowStyle}"
-                      ColumnHeaderStyle="{StaticResource CustomColumnHeaderStyle}"
-                      CellStyle="{StaticResource CustomDataGridCellStyle}"
-                      AlternationCount="2">
-                <DataGrid.Resources> 
-                    <Style TargetType="ScrollBar">
-                        <Setter Property="Visibility" Value="Collapsed"/>
-                    </Style>
-                </DataGrid.Resources>
-                <DataGrid.Columns>
-                    <DataGridTemplateColumn Header="" Width="2*" >
-                        <DataGridTemplateColumn.CellTemplate>
-                            <DataTemplate>
-                                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-                                    <TextBlock Text="{Binding TestItemName}"
-                                               HorizontalAlignment="Center"
-                                               VerticalAlignment="Center"/>
-
-                                    <Popup x:Name="RowPopup"
-                                           Placement="Bottom"
-                                           AllowsTransparency="True"
-                                           PlacementTarget="{Binding RelativeSource={RelativeSource AncestorType=FrameworkElement}}"
-                                           Visibility="Collapsed"
-                                           VerticalOffset="20"
-                                           HorizontalOffset="80"> 
-                                        <Border Width="1500" Height="130" Background="White" CornerRadius="5" BorderThickness="1" BorderBrush="Gray">
-                                            
-                                            <Grid>
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition Height="40"/>
-                                                    <RowDefinition Height="*"/>
-                                                </Grid.RowDefinitions>
-                                                <Button Grid.Row="0" HorizontalAlignment="Right" Margin="5" Click="CloseAllPopup_Click" Padding="0" BorderBrush="Transparent"  
-                                                        Background="Transparent" BorderThickness="0">
-                                                    <Image Source="pack://application:,,,/Resource/Images/UIResource/01-8.png" MouseLeave="UIElement_OnMouseLeave" MouseEnter="UIElement_OnMouseEnter" Width="30" />
-                                                </Button>
-                                                <Grid Grid.Row="1">
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Border Grid.Column="0" Background="Transparent" Width="120" Height="80" CornerRadius="10" Margin="0 0 10 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.itemName}"
-                                                                       FontSize="22" Foreground="Black" FontWeight="Bold" TextWrapping="Wrap" Margin="0 0 0 5"/>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="1" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="{StaticResource DiamondResultGridAvgValue}"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.Avg}"
-                                                                       FontSize="20" Foreground="#0063FF"/>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="2" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="{StaticResource DiamondResultGridDeviationValue}"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.Dev}"
-                                                                       FontSize="20" Foreground="#0063FF"/>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="3" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="{StaticResource DiamondResultGridMinValue}"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.Min}"
-                                                                       FontSize="20" Foreground="#0063FF"/>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="4" Background="#EBEEF5" Width="100" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="{StaticResource DiamondResultGridMaxValue}"
-                                                                    FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.Max}"
-                                                                    FontSize="20" Foreground="#0063FF"/>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="13" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="{StaticResource DiamondResultGridCutLevel}"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.CutLevel}"
-                                                                       FontSize="20" Foreground="#0063FF"/>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="14" Background="#EBEEF5" Width="100" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="{StaticResource DiamondResultGridSymLevel}"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.SymLevel}"
-                                                                       FontSize="20" Foreground="#0063FF"/>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="5" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="1"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item1}"
-                                                                       FontSize="20" Foreground="#0063FF">
-                                                                <TextBlock.Style>
-                                                                    <Style TargetType="TextBlock">
-                                                                        <Setter Property="FontWeight" Value="Normal"/>
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="0">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="0">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </TextBlock.Style>
-                                                            </TextBlock>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="6" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="2"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item2}"
-                                                                       FontSize="20" Foreground="#0063FF">
-                                                                <TextBlock.Style>
-                                                                    <Style TargetType="TextBlock">
-                                                                        <Setter Property="FontWeight" Value="Normal"/>
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="1">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="1">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </TextBlock.Style>
-                                                            </TextBlock>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="7" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="3"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item3}"
-                                                                       FontSize="20" Foreground="#0063FF">
-                                                                <TextBlock.Style>
-                                                                    <Style TargetType="TextBlock">
-                                                                        <Setter Property="FontWeight" Value="Normal"/>
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="2">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="2">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </TextBlock.Style>
-                                                            </TextBlock>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="8" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="4"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 5"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item4}"
-                                                                       FontSize="20" Foreground="#0063FF">
-                                                                <TextBlock.Style>
-                                                                    <Style TargetType="TextBlock">
-                                                                        <Setter Property="FontWeight" Value="Normal"/>
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="3">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="3">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </TextBlock.Style>
-                                                            </TextBlock>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="9" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="5"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 6"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item5}"
-                                                                       FontSize="20" Foreground="#0063FF">
-                                                                <TextBlock.Style>
-                                                                    <Style TargetType="TextBlock">
-                                                                        <Setter Property="FontWeight" Value="Normal"/>
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="4">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="4">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </TextBlock.Style>
-                                                            </TextBlock>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="10" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="6"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 6"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item6}"
-                                                                       FontSize="20" Foreground="#0063FF">
-                                                                <TextBlock.Style>
-                                                                    <Style TargetType="TextBlock">
-                                                                        <Setter Property="FontWeight" Value="Normal"/>
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="5">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="5">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </TextBlock.Style>
-                                                            </TextBlock>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="11" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="7"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 6"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item7}"
-                                                                       FontSize="20" Foreground="#0063FF">
-                                                                <TextBlock.Style>
-                                                                    <Style TargetType="TextBlock">
-                                                                        <Setter Property="FontWeight" Value="Normal"/>
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="6">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="6">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </TextBlock.Style>
-                                                            </TextBlock>
-                                                        </Grid>
-                                                    </Border>
-                                                    <Border Grid.Column="12" Background="#EBEEF5" Width="90" Height="80" CornerRadius="10" Margin="0 0 5 0">
-                                                        <Grid>
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="Auto"/>
-                                                                <RowDefinition Height="*"/>
-                                                            </Grid.RowDefinitions>
-                                                            <TextBlock Grid.Row="1" TextAlignment="Center" VerticalAlignment="Center" Text="8"
-                                                                       FontSize="18" Foreground="Black" Margin="0 0 0 6"/>
-                                                            <TextBlock Grid.Row="2" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding SelRowDataDetail.item8}"
-                                                                       FontSize="20" Foreground="#0063FF">
-                                                                <TextBlock.Style>
-                                                                    <Style TargetType="TextBlock">
-                                                                        <Setter Property="FontWeight" Value="Normal"/>
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MaxIndex}" Value="7">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding SelRowDataDetail.MinIndex}" Value="7">
-                                                                                <Setter Property="FontWeight" Value="Bold"/>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </TextBlock.Style>
-                                                            </TextBlock>
-                                                        </Grid>
-                                                    </Border>
-                                                </Grid>
-                                               
-                                            </Grid>
-                                        </Border>
-                                    </Popup>
-
-                                    <!-- 点击区域，触发打开(或切换) Popup 事件 -->
-                                    <Border x:Name="ClickArea"
-                                            Background="Transparent"
-                                            MouseLeftButtonUp="ClickArea_MouseLeftButtonUp"/>
-                                </Grid>
-                            </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
-                    </DataGridTemplateColumn>
-                    <!-- 第2~5列 -->
-                    <DataGridTextColumn Header="{StaticResource DiamondResultGridAvgValue}" Binding="{Binding Avg}" Width="*" ElementStyle="{StaticResource CenteredTextBlockStyle}"/>
-                    <DataGridTextColumn Header="{StaticResource DiamondResultGridDeviationValue}" Binding="{Binding Dev}" Width="*" ElementStyle="{StaticResource CenteredTextBlockStyle}"/>
-                    <DataGridTextColumn Header="{StaticResource DiamondResultGridMinValue}" Binding="{Binding Min}" Width="*" ElementStyle="{StaticResource CenteredTextBlockStyle}"/>
-                    <DataGridTextColumn Header="{StaticResource DiamondResultGridMaxValue}" Binding="{Binding Max}" Width="*" ElementStyle="{StaticResource CenteredTextBlockStyle}"/>
-
-                    <!-- 第6列 -->
-                    <DataGridTextColumn Header="{StaticResource DiamondResultGridCutLevel}" Binding="{Binding CutLevel}" Width="*">
-                        <DataGridTextColumn.ElementStyle>
-                            <Style TargetType="TextBlock">
-                                <Setter Property="Foreground" Value="Blue"/>
-                                <Setter Property="HorizontalAlignment" Value="Center"/>
-                                <Setter Property="VerticalAlignment" Value="Center"/>
-                            </Style>
-                        </DataGridTextColumn.ElementStyle>
-                    </DataGridTextColumn>
-                    <!-- 第五列：SYM等级，下拉框示例，可编辑 -->
-                    <DataGridTemplateColumn Width="*" Header="{DynamicResource DiamondResultGridSymLevel}">
-                        <DataGridTemplateColumn.CellTemplate>
-                            <DataTemplate>
-
-                                <ComboBox ItemsSource="{Binding GradeList}"
-                                          IsEnabled="{Binding isEnabled}"
-                                          DisplayMemberPath="{DynamicResource NameType}"
-                                          SelectedValuePath="GRADE_ORDER"
-                                          SelectedValue="{Binding SymLevel, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                          SelectionChanged="ChangSymLevel"
-                                          FontSize="20" 
-                                          Foreground="DarkSlateGray"
-                                          HorizontalAlignment="Center"
-                                          VerticalAlignment="Center"
-                                          Width="120">
-                                 
-                                </ComboBox>
-                            </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
-                    </DataGridTemplateColumn>
-                    <DataGridTextColumn Header="TestItemId" Binding="{Binding TestItemId}" Visibility="Hidden"/>
-                </DataGrid.Columns>
-            </DataGrid>
+            
         </Border>
         
         <GridSplitter Grid.Row="2"  Grid.Column="1" Width="5" HorizontalAlignment="Stretch" Background="Transparent" IsEnabled="False"></GridSplitter>
         <Border Grid.Row="2"  Grid.Column="2" Background="White" Style="{StaticResource BorderRowStyle}">
             <Grid>
                 <Grid.RowDefinitions>
-                    <!-- <RowDefinition Height="50"></RowDefinition> -->
-                    <RowDefinition Height="*"></RowDefinition>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <!-- <userControl:Viewport3D ViewportData="{Binding ViewportData}"></userControl:Viewport3D> -->
+                
+                <TextBox Grid.Row="0" Text="检测中，请稍等..." BorderBrush="Transparent" BorderThickness="0" 
+                         TextAlignment="Center" FontSize="26"/>
+                <Grid Grid.Row="1" >
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                </Grid>
             </Grid>
         </Border>
     </Grid>