清洁度数据库中增加一个氧化钴，导出元素列表有点BUG修复（元素数值修正为百分比）

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

@@ -132,10 +132,25 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                 row["Class"] = a_ElementalSubstance[i].Rows[0]["Class"].ToString();
                 double dlArea = CalculationTableColumn(a_ElementalSubstance[i], "Area");
                 row["Area"] = Math.Round(dlArea,2);
+				double ELEtotal = 0;
+				for (int a = 4; a < data[0].Columns.Count; a++)
+				{
+					ELEtotal= ELEtotal+ CalculationTableColumn(a_ElementalSubstance[i], data[0].Columns[a].ColumnName);
+				}
+
                 for (int a = 4; a < data[0].Columns.Count; a++)
                 {
-					double dlData= CalculationTableColumn(a_ElementalSubstance[i], data[0].Columns[a].ColumnName);
-                    row[data[0].Columns[a].ColumnName] = Math.Round(dlData, 2); 
+					double dlData = CalculationTableColumn(a_ElementalSubstance[i], data[0].Columns[a].ColumnName);
+					//               row[data[0].Columns[a].ColumnName] = Math.Round(dlData, 2);
+					if (dlData == 0.0)
+					{
+						row[data[0].Columns[a].ColumnName] = 0;
+					}
+					else
+					{
+						double ColVal = Convert.ToDouble(dlData / ELEtotal * 100);
+						row[data[0].Columns[a].ColumnName] = Math.Round(ColVal, 2);
+					}
 				}
                 dt_ElementalSubstance.Rows.Add(row);
 
@@ -145,10 +160,25 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                     dr["Area"] = Math.Round(Convert.ToDouble(data[i].Rows[a]["Area"]), 2);
                     dr["TypeId"] = data[i].Rows[a]["TypeId"].ToString();
 					dr["Name"]= data[i].Rows[a]["TypeName"].ToString();
-                    for (int j = 4; j < data[0].Columns.Count; j++)
+					double datotal = 0;
+					for (int j = 4; j < data[0].Columns.Count; j++)
+					{
+						datotal= datotal+ Convert.ToDouble(data[i].Rows[a][data[0].Columns[j].ColumnName]);
+					}
+
+					for (int j = 4; j < data[0].Columns.Count; j++)
                     {
                         double dlData = Convert.ToDouble(data[i].Rows[a][data[0].Columns[j].ColumnName]);
-                        dr[data[0].Columns[j].ColumnName] = Math.Round(dlData, 2);
+						if (dlData == 0)
+						{
+							dr[data[0].Columns[j].ColumnName] = 0;
+						}
+						else
+						{
+							double ColVal = Convert.ToDouble(dlData / datotal * 100);
+							dr[data[0].Columns[j].ColumnName] = Math.Round(ColVal, 2);
+						}
+							//dr[data[0].Columns[j].ColumnName] = Math.Round(dlData, 2);
 
 					}
                     dt_ElementalSubstance.Rows.Add(dr);