Merge branch 'OTSRelease3_2' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_2

OTSIncAReportApp/1-UI/Control_Grids/ResultGrid.cs

@@ -160,7 +160,7 @@ namespace OTSIncAReportGrids
                 }
             }
 
-            double ratio = Math.Round(particleArea / filedsArea*double.Parse(sizestr),3);
+            double ratio = Math.Round(particleArea / (filedsArea * 1000000) *double.Parse(sizestr),3);
 
             keyValues.Add(table["col2"].ToString(), star.ToString("yyyy-MM-dd HH:mm:ss"));
             keyValues.Add(table["col3"].ToString(), end.ToString("yyyy-MM-dd HH:mm:ss"));
@@ -297,7 +297,7 @@ namespace OTSIncAReportGrids
                 }
             }
 
-            double ratio = Math.Round(particleArea / filedsArea * double.Parse(sizestr), 3);
+            double ratio = Math.Round(particleArea / (filedsArea * 1000000) * double.Parse(sizestr), 3);
 
             keyValues.Add(table["col2"].ToString(), star.ToString("yyyy-MM-dd HH:mm:ss"));
             keyValues.Add(table["col3"].ToString(), end.ToString("yyyy-MM-dd HH:mm:ss"));