编辑报告模板-颗粒尺寸分析结果-计算方法切换失败

OTSIncAReportApp/Control_Grids/ElementCompositionAvgGrid.cs

@@ -30,6 +30,7 @@ namespace OTSIncAReportGrids
 
         OTSIncAReportApp.DataOperation.DataAccess.ParticleData particledata;
         OTSIncAReportApp.frmReportApp m_ReportApp;
+        internal string condition;
         #endregion
 
         #region 自定义方法

OTSIncAReportApp/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -610,7 +610,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 //加载模块
                 ParticlesSizeGrid ls_particlesizegrid = new ParticlesSizeGrid(m_otsreport_export.m_ReportApp);
                 List<string> vs = new List<string>() { "DMAX", "DMIN", "Area", "FERET" };
-                ls_particlesizegrid.condition = vs[m_otsreport_export.m_mbszclass.M_KLFXJG.index_cb_jzwfl_jsfs];
+                ls_particlesizegrid.condition = vs[m_otsreport_export.m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs];
                 m_otsreport_export.panel_container.Controls.Clear();
                 m_otsreport_export.panel_container.Controls.Add(ls_particlesizegrid);
 
@@ -715,6 +715,9 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             {
                 //加载模块
                 ElementCompositionAvgGrid ls_elementcompositionavggrid = new ElementCompositionAvgGrid(m_otsreport_export.m_ReportApp);
+                //List<string> vs = new List<string>() { "DMAX", "DMIN", "Area", "FERET" };
+                //ls_elementcompositionavggrid.condition = vs[m_otsreport_export.m_mbszclass.M_YSFXJG.index_cb_yxfx_jsfs];
+
                 m_otsreport_export.panel_container.Controls.Clear();
                 m_otsreport_export.panel_container.Controls.Add(ls_elementcompositionavggrid);
 

OTSIncAReportApp/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs

@@ -563,8 +563,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             //颗粒分析结果
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk = ck_klcc_xsmk.Checked;
-            m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_klcc_jsfs = cb_klcc_ljb.Text;//计算方式
-            m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs = cb_klcc_ljb.SelectedIndex;
+            m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_klcc_jsfs = cb_klcc_jsfs.Text;//计算方式
+            m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs = cb_klcc_jsfs.SelectedIndex;
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_klcc_ljb = cb_klcc_ljb.Text;//粒级表
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_ljb = cb_klcc_ljb.SelectedIndex;
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_klcc_klfw = cb_klcc_klfw.Text;//颗粒范围
@@ -665,7 +665,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             //颗粒分析结果
             ck_klcc_xsmk.Checked = m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk;
             //cb_klcc_ljb.Text = m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_klcc_jsfs;//计算方式
-            cb_klcc_ljb.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs;
+            cb_klcc_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs;
             //cb_klcc_ljb.Text = m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_klcc_ljb;//粒级表
             cb_klcc_ljb.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_ljb;
             //cb_klcc_klfw.Text = m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_klcc_klfw;//颗粒范围

OTSIncAReportTemplate/OTSIncAReportTemplate.cs

@@ -256,6 +256,9 @@ namespace OTSIncAReportTemplate
                     DataTable ls_dt_Particel = list_dt.Where(aa => aa.TableName.Contains("Particel")).ToList()[0];
                     rmReport1.AddDataSet(ls_dt_PartSize, "PartSize");
                     rmReport1.AddDataSet(ls_dt_Particel, "Particel");
+                    List<string> vs = new List<string>() { "DMAX", "DMIN", "Area", "FERET" };
+                    string str = vs[m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs];
+                    rmReport1.AddVariable("klccfxjg_jsfx", str, true);
                     ls_dt_PartSize.Dispose();
                     //ls_dt_PartSize.Clear();
                     ls_dt_Particel.Dispose();