瀏覽代碼

清洁度报告模板保存文件部分存在BUG修正

zhangjiaxin 7 月之前
父節點
當前提交
d3a627f14d

+ 14 - 1
OTSIncAReportApp/1-UI/Control_ECharts/EChart_ParticlesComposition.cs

@@ -94,8 +94,21 @@ namespace OTSIncAReportApp.Control_ECharts
                 checkButton3.Visible = false;
                 return;
             }
+            List<DataTable> listDt = new List<DataTable>();
+            for (int i=0;i< list_dt.Count;i++)
+            {
+                DataTable dt = list_dt[i].Clone();
+                for (int a=0;a< list_dt[i].Rows.Count;a++)
+                {
+                    if (list_dt[i].Rows[a]["name"].ToString() != "")
+                    {
+                        dt.Rows.Add(list_dt[i].Rows[a].ItemArray);
+                    }
+                }
+                listDt.Add(dt);
+            }
 
-            prListData = list_dt.Copy();
+            prListData = listDt.Copy();
             prListString.Clear();
             for (int i = 0; i < list_dt.Count; i++)
             {

+ 6 - 16
OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.cs

@@ -359,26 +359,15 @@ 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.list_str_MainPriority.Clear();
             m_OTSReport_Export.m_mbszclass.list_str_MainPriority = list_MainPriority.Copy();
-            //string[] MainPriority = textBox_zypxss.Text.Split(new char[] { '/' });
-            //for (int i = 0; i < MainPriority.Length; i++)
-            //{
-            //    if (textBox_zypxss.Text.Split('/')[i] != "")
-            //        m_OTSReport_Export.m_mbszclass.list_str_MainPriority.Add(MainPriority[i]);
-            //}
+  
 
             //主要优先显示顺序
             m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial.Clear();
-            m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial= TCCleannessAList;
+            m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial= TCCleannessAList.Copy();
          
 
 
@@ -474,7 +463,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
 
             textBox1.Text = m_OTSReport_Export.m_mbszclass.M_DZ.Notes;
-            TCCleannessAList = m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial;
+            TCCleannessAList = m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial.Copy();
+            list_MainPriority = m_OTSReport_Export.m_mbszclass.list_str_MainPriority.Copy();
             LoadingIcon();
         }
         private void  LoadingIcon()
@@ -772,7 +762,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             category.ShowDialog();
             List<string> ls = category.OutElementList;
             TCCleannessAList = category.vs;
-            list_MainPriority = category.OutElementList;
+            list_MainPriority = category.OutElementList.Copy();
             string str = "";
             for (int i = 0; i < ls.Count; i++)
             {