调整下拉列显示顺序

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/ChangeGridCellValEvent.cs

@@ -95,7 +95,7 @@ namespace OTSIncAReportApp.OTSRstMgrFunction
             {
                 if ((OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS)m_SampleGrid.m_frmPropCondition.PropGrid.Rows[m_SampleGrid.m_ClickRow].Tag == OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST)
                 {
-                    if (sender.Position.Row == 2)
+                    if (sender.Position.Row == 3)
                         m_SampleGrid.m_frmPropCondition.m_ReportApp.im_ParticlesGridDevidePage = null;//需要重新刷新颗粒列表
                 }
             }

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -492,8 +492,9 @@ 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_SIZE_DISTRIBUTION )
                 {
                     //粒级表
@@ -508,7 +509,7 @@ namespace OTSIncAReportApp
 
                     var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
                   
-                    list.Insert(1, sampleData1);
+                    list.Insert(2, sampleData1);
                 }
                 if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_COMP)
                 {
@@ -518,38 +519,37 @@ namespace OTSIncAReportApp
 
                     var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
                  
-                    list.Insert(1, sampleData1);
+                    list.Insert(2, sampleData1);
                 }
 
                 if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO)
                 {
                     var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST];
                   
-                    list.Insert(1, sampleData1);
+                    list.Insert(2, 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.Insert(1, sampleData1);
+                    list.Insert(2, sampleData1);
                 }
-                list.Add(sampleData3);
               
             }
             else if (tbindex == DisplayPicutureType.AnalyzeDataChart)//Chart图页
             {
-                //测量结果数据源
-
+                
                 sampleData = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE];
                 list.Add(sampleData);
+
+                var sampleData3 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE];
+                list.Add(sampleData3);
             
                 var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
                 list.Add(sampleData1);
 
                 //数据图类型
 
-                var sampleData3 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE];
-                list.Add(sampleData3);
                 if ((int)sampleData3.itemVal == (int)CALCULATE_CHART_TYPE.PARTICALE_SIZE_DISTRIBUTION)
                 {
                     //粒级表