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

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -1308,7 +1308,7 @@ namespace OTSIncAReportGraph.Controls
                 list_showelementinfo.Add(ls_sei);
             }
 
-
+            list_showelementinfo.Sort((p1, p2) => p2.Percentage.CompareTo(p1.Percentage));
             string str_IncAName = "";
             str_IncAName = m_mouseOver_dparticle.TypeName;
 

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionSortImage.cs

@@ -1039,7 +1039,7 @@ namespace OTSIncAReportGraph.Controls
                 ls_sei.dKF = Convert.ToDouble(CListPeriodic.GetPeriodicByEleName(ls_sei.ElementName).K_Peak);
                 list_showelementinfo.Add(ls_sei);
             }
-
+            list_showelementinfo.Sort((p1, p2) => p2.Percentage.CompareTo(p1.Percentage));
             //获取使用标准库的名称
             //string str_stdname = "";
             string str_IncALibName = "";

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePage.cs

@@ -2684,6 +2684,9 @@ namespace OTSIncAReportGrids
                         ls_sei.dLF = de_sx2;
                         list_showelementinfo.Add(ls_sei);
                     }
+
+
+                    list_showelementinfo.Sort((p1, p2) => p2.Percentage.CompareTo(p1.Percentage));
                     string str_IncAName = "";
                     str_IncAName = Convert.ToString(dgvr.Cells[1].Value);
                     Particle particle = resultFile.List_OTSField.Find(x => x.FieldID == Convert.ToInt32(dgvr.Cells["fieldid"].Value)).ParticleList.Find(x => x.ParticleId == Convert.ToInt32(dgvr.Cells["particleId"].Value));