优化对清洁度没有大类的测量结果chart图显示的修正

OTSIncAReportApp/1-UI/Control_ECharts/EChart_ParticlesComposition.cs

@@ -78,6 +78,23 @@ namespace OTSIncAReportApp.Control_ECharts
             m_ReportApp.more = true;
 
             List<DataTable> list_dt = GetListJsonStr();
+
+            bool bl = false;
+            for (int i=0;i< list_dt.Count;i++)
+            {
+                if (list_dt[i].Rows.Count>0)
+                {
+                    bl = true;
+                }
+            }
+            if(!bl)
+            {
+                checkButton1.Visible = false;
+                checkButton2.Visible = false;
+                checkButton3.Visible = false;
+                return;
+            }
+
             prListData = list_dt.Copy();
             prListString.Clear();
             for (int i = 0; i < list_dt.Count; i++)

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_INCA.cs

@@ -53,7 +53,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
           
 
             fielddata = new ParticleData(m_OTSReport_Export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_OTSReport_Export.m_ReportApp.m_rstDataMgr.GetWorkingResultId()].FilePath);
-
+            DeleteClass_Serial = m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial;
         }
 
         /// <summary>
@@ -387,12 +387,12 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 m_OTSReport_Export.m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add(after[i]);
             }
             //拆分，物质分类
-            m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Clear();
-            for (int i = 0; i < delete_Class.Text.Split(',').Length; i++)
-            {
-                if (delete_Class.Text.Split(',')[i] != "")
-                    m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Add(delete_Class.Text.Split(',')[i]);
-            }
+            //m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Clear();
+            //for (int i = 0; i < delete_Class.Text.Split(',').Length; i++)
+            //{
+            //    if (delete_Class.Text.Split(',')[i] != "")
+            //        m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Add(delete_Class.Text.Split(',')[i]);
+            //}
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial.Clear();
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial = DeleteClass_Serial.Copy();
 
@@ -893,11 +893,13 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     data.Rows.Add(dr);
                 }
             }
-            Category category = new Category(m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial, data, true);
+            Category category = new Category(DeleteClass_Serial, data, true);
             category.ShowDialog();
             if(category.IsModify)
             {
-                List<string> ls = category.OutElementList;
+                //List<string> ls = category.OutElementList;
+                m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial.Clear();
+                m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial= category.vs.Copy();
                 DeleteClass_Serial = category.vs;
                 var MainPriority = category.OutElementList;
                 m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass = category.OutElementList;