调整报告程序grid表中的显示顺序

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -389,21 +389,7 @@ namespace OTSIncAReportApp
                 //数据表类型
                 var sampleData3 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE];
                 //list.Add(sampleData3);
-                if ((int)sampleData3.itemVal==(int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO)
-                {
-                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
-                    list.Add(sampleData1);
-                }
-                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.AVE_ELEMENT_COMP)
-                {
-                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
-                    list.Add(sampleData1);
-                }
-                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.ELEMENT_COMP)
-                {
-                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
-                    list.Add(sampleData1);
-                }
+                
                 if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_SIZE_DISTRIBUTION )
                 {
                     //粒级表
@@ -416,7 +402,8 @@ namespace OTSIncAReportApp
                     list.Add(sampleData5);
 
                     var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
-                    list.Add(sampleData1);
+                    //list.Add(sampleData1);
+                    list.Insert(1, sampleData1);
                 }
                 if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_COMP)
                 {
@@ -425,10 +412,30 @@ namespace OTSIncAReportApp
                     list.Add(sampleData5);
 
                     var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
-                    list.Add(sampleData1);
+                    //list.Add(sampleData1);
+                    list.Insert(1, sampleData1);
                 }
-                list.Add(sampleData3);
 
+                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO)
+                {
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    //list.Add(sampleData1);
+                    list.Insert(1, sampleData1);
+                }
+                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.AVE_ELEMENT_COMP)
+                {
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    //list.Add(sampleData1);
+                    list.Insert(1, sampleData1);
+                }
+                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.ELEMENT_COMP)
+                {
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    //list.Add(sampleData1);
+                    list.Insert(1, sampleData1);
+                }
+                list.Add(sampleData3);
+              
             }
             else if (tbindex == DisplayPicutureType.AnalyzeDataChart)//Chart图页
             {