diff --git a/Language/zh_CN.xaml b/Language/zh_CN.xaml
index bff7131..edbf06f 100644
--- a/Language/zh_CN.xaml
+++ b/Language/zh_CN.xaml
@@ -183,4 +183,13 @@
重量(ct)
切工等级
对称等级
+ 平均值
+ 偏差值
+ 最大值
+ 最小值
+ 切工等级
+ SYM等级
+ 面1
+
+
\ No newline at end of file
diff --git a/SparkClient.sln.DotSettings.user b/SparkClient.sln.DotSettings.user
index bd477bf..04e2961 100644
--- a/SparkClient.sln.DotSettings.user
+++ b/SparkClient.sln.DotSettings.user
@@ -1,6 +1,7 @@
ForceIncluded
ForceIncluded
+ ForceIncluded
ForceIncluded
ForceIncluded
ForceIncluded
@@ -26,6 +27,7 @@
ForceIncluded
ForceIncluded
ForceIncluded
+ ForceIncluded
ForceIncluded
ForceIncluded
ForceIncluded
diff --git a/ViewModel/Grading/GradingResultVM.cs b/ViewModel/Grading/GradingResultVM.cs
index 3abd661..ee7ab3b 100644
--- a/ViewModel/Grading/GradingResultVM.cs
+++ b/ViewModel/Grading/GradingResultVM.cs
@@ -35,6 +35,7 @@ public class GradingResultVM : BaseViewModel
private string _cutLevelTotal;
private string _symLevelTotal;
private string _ds;
+ private RowDetail _selRowDataDetail;
public ICommand SaveFileCommand { get; }
public ICommand SaveAsCommand { get; }
public List DtResults { get { return _dtResults; } set { _dtResults = value; OnPropertyChanged(nameof(DtResults)); } }
@@ -43,6 +44,8 @@ public class GradingResultVM : BaseViewModel
public string Shape { get { return _shape; } set { _shape = value; OnPropertyChanged(nameof(Shape)); } }
public string CrownType { get { return _crownType; } set { _crownType = value; OnPropertyChanged(nameof(CrownType)); } }
public string PavType { get { return _pavType; } set { _pavType = value; OnPropertyChanged(nameof(PavType)); } }
+ public RowDetail SelRowDataDetail { get { return _selRowDataDetail; } set { _selRowDataDetail = value; OnPropertyChanged(nameof(SelRowDataDetail)); } }
+
public string Wight { get { return _wight; } set { _wight = value; OnPropertyChanged(nameof(Wight)); } }
public string CutLevelTotal { get { return _cutLevelTotal; } set { _cutLevelTotal = value; OnPropertyChanged(nameof(CutLevelTotal)); } }
public string SymLevelTotal { get { return _symLevelTotal; } set { _symLevelTotal = value; OnPropertyChanged(nameof(SymLevelTotal)); } }
@@ -1015,6 +1018,8 @@ public class GradingResultVM : BaseViewModel
row.MinIndex = 7;
row.CutLevel = data != null ? data.CutLevel : "";
row.SymLevel = GetGradeName(data != null ? data.SymLevel??0 : 0);
+
+ this.SelRowDataDetail = row;
return row;
}
diff --git a/Views/Configuration/LevelConfigPage.xaml b/Views/Configuration/LevelConfigPage.xaml
index 2b77b3f..5859b74 100644
--- a/Views/Configuration/LevelConfigPage.xaml
+++ b/Views/Configuration/LevelConfigPage.xaml
@@ -28,7 +28,7 @@
@@ -258,13 +259,14 @@
Background="Transparent"
BorderThickness="0"
GridLinesVisibility="None"
+ FocusVisualStyle="{x:Null}"
IsReadOnly="True"
RowStyle="{StaticResource CustomDataGridRowStyle}"
ColumnHeaderStyle="{StaticResource CustomColumnHeaderStyle}"
CellStyle="{StaticResource CustomDataGridCellStyle}">
-
+
@@ -279,7 +281,7 @@
Visibility="Collapsed"
VerticalOffset="20"
HorizontalOffset="80">
-
+
@@ -290,205 +292,234 @@
Background="Transparent" BorderThickness="0">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -501,13 +532,13 @@
-
-
-
-
+
+
+
+
-
+