修复BUG 导出报告时有显示篡位的问题

OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -719,15 +719,15 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         private void add_SetElementAvgGrid(List<DataTable> a_datas)
         {
             XRTable xRTable = add_ElementList();
-            setXRLabelData(xRTable.Rows[2].Cells[3], a_datas[0].Rows[0][2].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[4], a_datas[0].Rows[0][3].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[5], a_datas[0].Rows[0][4].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[6], a_datas[0].Rows[0][5].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[7], a_datas[0].Rows[0][6].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[8], a_datas[0].Rows[0][7].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[9], a_datas[0].Rows[0][8].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[10], a_datas[0].Rows[0][9].ToString());
-            setXRLabelData(xRTable.Rows[2].Cells[11], a_datas[0].Rows[0][10].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[2], a_datas[0].Rows[0][2].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[3], a_datas[0].Rows[0][3].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[4], a_datas[0].Rows[0][4].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[5], a_datas[0].Rows[0][5].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[6], a_datas[0].Rows[0][6].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[7], a_datas[0].Rows[0][7].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[8], a_datas[0].Rows[0][8].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[9], a_datas[0].Rows[0][9].ToString());
+            setXRLabelData(xRTable.Rows[2].Cells[10], a_datas[0].Rows[0][10].ToString());
 
 
 
@@ -760,7 +760,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                         }
                     }
                 }
-                list_ElementalAnalysisData.Add(set_ElementalAnalysis(subscript.Getsubscriptstring(REORDER_data.Rows[i]["Class"].ToString()), subscript.Getsubscriptstring(REORDER_data.Rows[i]["Name"].ToString()), REORDER_data.Rows[i]["Area"].ToString(),
+                list_ElementalAnalysisData.Add(set_ElementalAnalysisS(subscript.Getsubscriptstring(REORDER_data.Rows[i]["Name"].ToString()), REORDER_data.Rows[i]["Area"].ToString(),
                    REORDER_data.Rows[i][2].ToString(), REORDER_data.Rows[i][3].ToString(), REORDER_data.Rows[i][4].ToString(), REORDER_data.Rows[i][5].ToString(), REORDER_data.Rows[i][6].ToString(),
                    REORDER_data.Rows[i][7].ToString(), REORDER_data.Rows[i][8].ToString(), REORDER_data.Rows[i][9].ToString(), REORDER_data.Rows[i][10].ToString(), REORDER_data.Rows[i][11].ToString()));
             }
@@ -821,34 +821,34 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 add_SetElementAvgGridS(datas);
             else
                 add_SetElementAvgGrid(datas);
-            //xrTb_ElementAnalysis.Visible = true;
+            xrTb_ElementAnalysis.Visible = true;
 
             //元素分析表————————
-            //setXRLabelData(xrTableCell30, GetlanguageData("xrCellElementArea", languageData));//元素分析表表头
-            //setXRLabelData(xrTableCell31, GetlanguageData("xrCellElementArea_details", languageData));//详情
-            //DataTable REORDER_data = REORDER(datas[2], "Name");
-            //for (int i = 0; i < REORDER_data.Rows.Count; i++)
-            //{
-            //    double quantity = 0;
-            //    for (int a = 4; a < REORDER_data.Columns.Count; a++)
-            //    {
-            //        if (REORDER_data.Rows[i][a].ToString() != "")
-            //        {
-            //            quantity = quantity + Convert.ToDouble(REORDER_data.Rows[i][a].ToString());
-            //        }
-            //    }
-            //    string str_data = "";
-            //    for (int a = 4; a < REORDER_data.Columns.Count; a++)
-            //    {
-            //        if (REORDER_data.Rows[i][a].ToString() != "")
-            //        {
-            //            str_data = str_data + REORDER_data.Columns[a].ColumnName.ToString() + "=" + elementalAnalysis.ParameterNormalization(quantity, Convert.ToDouble(REORDER_data.Rows[i][a].ToString())) + "%" + "  ";
-            //        }
-            //    }
-            //    xrTb_ElementAnalysis.Rows.Add(addElementalAnalysisRows(REORDER_data.Rows[i]["Name"].ToString(), str_data));
-            //}
-            //xrTb_ElementAnalysis.LocationF = new PointF(10f, NeueStartposition);
-            //NeueStartposition = xrTb_ElementAnalysis.LocationF.Y + xrTb_ElementAnalysis.SizeF.Height + 10;
+            setXRLabelData(xrTableCell30, GetlanguageData("xrCellElementArea", languageData));//元素分析表表头
+            setXRLabelData(xrTableCell31, GetlanguageData("xrCellElementArea_details", languageData));//详情
+            DataTable REORDER_data = REORDER(datas[2], "Name");
+            for (int i = 0; i < REORDER_data.Rows.Count; i++)
+            {
+                double quantity = 0;
+                for (int a = 4; a < REORDER_data.Columns.Count; a++)
+                {
+                    if (REORDER_data.Rows[i][a].ToString() != "")
+                    {
+                        quantity = quantity + Convert.ToDouble(REORDER_data.Rows[i][a].ToString());
+                    }
+                }
+                string str_data = "";
+                for (int a = 4; a < REORDER_data.Columns.Count; a++)
+                {
+                    if (REORDER_data.Rows[i][a].ToString() != "")
+                    {
+                        str_data = str_data + REORDER_data.Columns[a].ColumnName.ToString() + "=" + elementalAnalysis.ParameterNormalization(quantity, Convert.ToDouble(REORDER_data.Rows[i][a].ToString())) + "%" + "  ";
+                    }
+                }
+                xrTb_ElementAnalysis.Rows.Add(addElementalAnalysisRows(REORDER_data.Rows[i]["Name"].ToString(), str_data));
+            }
+            xrTb_ElementAnalysis.LocationF = new PointF(10f, NeueStartposition);
+            NeueStartposition = xrTb_ElementAnalysis.LocationF.Y + xrTb_ElementAnalysis.SizeF.Height + 10;
         }
 
         private XRTableRow addElementalAnalysisRows(string className, string data)
@@ -1404,6 +1404,27 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             });
             return oTS_DEVs;
         }
+
+        private List<ElementalAnalysisDEVData> set_ElementalAnalysisS( string subdivision, string area, string s1, string s2, string s3, string s4, string s5, string s6, string s7, string s8, string s9, string s10)
+        {
+            List<ElementalAnalysisDEVData> oTS_DEVs = new List<ElementalAnalysisDEVData>();
+            oTS_DEVs.Add(new ElementalAnalysisDEVData
+            {
+                subdivision = subdivision,
+                Area = area,
+                s1 = s1,
+                s2 = s2,
+                s3 = s3,
+                s4 = s4,
+                s5 = s5,
+                s6 = s6,
+                s7 = s7,
+                s8 = s8,
+                s9 = s9,
+                s10 = s10
+            });
+            return oTS_DEVs;
+        }
         /// <summary>
         /// 夹杂物分析表（清洁度不需要）
         /// </summary>
@@ -2279,6 +2300,23 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         public string s9 { get; set; }
         public string s10 { get; set; }
     }
+
+    public class ElementalAnalysisDEVDataS
+    {
+        public string classify { get; set; }
+        public string subdivision { get; set; }
+        public string Area { get; set; }
+        public string s1 { get; set; }
+        public string s2 { get; set; }
+        public string s3 { get; set; }
+        public string s4 { get; set; }
+        public string s5 { get; set; }
+        public string s6 { get; set; }
+        public string s7 { get; set; }
+        public string s8 { get; set; }
+        public string s9 { get; set; }
+        public string s10 { get; set; }
+    }
     public class AreaOfInclusionDEVData
     {
         public string classify { get; set; }