From 83f2372d74a23a8ddbb7c2e1e251fac234b0227b Mon Sep 17 00:00:00 2001
From: sunhonglei <sunhonglei@51dayu.com>
Date: Mon, 16 Dec 2024 14:04:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ViewModel/Grading/GradingResultVM.cs | 2 +-
 Views/Grading/GradingResult.xaml     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ViewModel/Grading/GradingResultVM.cs b/ViewModel/Grading/GradingResultVM.cs
index d29af69..ab1306c 100644
--- a/ViewModel/Grading/GradingResultVM.cs
+++ b/ViewModel/Grading/GradingResultVM.cs
@@ -112,7 +112,7 @@ public class GradingResultVM : BaseViewModel
         totalCutGrade = 0;
         totalSymGrade = 0;
         Standard = result.Standard;
-        Shape = result.Shape;
+        Shape = GetName(result.Shape);
         CrownType = result.CrownType;
         PavType = result.PavType;
         DiamondCode = result.DiamondCode;
diff --git a/Views/Grading/GradingResult.xaml b/Views/Grading/GradingResult.xaml
index ea13905..123c256 100644
--- a/Views/Grading/GradingResult.xaml
+++ b/Views/Grading/GradingResult.xaml
@@ -22,7 +22,7 @@
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
 
-        <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3"  Background="White" Height="50">
+        <Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3"  Background="White" Height="70">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*" />
@@ -32,8 +32,8 @@
                     <ColumnDefinition Width="2*" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="25"></RowDefinition>
-                    <RowDefinition Height="25"></RowDefinition>
+                    <RowDefinition Height="1*"></RowDefinition>
+                    <RowDefinition Height="1*"></RowDefinition>
                 </Grid.RowDefinitions>
                 <Button Content="{DynamicResource SaveAs}" Foreground="#ffffff" Background="#A7896F" Width="70" Command="{Binding SaveFileCommand}"/>
                 <Button Grid.Column="1" Content="{DynamicResource Export}" Foreground="#ffffff" Background="#A7896F" Width="70" Command="{Binding SaveAsCommand}"/>