|
@@ -734,6 +734,11 @@ namespace OTSIncAReportGrids
|
|
|
List<string> ElementTypeSort = new List<string>(str_ElementsColName.Split(',').ToList());//去重
|
|
|
for (int i = 0; i < ElementTypeSort.Count; i++)
|
|
|
{
|
|
|
+ if(ElementTypeSort[0]=="")
|
|
|
+ {
|
|
|
+ ElementTypeSort.RemoveAt(0);
|
|
|
+ break;
|
|
|
+ }
|
|
|
dgV_ParticlesDevidePage.Columns.Add(ElementTypeSort[i], ElementTypeSort[i]);
|
|
|
int id = dgV_ParticlesDevidePage.Columns.Count;
|
|
|
dgV_ParticlesDevidePage.Columns[id - 1].Tag = "NumericType";
|
|
@@ -834,6 +839,10 @@ namespace OTSIncAReportGrids
|
|
|
string[] strcbo = particles.Rows[i][enl.Current.Key].ToString().Split(';');
|
|
|
for (int j = 0; j < strcbo.Length; j++)
|
|
|
{
|
|
|
+ if(ElementTypeSort.Count==0)
|
|
|
+ {
|
|
|
+ break;
|
|
|
+ }
|
|
|
string[] str = strcbo[j].Split('-');
|
|
|
if (ElementTypeSort.Contains(str[0]))
|
|
|
{ dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[str[0].ToString()].Value = Math.Round(double.Parse(str[1]), 2).ToString(); }
|