补充提交

OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/ParticleAnalysis.cs

@@ -1074,19 +1074,8 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             DataTable dt = InvalidRemoval(fielddata.GetParticleListForParticlSize("area", ""));
             DataTable AreaInformationOfAllElements = InvalidRemoval(fielddata.GetAreaByAllIncA(""));
             DataTable dtp = InvalidRemoval(fielddata.GetParticleAll(""));
-            //选择颗粒信息
-            DataTable data;
-            SelectParticleData(out data, m_otsreport_export);
-            //选择颗粒整理成表
-            DataTable Partic_dt = new DataTable();
-            if (data.Rows.Count > 0)
-            {
-                Partic_dt = GetParticleListForParticlSize(data, dtp);
-            }
-
-            List<string> vs = new List<string>() { "DMAX", "DMIN", "FERET", "Area" };
+          
             string po = ComputeMode;
-
             switch (po)
             {
                 case "DMAX":

OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/ParticleList.cs

@@ -32,15 +32,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             //------------------加载模块,获取数据-------------------------------------------------
             m_otsreport_export.m_ReportApp.im_ParticlesGridDevidePage = new ParticlesGridDevidePage(m_otsreport_export.m_ReportApp);
             DataTable SelectParticleTable = SelectParticleData(m_otsreport_export);
-            //int sel = 0;
-            //if (m_mbszclass.M_SY.int_xzkl == 0)
-            //{
-            //    sel = 0;
-            //}
-            //else
-            //{
-            //    sel = 1;
-            //}
+   
             //根据sql条件，查询获取颗粒信息数据
             ParticleData fielddata = new ParticleData(m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.getSelectedIndex()].FilePath);
             DataTable btb = InvalidRemoval(fielddata.GetIncaSurfaceData(SelectParticleTable, 0, m_mbszclass.M_KLLBXX.list_str_kllb_qcys));