Merge remote-tracking branch 'origin/master'

Language/zh_CN.xaml

@@ -176,7 +176,7 @@
     <sys:String x:Key="DiamondResultGridCutLevel">切工等级</sys:String>
     <sys:String x:Key="DiamondResultGridSymLevel">SYM等级</sys:String>
     <sys:String x:Key="DiamondResultPopupFacet1">面1</sys:String>
-    <sys:String x:Key="DiamodResultCloseConfirm">确定需要关闭检测结果画面吗? ※如果关闭需重新检测</sys:String>
+    <sys:String x:Key="DiamodResultCloseConfirm">是否关闭检测结果画面。</sys:String>
 
         <!-- 外部接口MSG-->
     <sys:String x:Key="InProgress">S001：采图正在进行中</sys:String>   

ViewModel/Grading/GradingResultVM.cs

@@ -950,6 +950,10 @@ public class GradingResultVM : BaseViewModel
     {
         return (Math.Floor(value*1000)/10).ToString(digitsFormat);
     }
+    private string FormatDouble_P2(double value)
+    {
+        return (Math.Floor(value * 10000) / 100).ToString("f2");
+    }
     /// <summary>
     /// 百分比用的小数格式化
     /// </summary>
@@ -1345,14 +1349,14 @@ public class GradingResultVM : BaseViewModel
         doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_15);
         doubles.Add(girdleValleyDetail.GIRDLE_VALLEY_16);
         doubles.Sort();
-        row.item1 = FormatDouble_P(doubles[0]);
-        row.item2 = FormatDouble_P(doubles[1]);
-        row.item3 = FormatDouble_P(doubles[2]);
-        row.item4 = FormatDouble_P(doubles[3]);
-        row.item5 = FormatDouble_P(doubles[12]);
-        row.item6 = FormatDouble_P(doubles[13]);
-        row.item7 = FormatDouble_P(doubles[14]);
-        row.item8 = FormatDouble_P(doubles[15]);
+        row.item1 = FormatDouble_P2(doubles[0]);
+        row.item2 = FormatDouble_P2(doubles[1]);
+        row.item3 = FormatDouble_P2(doubles[2]);
+        row.item4 = FormatDouble_P2(doubles[3]);
+        row.item5 = FormatDouble_P2(doubles[12]);
+        row.item6 = FormatDouble_P2(doubles[13]);
+        row.item7 = FormatDouble_P2(doubles[14]);
+        row.item8 = FormatDouble_P2(doubles[15]);
         calIndex(row);
     }
     private void setSTAR_DETAIL(RowDetail row)