临时提交，导出失败的问题

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -797,13 +797,13 @@
 	  <Control name="sscaptionname24" text="选择颗粒" />
 	  <Control name="sscaptionname25" text="测量结果概况" />
 	  <Control name="sscaptionname26" text="样品测量信息" />
-	  <Control name="sscaptionname27" text="颗粒成分" />
+	  <Control name="sscaptionname27" text="颗粒成分子分类" />
 	  <Control name="sscaptionname29" text="颗粒尺寸分布" />
 	  <Control name="sscaptionname30" text="平均元素成分" />
-          <Control name="m_reportname1" text="颗粒分组" />
+          <Control name="m_reportname1" text="颗粒成分分类" />
 	  <Control name="m_str_axisy1" text="颗粒数" />
 	  <Control name="str_operatonmodule1" text="常用颗粒分类图" />
-	  <Control name="m_reportname2" text="颗粒成份" />
+	  <Control name="m_reportname2" text="颗粒成分子分类" />
 	  <Control name="m_str_axisy2" text="颗粒数" />
 	  <Control name="str_operatonmodule2" text="颗粒成份图" />
 	  <Control name="m_reportname4" text="颗粒尺寸分布" />
@@ -821,7 +821,7 @@
 	  <Control name="ChineseStandard2" text="国标方法二" />
 	  <Control name="AmericanStandard" text="美标" />
 	  <Control name="GermanStandard" text="德标" />
-	  <Control name="CommonClassification" text="颗粒分组" />
+	  <Control name="CommonClassification" text="颗粒成分分类" />
 	  <Control name="AllParticles" text="全部颗粒" />
 	  <Control name="SelectParticles" text="选择颗粒" />
 	  <Control name="DataSourceType" text="数据源类型" />
@@ -1237,7 +1237,7 @@
   <Form>
     <Name>SampleGrid</Name>
     <Controls>
-      <Control name="m_reportname1" text="颗粒分组" />
+      <Control name="m_reportname1" text="颗粒成分分类" />
 	  <Control name="m_str_axisy1" text="颗粒数" />
 	  <Control name="str_operatonmodule1" text="常用颗粒分类图" />
 	  <Control name="m_reportname2" text="颗粒成份" />

OTSIncAReportApp/1-UI/Control_ECharts/EChart_ParticlesComposition.cs

@@ -401,7 +401,7 @@ namespace OTSIncAReportApp.Control_ECharts
             AreaRatio.Columns.Add("e3", typeof(double));
             AreaRatio.Columns.Add("e4");
             AreaRatio.Columns.Add("e5");
-
+            AreaRatio.Columns.Add("Cunt", typeof(int));
 
             //获取夹杂物的总面积用于计算夹杂物类别的占比（gridview最后一个固定是未识别颗粒，要排除未识别颗粒所以for循环至grid view长度减一）
             double totalInclusionArea = 0;
@@ -414,6 +414,7 @@ namespace OTSIncAReportApp.Control_ECharts
                 dr2["e3"] = Convert.ToDouble(AllAnalysisDetails.Rows[i]["Area"]);
                 dr2["e4"] = Math.Round((Convert.ToDouble(AllAnalysisDetails.Rows[i]["Area"]) / totalInclusionArea) * 100, 2);
                 dr2["e5"] = Math.Round((Convert.ToDouble(AllAnalysisDetails.Rows[i]["Area"]) / Convert.ToDouble(str_SCZS)) * 100, 4);
+                dr2["Cunt"]= AllAnalysisDetails.Rows[i]["Cunt"].ToString();
                 AreaRatio.Rows.Add(dr2);
             }
 
@@ -461,12 +462,14 @@ namespace OTSIncAReportApp.Control_ECharts
                 {
                     double totalInclusionArea2 = Convert.ToDouble(decimal.Parse(AreaRatio_dt.Compute("sum(e3)", "").ToString()));
                     double Area = Convert.ToDouble(decimal.Parse(dt.Compute("sum(e3)", "").ToString()));
+                    int cunt= Convert.ToInt32(decimal.Parse(dt.Compute("sum(Cunt)", "").ToString()));
                     DataRow dr3 = AllAnalysisDetails1.NewRow();
                     dr3["e1"] = ClassName[i].ToString();
                     dr3["e3"] = Math.Round(Area, 2);
                     //Convert.ToDouble(decimal.Parse(dt.Compute("sum(e3)", "").ToString()));
                     dr3["e4"] = Math.Round((Convert.ToDouble(dt.Rows[0]["e3"]) / totalInclusionArea2) * 100, 2);
                     dr3["e5"] = Math.Round((Convert.ToDouble(dt.Rows[0]["e3"]) / Convert.ToDouble(str_SCZS)) * 100, 4);
+                    dr3["Cunt"] = cunt;
                     AllAnalysisDetails1.Rows.Add(dr3);
                 }
             }