报告优化2024-09-04

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

@@ -416,47 +416,94 @@
  <Form>
     <Name>OTSReport_Export</Name>
     <Controls>
-   	<Control name="OTSReport_Export" text="Report program output interface" />
-	<Control name="label3" text="Template" />
-	<Control name="label4" text="Source" />
-	<Control name="btn_TempDes" text="Edit" />
-	<Control name="button3" text="Open File" />
-	<Control name="label2" text="Schedule" />
-	<Control name="button7" text="GBExport" />
-	<Control name="btn_preview" text="Create" />
-	<Control name="btn_exit" text="Exit" />
-	
-	<Control name="loading" text="Load: " />
-	
-	<Control name="measurement_result" text="Loading: Measurement Result Information Table" />
-	<Control name="measurementResult_fail" text="Measurement result information table loading failed! "/>
-	
-	<Control name="particle_size" text= "Loading: Particle Size Analysis Table" />
-	<Control name="particle_size_fail" text="Particle size analysis table loading failed!" />
-	
-	<Control name="elemental_analysis" text="Loading: Element Analysis Table" />
-	<Control name="elemental_analysis_fail" text="Element analysis table loading failed!" />
-	
-	<Control name="inclusion" text="Loading: Inclusion area ratio table" />
-	<Control name="inclusion_fail" text="Inclusion area ratio table loading failed!" />
-	
-	<Control name="inclusion_chart" text="Loading: Inclusion area ratio chart" />
-	<Control name="inclusion_chart_fail" text="Inclusion area loading failed!" />
-	
-	<Control name="ternary_diagram" text="Loading: Ternary Diagram" />
-	<Control name="ternary_diagram_fail" text="Loading of ternary diagram failed!" />
-	
-	<Control name="particle_list" text="Loading: Particle List" />
-	<Control name="particle_list_fail" text="Particle list loading failed!" />
-	
-	<Control name="particle_list_chart" text="Loading: Granular Frame Graph List" />
-	<Control name="particle_list_chart_fail" text="Particle frame chart list loading failed!" />
+		<Control name="OTSReport_Export" text="Report program output interface" />
+		<Control name="label3" text="Template" />
+		<Control name="label4" text="Source" />
+		<Control name="btn_TempDes" text="Edit" />
+		<Control name="button3" text="Open File" />
+		<Control name="label2" text="Schedule" />
+		<Control name="button7" text="GBExport" />
+		<Control name="btn_preview" text="Create" />
+		<Control name="btn_exit" text="Exit" />	
+		<Control name="loading" text="Load: " />	
+		<Control name="measurement_result" text="Loading: Measurement Result Information Table" />
+		<Control name="measurementResult_fail" text="Measurement result information table loading failed! "/>	
+		<Control name="particle_size" text= "Loading: Particle Size Analysis Table" />
+		<Control name="particle_size_fail" text="Particle size analysis table loading failed!" />	
+		<Control name="elemental_analysis" text="Loading: Element Analysis Table" />
+		<Control name="elemental_analysis_fail" text="Element analysis table loading failed!" />	
+		<Control name="inclusion" text="Loading: Inclusion area ratio table" />
+		<Control name="inclusion_fail" text="Inclusion area ratio table loading failed!" />	
+		<Control name="inclusion_chart" text="Loading: Inclusion area ratio chart" />
+		<Control name="inclusion_chart_fail" text="Inclusion area loading failed!" />
+		<Control name="ternary_diagram" text="Loading: Ternary Diagram" />
+		<Control name="ternary_diagram_fail" text="Loading of ternary diagram failed!" />
+		<Control name="particle_list" text="Loading: Particle List" />
+		<Control name="particle_list_fail" text="Particle list loading failed!" />
+		<Control name="particle_list_chart" text="Loading: Granular Frame Graph List" />
+		<Control name="particle_list_chart_fail" text="Particle frame chart list loading failed!" />
+		<Control name="complete" text="-----------------Loading completed!--------------------" />	  
+		<Control name="language" text="EN" />  
+		<Control name="library_does_not_match" text="Standard library not compliant!" />
+	  
+	  
+	  
+	  
+	  <Control name="dev_ypbh_up" text="SamlpID:" /> 
+	  <Control name="dev_bgsj_up" text="ReportTime:" /> 
+	  <Control name="dev_jcjgwj_up" text="ResultFile:" /> 
+	  <Control name="dev_ckbz_up" text="Reference standard:" /> 
+	  <Control name="dev_ypsm" text="Sample description" /> 
+	  <Control name="dev_jcjgwj" text="SampleName:" /> 
+	  <Control name="dev_cljggk" text="Measure results" /> 
+	  <Control name="dev_yxsj" text="Run time:" /> 
+	  <Control name="dev_sczs" text="Fields Count:" /> 
+	  <Control name="dev_flfa" text="Classification scheme:" /> 
+	  <Control name="dev_ckbz" text="Reference standard:" /> 
+	  <Control name="dev_yjctz" text="Checked features:" /> 
+	  <Control name="dev_scmj" text="Fields area(sq.μm):" /> 
+	  <Control name="dev_bgsj" text="Report time:" /> 
+	  <Control name="dev_fdbs" text="Magnification:" /> 
+	  <Control name="xrlabel_size_iconquestion_class" text="Particle size class" /> 
+	  <Control name="xrlabel_size_iconquestion_subdivision" text="Particle size classification" /> 
+	  <Control name="xrcellelementarea" text="Element area" /> 
+	  <Control name="xrcellelementarea_details" text="Reported average chemical composition (w %), area(μ m^2)" /> 
+	  <Control name="xrcell_element_classify" text="classify" /> 
+	  <Control name="xrcell_element_subdivision" text="subdivision" /> 
+	  <Control name="xrcell_element_area" text="Area" /> 
+	  <Control name="xrcellareaofinclusion" text="Area of inclusion" /> 
+	  <Control name="xrcell_inclusion_classify" text="classify" /> 
+	  <Control name="xrcell_inclusion_subdivision" text="subdivision" /> 
+	  <Control name="xrcell_inclusion_area" text="Area(μm^2)" /> 
+	  <Control name="xrcell_inclusion_percentageofinca" text="percentage of IncA(%)" /> 
+	  <Control name="xrcell_inclusion_fieldratio" text="Area ratio of particle 
+
+field of view(%)" /> 
+	  <Control name="xrlabel_inca_pic_class" text="Area ratio of inclusions" /> 
+	  <Control name="xrlabel_inca_pic_subdivision" text="Inclusion fine classification area ratio" /> 
+	  <Control name="dev_dimensiontable" text="Particle size analysis results" /> 
+	  <Control name="dev_classify" text="classify" /> 
+	  <Control name="dev_subdivision" text="subdivision" /> 
+	  <Control name="dev_quantity" text="quantity" /> 
+	  
+	  <Control name="dev_dimensiontable_2" text="Dimensional calculations are based on:" /> 
+	  <Control name="dev_total" text="Total" /> 
+	  <Control name="dev_ternary_diagram" text="Ternary diagram" /> 
+	  <Control name="dev_particle_list" text="Particle List" /> 
+	  <Control name="dev_frame_diagram" text="Frame " /> 
+	  <Control name="dev_image" text="Image" /> 
+	  <Control name="dev_class" text="Class" /> 
+	  <Control name="dev_Page" text="Page" /> 
+	  <Control name="dev_of" text="of" />
+	  <Control name="tcell_name" text="Inclusion Index" /> 
+	  <Control name="tcell_notes" text="Inclusion Index = Area of Inclusions / Area Scanned * Scaling Factor" /> 
+	  <Control name="xrtablecell1" text="Notes" /> 
+	  <Control name="xrlabel1" text="Particle stacking diagram" /> 
 	
-	<Control name="complete" text="-----------------Loading completed!--------------------" />
 	  
-	 <Control name="language" text="EN" />
 	  
-	  <Control name="library_does_not_match" text="Standard library not compliant!" />
+	  
+	  
     </Controls>
  </Form>
 <Form>
@@ -542,6 +589,20 @@
 	<Control name="GB_cb_1" text="GB30834 Method 1" />
 	<Control name="GB_cb_2" text="GB30834 Method 2" />
 	<Control name="button1" text="Generate" />
+	
+	
+	
+	<Control name="gb_dev_ckbz" text="Reference standard:" /> 
+	  <Control name="gb_dev_yjctz" text="Checked features:" /> 
+	  <Control name="gb_dev_sczs" text="Fields Count:" /> 
+	  <Control name="gb_dev_scmj" text="Fields area(sq.μm):" /> 
+	  <Control name="gb_dev_flfa" text="Classification scheme:" /> 
+	  <Control name="gb_dev_yxsj" text="Run time:" /> 
+	  <Control name="gb_dev_cljggk" text="Measure results" /> 
+	  <Control name="gb_dev_jcjgwj" text="SampleName:" /> 
+	  <Control name="gb_dev_ypsm" text="Sample description" /> 
+	  <Control name="gb_bt" text="Standard Rating" /> 
+	  <Control name="gb_dev_ym" text="GB30834" /> 
 	</Controls>
  </Form>
  

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

@@ -365,7 +365,6 @@
 <Form>
     <Name>OTSReport_Export</Name>
     <Controls>
-	
 	<Control name="OTSReport_Export" text="报告程序输出界面" />
 	<Control name="label3" text="选择模板" />
 	<Control name="label4" text="数 据 源" />
@@ -375,39 +374,79 @@
 	<Control name="button7" text="国标导出" />
 	<Control name="btn_preview" text="打开报表" />
 	<Control name="btn_exit" text="退  出" />
-	
 	<Control name="loading" text="加载：" />
-	
 	<Control name="measurement_result" text="加载：测量结果信息表……" />
 	<Control name="measurementResult_fail" text="测量结果信息表加载失败！" />
-	
 	<Control name="particle_size" text="加载：颗粒尺寸分析表……" />
 	<Control name="particle_size_fail" text="颗粒尺寸分析表加载失败！" />
-	
 	<Control name="elemental_analysis" text="加载：元素分析表……" />
 	<Control name="elemental_analysis_fail" text="元素分析表加载失败！" />
-	
 	<Control name="inclusion" text="加载：夹杂物面积比表……" />
 	<Control name="inclusion_fail" text="夹杂物面积比表加载失败！" />
-	
 	<Control name="inclusion_chart" text="加载：夹杂物面积比图……" />
 	<Control name="inclusion_chart_fail" text="夹杂物面积加载失败！" />
-	
 	<Control name="ternary_diagram" text="加载：三元图……" />
 	<Control name="ternary_diagram_fail" text="三元图加载失败！" />
-	
 	<Control name="particle_list" text="加载：颗粒列表……" />
 	<Control name="particle_list_fail" text="颗粒列表加载失败！" />
-	
 	<Control name="particle_list_chart" text="加载：颗粒帧图列表……" />
 	<Control name="particle_list_chart_fail" text="颗粒帧图列表加载失败！" />
-	
 	<Control name="complete" text="-----------------加载完成！--------------------" />
-	
 	<Control name="language" text="ZH" />
-	
 	<Control name="library_does_not_match" text="未找到标准库！" />
 	
+	
+	
+	
+	<Control name="dev_bgsj_up" text="报告时间:" />
+	<Control name="dev_jcjgwj_up" text="测量结果文件:" />
+	<Control name="dev_ckbz_up" text="参考标准:" />
+	<Control name="dev_ypsm" text="样品说明" />
+	<Control name="dev_jcjgwj" text="测量结果名称:" />
+	<Control name="dev_cljggk" text="测量结果概况" />
+	<Control name="dev_yxsj" text="运行时间:" />
+	<Control name="dev_sczs" text="视场总数:" />
+	<Control name="dev_flfa" text="分类方案:" />
+	<Control name="dev_ckbz" text="参考标准:" />
+	<Control name="dev_yjctz" text="已检查特征:" />
+	<Control name="dev_scmj" text="检测面积：" />
+	<Control name="dev_bgsj" text="报告时间:" />
+	<Control name="dev_fdbs" text="测量放大倍数:" />
+	<Control name="xrlabel_size_iconquestion_class" text="颗粒尺寸分类图" />
+	<Control name="xrlabel_size_iconquestion_subdivision" text="颗粒尺寸二级分类图" />
+	<Control name="xrcellelementarea" text="元素分析表" />
+	<Control name="xrcellelementarea_details" text="Reported average chemical composition (w %), area(μ m^2)" />
+	<Control name="xrcell_element_classify" text="分类" />
+	<Control name="xrcell_element_subdivision" text="二级分类" />
+	<Control name="xrcell_element_area" text="面积" />
+	<Control name="xrcellareaofInclusion" text="夹杂物面积比表" />
+	<Control name="xrcell_inclusion_classify" text="分类" />
+	<Control name="xrcell_inclusion_subdivision" text="二级分类" />
+	<Control name="xrcell_inclusion_area" text="面积(μm^2)" />
+	<Control name="xrcell_inclusion_percentageofinca" text="夹杂物比(%)" />
+	<Control name="xrcell_inclusion_fieldratio" text="视场占比(%)" />
+	<Control name="xrLabel_inca_pic_class" text="夹杂物分类比" />
+	<Control name="xrLabel_inca_pic_subdivision" text="夹杂物细分类比" />
+
+	<Control name="dev_dimensiontable_2" text="尺寸计算基于:" />
+	<Control name="dev_dimensiontable" text="颗粒尺寸分析结果" />
+	<Control name="dev_classify" text="分类" />
+	<Control name="dev_subdivision" text="二级分类" />
+	<Control name="dev_quantity" text="数量" />
+	<Control name="dev_total" text="总数量" />
+	<Control name="dev_ternary_diagram" text="三元图" />
+	<Control name="dev_particle_list" text="颗粒列表" />
+	<Control name="dev_frame_diagram" text="帧图 " />
+	<Control name="dev_image" text="图像" />
+	<Control name="dev_class" text="分类" />
+	<Control name="dev_page" text="页码" />
+	<Control name="dev_of" text="/" />
+	<Control name="tcell_name" text="特征/夹杂物指数" />
+	<Control name="tcell_notes" text="夹杂物指数=夹杂物面积/扫描面积*比例因子" />
+	<Control name="xrtablecell1" text="备注" />
+	<Control name="dev_ypbh_up" text="样品编号:" />
+	<Control name="xrlabel1" text="颗粒堆叠图" />
+	
     </Controls>
  </Form>
  
@@ -544,6 +583,19 @@
 	<Control name="GB_cb_1" text="GB30834方法一" />
 	<Control name="GB_cb_2" text="GB30834方法二" />
 	<Control name="button1" text="生成" />
+	
+	
+	<Control name="gb_dev_ckbz" text="参考标准:" />
+	<Control name="gb_dev_yjctz" text="已检查特征:" />
+	<Control name="gb_dev_sczs" text="视场总数:" />
+	<Control name="gb_dev_scmj" text="总视场面积:" />
+	<Control name="gb_dev_flfa" text="分类方案:" />
+	<Control name="gb_dev_yxsj" text="运行时间:" />
+	<Control name="gb_dev_cljggk" text="测量结果概况" />
+	<Control name="gb_dev_jcjgwj" text="测量结果名称:" />
+	<Control name="gb_dev_ypsm" text="样品说明" />
+	<Control name="gb_bt" text="标准评级" />
+	<Control name="gb_dev_ym" text="GB30834" />
 	</Controls>
  </Form>
  

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

@@ -14,6 +14,8 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
     {
         ParticleData fielddata;
         private string SizeChart = "";
+
+        List<string> colid = new List<string>();
         private DataTable BData = new DataTable();
         private DataTable AllClass = new DataTable();
         private DataTable AllElement = new DataTable();
@@ -28,14 +30,26 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                  m_otsreport_export.m_ReportApp.m_rstDataMgr.m_RptConfigFile.PartSizeFile;
             DataSet ds = OTSIncAReportApp.DataOperation.DataAccess.XMLoperate.GetXml(path1);
             SizeChart = ds.Tables[0].Rows[0]["Sizes"].ToString();
+
+            for (int i = 0; i < SizeChart.Split(',').Length - 1; i++)
+            {
+                if (SizeChart.Split(',')[i].Length > 0)
+                {
+                    double d1 = Convert.ToDouble(SizeChart.Split(',')[i]);
+                    double d2 = Convert.ToDouble(SizeChart.Split(',')[i + 1]);
+                    colid.Add(d1.ToString() + "~" + d2.ToString());
+                }
+            }
+            double d = Convert.ToDouble(SizeChart.Split(',')[SizeChart.Split(',').Length - 1]);
+            colid.Add(d.ToString() + "~MAX");
         }
         /// <summary>
         /// 获取粒级表
         /// </summary>
         /// <returns></returns>
-        public string GetParticlesizeTable()
+        public List<string> GetParticlesizeTable()
         {
-            return SizeChart;
+            return colid;
         }
 
         public void SetDBData(c_TemplateClass m_mbszclass, OTSReport_Export m_otsreport_export, string ComputeMode)

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

@@ -2,6 +2,7 @@
 using System.Data;
 using OTSIncAReportApp.ReportTemplate;
 using OTSIncAReportApp.OTSSampleReportInfo;
+using System.Collections;
 
 namespace OTSIncAReportApp.OTSTemplateDesigner
 {
@@ -44,13 +45,13 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             }
             
         }
-        public void criterion_out(GBReport GB_Report, OTSReport_Export in_export,int Index,DataTable dev_internationalLanguage,bool gb_1,bool gb_2,bool AmericanStandard,bool GermanStandard)
+        public void criterion_out(GBReport GB_Report, OTSReport_Export in_export,int Index, Hashtable table, bool gb_1,bool gb_2,bool AmericanStandard,bool GermanStandard)
         {
             //首页信息
            
-            GB_Report = new GBReport(in_export);
+            GB_Report = new GBReport(in_export, table);
             
-            GB_Report.International_language(dev_internationalLanguage);
+            GB_Report.International_language();
 
 
             for (int i = 0; i < m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList.Count; i++)

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

@@ -23,20 +23,9 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
         public DataTable GetLargeClassification(BasicData basicData)
         {
             DataTable data = basicData.GetDBData();
-            List<string> colid = new List<string>();
             //获取粒级表
-            string sizestr = basicData.GetParticlesizeTable();
-            for (int i = 0; i < sizestr.Split(',').Length - 1; i++)
-            {
-                if (sizestr.Split(',')[i].Length > 0)
-                {
-                    double d1 = Convert.ToDouble(sizestr.Split(',')[i]);
-                    double d2 = Convert.ToDouble(sizestr.Split(',')[i + 1]);
-                    colid.Add(d1.ToString() + "~" + d2.ToString());
-                }
-            }
-            double d = Convert.ToDouble(sizestr.Split(',')[sizestr.Split(',').Length - 1]);
-            colid.Add(d.ToString() + "~MAX");
+            List<string> colid = basicData.GetParticlesizeTable();
+        
             DataTable ls_partsize_dt = new DataTable();
             ls_partsize_dt.TableName = "PartSize";
             ls_partsize_dt.Columns.Add("c1");
@@ -132,21 +121,8 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
         {
 
             DataTable data = basicData.GetDBData();
-            List<string> colid = new List<string>();
             //获取粒级表
-            string sizestr = basicData.GetParticlesizeTable();
-            for (int i = 0; i < sizestr.Split(',').Length - 1; i++)
-            {
-                if (sizestr.Split(',')[i].Length > 0)
-                {
-                    double d1 = Convert.ToDouble(sizestr.Split(',')[i]);
-                    double d2 = Convert.ToDouble(sizestr.Split(',')[i + 1]);
-                    colid.Add(d1.ToString() + "~" + d2.ToString());
-                }
-            }
-            double d = Convert.ToDouble(sizestr.Split(',')[sizestr.Split(',').Length - 1]);
-            colid.Add(d.ToString() + "~MAX");
-
+            List<string> colid = basicData.GetParticlesizeTable();
             //------------------------------------------------
             DataTable ls_partsize_dt = new DataTable();
             ls_partsize_dt.TableName = "PartSize";
@@ -231,21 +207,9 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
         {
             List<DataTable> datas = new List<DataTable>();
             DataTable data = basicData.GetDBData();
-            List<string> colid = new List<string>();
             //获取粒级表
-            string sizestr = basicData.GetParticlesizeTable();
+            List<string> colid = basicData.GetParticlesizeTable();
 
-            for (int i = 0; i < sizestr.Split(',').Length - 1; i++)
-            {
-                if (sizestr.Split(',')[i].Length > 0)
-                {
-                    double d1 = Convert.ToDouble(sizestr.Split(',')[i]);
-                    double d2 = Convert.ToDouble(sizestr.Split(',')[i + 1]);
-                    colid.Add(d1.ToString() + "~" + d2.ToString());
-                }
-            }
-            double d = Convert.ToDouble(sizestr.Split(',')[sizestr.Split(',').Length - 1]);
-            colid.Add(d.ToString() + "~MAX");
             //------------------------------------------------
             DataTable ls_partsize_dt = new DataTable();
             ls_partsize_dt.TableName = "PartSize";
@@ -358,24 +322,8 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
         public DataTable GetChartDataCalss(BasicData basicData)
         {
             DataTable data =basicData.GetDBData();
-            List<string> colid = new List<string>();
             //获取粒级表
-            
-            string sizestr = basicData.GetParticlesizeTable();
-
-            for (int i = 0; i < sizestr.Split(',').Length - 1; i++)
-            {
-                if (sizestr.Split(',')[i].Length > 0)
-                {
-                    double d1 = Convert.ToDouble(sizestr.Split(',')[i]);
-                    double d2 = Convert.ToDouble(sizestr.Split(',')[i + 1]);
-                    colid.Add(d1.ToString() + "~" + d2.ToString());
-                }
-            }
-            double d = Convert.ToDouble(sizestr.Split(',')[sizestr.Split(',').Length - 1]);
-            colid.Add(d.ToString() + "~MAX");
-            //ParticleData fielddata = new ParticleData(m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.getSelectedIndex()].FilePath);
-
+            List<string> colid = basicData.GetParticlesizeTable();
             //------------------------------------------------
             DataTable ls_partsize_dt = new DataTable();
             ls_partsize_dt.TableName = "PartSize";

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.cs

@@ -689,13 +689,13 @@ namespace OTSIncAReportApp
                     richTextBox1.SelectionStart = 0; // 设置选择开始位置 
                     richTextBox1.AppendText(table["measurement_result"].ToString() + "\n");
                     richTextBox1.AppendText(table["loading"].ToString() + Math.Round(d1, length).ToString() + "%\n");
-                    DEVReport.International_language(dev_internationalLanguage());
+                    DEVReport.International_language();
                     bool isINCA = false;
                     if (m_ReportApp.m_RptConfigFile.Systype != OTS_SysType_ID.CleannessA)
                     {
                         isINCA = true;
                     }
-                        DEVReport.setResultGrid(dev_internationalLanguage(), isINCA);
+                        DEVReport.setResultGrid(isINCA);
                     richTextBox1.ScrollToCaret();
                 }
             }
@@ -1073,12 +1073,11 @@ namespace OTSIncAReportApp
 
             m_mbszclass.M_DZ.Notes = Convert.ToString(xmlutil.Read("M_DZ", "Notes"));
         }
-        #endregion
+        #endregion                                                                                                                             
         private void button7_Click(object sender, EventArgs e)
         {
             OTSReport_criterion criterion = new OTSReport_criterion(m_export_reporttemplate, GB_Report,this);
             criterion.Sample_order = cbo_sjy.SelectedIndex;
-            criterion.Language_dt = dev_internationalLanguage();
             criterion.ShowDialog();
         }
        
@@ -1086,21 +1085,7 @@ namespace OTSIncAReportApp
         {
            
         }
-          /// <summary>
-        /// 从数据库中读取语言配置信息
-        /// </summary>
-        /// <returns></returns>
-        private DataTable dev_internationalLanguage()
-        {
-            string Language;
-            if (table["language"].ToString() == "ZH")
-                Language = "ZH";
-            else
-                Language = "EN";
-            OTSCommon.SqLiteHelper sh = new OTSCommon.SqLiteHelper("data source='" + System.IO.Directory.GetCurrentDirectory() + "\\Config\\ReportTemplate\\language.db'");
-            DataTable dt_stl = sh.ExecuteQuery("select * from "+ Language);
-            return dt_stl;
-        }
+    
 
         private void ReadClassificationNo()
         {

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_criterion.cs

@@ -23,7 +23,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         OTSReport_Export in_export;
         Hashtable table;
         public int Sample_order { set; get; }
-        public DataTable Language_dt { set; get; }
 
         public OTSReport_criterion(GBData Export_Report, GBReport gb_Report, OTSReport_Export In_export)
         {
@@ -40,7 +39,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         private void button1_Click(object sender, EventArgs e)
         {
             Cursor.Current = Cursors.WaitCursor;
-            export_Report.criterion_out(GB_Report, in_export, Sample_order, Language_dt, GB_cb_1.Checked, GB_cb_2.Checked,false,false);
+            export_Report.criterion_out(GB_Report, in_export, Sample_order, table, GB_cb_1.Checked, GB_cb_2.Checked,false,false);
             Cursor.Current = Cursors.WaitCursor;
             this.Close();
         }

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

@@ -30,15 +30,16 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         DataTable FrameData = new DataTable();
         ElementSubscript subscript = new ElementSubscript();
         c_TemplateClass TemplateClass;
-        DataTable languageData = new DataTable();
         private string ComputeMode = "";//计算方式
         private string ComputeModeName = "";//计算方式
         private string PartSizeFile = "";//粒级文件
         BasicData basicData = new BasicData();
 
-        System.Collections.Hashtable table;
+        Hashtable table;
         public OTS_DEVReport(OTSReport_Export in_export, c_TemplateClass a_Template, frmReportApp a_frmReportApp , Hashtable a_table)
         {
+            table = a_table;
+
             TemplateClass = a_Template;
             m_otsreport_export = in_export;
             TemplateList = new List<string>();
@@ -121,7 +122,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// 国际化显示
         /// </summary>
         /// <param name="languageData"></param>
-        public void International_language(DataTable a_languageData)
+        public void International_language()
         {
             basicData = new BasicData();
             basicData.SetDBData(TemplateClass,m_otsreport_export,ComputeMode);
@@ -131,40 +132,36 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             basicData.SetAllElement();
             basicData.IsThereAMajorClassification();
 
-            languageData = a_languageData.Copy();
-            setXRLabelData(dev_ypbh_up, GetlanguageData(dev_ypbh_up.Name.ToString(), languageData, dev_ypbh_up.Text));//样品编号（中间的）
-            setXRLabelData(dev_bgsj_up, GetlanguageData(dev_bgsj_up.Name.ToString(), languageData, dev_bgsj_up.Text));//报告时间（中间的）
-            //setXRLabelData(dev_jcjgwj_up, GetlanguageData(dev_jcjgwj_up.Name.ToString(), languageData));//检测结果文件（中间的）
-            //setXRLabelData(dev_ckbz_up, GetlanguageData(dev_ckbz_up.Name.ToString(), languageData));//参考标准（中间的）
-            setXRLabelData(dev_ypsm, GetlanguageData(dev_ypsm.Name.ToString(), languageData, dev_ypsm.Text));//表中样品说明
-            setXRLabelData(dev_jcjgwj, GetlanguageData(dev_jcjgwj.Name.ToString(), languageData, dev_jcjgwj.Text));//表中测量结果名称
-            setXRLabelData(dev_cljggk, GetlanguageData(dev_cljggk.Name.ToString(), languageData, dev_cljggk.Text));//表中测量结果概况
-            setXRLabelData(dev_yxsj, GetlanguageData(dev_yxsj.Name.ToString(), languageData, dev_yxsj.Text));//表中运行时间
-            setXRLabelData(dev_sczs, GetlanguageData(dev_sczs.Name.ToString(), languageData, dev_sczs.Text));//表中视场总数
-            setXRLabelData(dev_flfa, GetlanguageData(dev_flfa.Name.ToString(), languageData, dev_flfa.Text));//表中分类方案
-            setXRLabelData(dev_ckbz, GetlanguageData(dev_ckbz.Name.ToString(), languageData, dev_ckbz.Text));//表中参考标准
-            setXRLabelData(dev_yjctz, GetlanguageData(dev_yjctz.Name.ToString(), languageData, dev_yjctz.Text));//表中已检测特征
-            setXRLabelData(dev_scmj, GetlanguageData(dev_scmj.Name.ToString(), languageData, dev_scmj.Text));//表中视场面积  总检测面积
-            setXRLabelData(dev_bgsj, GetlanguageData(dev_bgsj.Name.ToString(), languageData, dev_bgsj.Text));//表中报告时间
-            setXRLabelData(dev_fdbs, GetlanguageData(dev_fdbs.Name.ToString(), languageData, dev_fdbs.Text));//表中放大倍数
+       
+            setXRLabelData(dev_ypbh_up, GetlanguageData("dev_ypbh_up",  dev_ypbh_up.Text));//样品编号（中间的）
+            setXRLabelData(dev_bgsj_up, GetlanguageData("dev_bgsj_up", dev_bgsj_up.Text));//报告时间（中间的）
+  
+            setXRLabelData(dev_ypsm, GetlanguageData("dev_ypsm", dev_ypsm.Text));//表中样品说明
+            setXRLabelData(dev_jcjgwj, GetlanguageData("dev_jcjgwj", dev_jcjgwj.Text));//表中测量结果名称
+            setXRLabelData(dev_cljggk, GetlanguageData("dev_cljggk", dev_cljggk.Text));//表中测量结果概况
+            setXRLabelData(dev_yxsj, GetlanguageData("dev_yxsj", dev_yxsj.Text));//表中运行时间
+            setXRLabelData(dev_sczs, GetlanguageData("dev_sczs", dev_sczs.Text));//表中视场总数
+            setXRLabelData(dev_flfa, GetlanguageData("dev_flfa", dev_flfa.Text));//表中分类方案
+            setXRLabelData(dev_ckbz, GetlanguageData("dev_ckbz", dev_ckbz.Text));//表中参考标准
+            setXRLabelData(dev_yjctz, GetlanguageData("dev_yjctz", dev_yjctz.Text));//表中已检测特征
+            setXRLabelData(dev_scmj, GetlanguageData("dev_scmj", dev_scmj.Text));//表中视场面积  总检测面积
+            setXRLabelData(dev_bgsj, GetlanguageData("dev_bgsj", dev_bgsj.Text));//表中报告时间
+            setXRLabelData(dev_fdbs, GetlanguageData("dev_fdbs", dev_fdbs.Text));//表中放大倍数
             //颗粒列表图
-            setXRLabelData(xrLabel_size_IconQuestion_Class, GetlanguageData(xrLabel_size_IconQuestion_Class.Name.ToString(), languageData, xrLabel_size_IconQuestion_Class.Text));//大类图表头
-            setXRLabelData(xrLabel_size_IconQuestion_Subdivision, GetlanguageData(xrLabel_size_IconQuestion_Subdivision.Name.ToString(), languageData, xrLabel_size_IconQuestion_Subdivision.Text));//细分类表头
+            setXRLabelData(xrLabel_size_IconQuestion_Class, GetlanguageData("xrlabel_size_iconquestion_class", xrLabel_size_IconQuestion_Class.Text));//大类图表头
+            setXRLabelData(xrLabel_size_IconQuestion_Subdivision, GetlanguageData("xrlabel_size_iconquestion_subdivision", xrLabel_size_IconQuestion_Subdivision.Text));//细分类表头
            
             //夹杂物面积比
      
             //夹杂物面积比图
-            setXRLabelData(xrLabel_inca_pic_class, GetlanguageData(xrLabel_inca_pic_class.Name.ToString(), languageData, xrLabel_inca_pic_class.Text));//夹杂物面积比图
-            setXRLabelData(xrLabel_inca_pic_subdivision, GetlanguageData(xrLabel_inca_pic_subdivision.Name.ToString(), languageData, xrLabel_inca_pic_subdivision.Text));
-            //setXRLabelData(xrLabel_size_IconQuestion_Subdivision, GetlanguageData(xrLabel_size_IconQuestion_Subdivision.Name.ToString(), languageData));
-            //setXRLabelData(xrTableCell1, GetlanguageData(xrTableCell1.Name.ToString(), languageData));//备注
+            setXRLabelData(xrLabel_inca_pic_class, GetlanguageData("xrlabel_inca_pic_class", xrLabel_inca_pic_class.Text));//夹杂物面积比图
+            setXRLabelData(xrLabel_inca_pic_subdivision, GetlanguageData("xrlabel_inca_pic_subdivision", xrLabel_inca_pic_subdivision.Text));
+
             setXRLabelData(xrTableCell1, "Notes");//备注
 
 
-            setXRLabelData(xrLabel1, GetlanguageData(xrLabel1.Name.ToString(), languageData, xrLabel1.Text));
-            //颗粒尺寸表
-            //Bitmap bitmap = (Bitmap)Image.FromFile(str3 + "\\Config\\ReportTemplate\\ReportIdentification.bmp");
-            //setXRLabelData(xrLabel_inca_pic_class, GetlanguageData(xrLabel_inca_pic_class.Name.ToString(), languageData));
+            setXRLabelData(xrLabel1, GetlanguageData("xrlabel1", xrLabel1.Text));
+
             Bitmap bitmap = (Bitmap)Image.FromFile(System.IO.Directory.GetCurrentDirectory() + "\\Config\\ReportTemplate\\"+ TemplateClass.M_SY.LOGName);
             xrPictureBox1.ImageSource = new ImageSource(bitmap);
             xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
@@ -173,7 +170,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// 首页部分数据插入
         /// </summary>ReportIdentification
         /// <param name="TemplateClass"></param>
-        public void setResultGrid(DataTable a_languageData,bool a_isINCA)
+        public void setResultGrid(bool a_isINCA)
         {
             xrChart_ParticelSizeCalss.Visible = false;
             xrChart_ParticelSizeSubdivision.Visible = false;
@@ -202,7 +199,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             //setXRLabelData(xrTableCell1, xrTableCell1)
             #endregion
             if (a_isINCA)
-                xrTable1.Rows.Add(AddInclusionIndex(a_languageData, data.Rows[7][1].ToString()));
+                xrTable1.Rows.Add(AddInclusionIndex( data.Rows[7][1].ToString()));
 
 
             xrTableCell3.Text = TemplateClass.M_DZ.Notes.ToString();
@@ -236,13 +233,13 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 list_ParticelSizeData.Add(switch_ParticleSize(subscript.Getsubscriptstring(CompositeData[1].Rows[i]["Class"].ToString()), subscript.Getsubscriptstring(CompositeData[1].Rows[i]["Name"].ToString()), CompositeData[1].Rows[i]["total"].ToString(), CompositeData[1].Rows[i]["c1"].ToString(), CompositeData[1].Rows[i]["c2"].ToString(), CompositeData[1].Rows[i]["c3"].ToString(),
                     CompositeData[1].Rows[i]["c4"].ToString(), CompositeData[1].Rows[i]["c5"].ToString(), CompositeData[1].Rows[i]["c6"].ToString(), CompositeData[1].Rows[i]["c7"].ToString()));
             }
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[0], GetlanguageData("dev_classify", languageData,"分类"));//分类
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[1], GetlanguageData("dev_subdivision", languageData, "二级分类"));//二级分类（子分类）
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[2], GetlanguageData("dev_quantity", languageData, "数量"));//数量
+            setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[0], GetlanguageData("dev_classify", "分类"));//分类
+            setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[1], GetlanguageData("dev_subdivision",  "二级分类"));//二级分类（子分类）
+            setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[2], GetlanguageData("dev_quantity",  "数量"));//数量
 
 
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], GetlanguageData("dev_DimensionTable", languageData, "颗粒尺寸分析结果"));//颗粒尺寸分析结果
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[1].Cells[0], GetlanguageData("dev_DimensionTable_2", languageData, "尺寸计算基于"));//尺寸计算基于:
+            setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], GetlanguageData("dev_dimensiontable",  "颗粒尺寸分析结果"));//颗粒尺寸分析结果
+            setXRLabelData(xrTa_ParticleSizeTable.Rows[1].Cells[0], GetlanguageData("dev_dimensiontable_2",  "尺寸计算基于"));//尺寸计算基于:
 
             //dev_classify.Text = "分类";
             xrTa_ParticleSizeTable.Rows[2].Cells[0].Font = new Font(Schriftart_chinese, xrTa_ParticleSizeTable.Rows[2].Cells[0].Font.Size);
@@ -334,7 +331,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 }
                 //total += Convert.ToInt32(surface_dt2.Rows[i]["total"]);
             }
-            setXRLabelData(xrTable3.Rows[0].Cells[0], GetlanguageData("dev_total", languageData, "总数量"));
+            setXRLabelData(xrTable3.Rows[0].Cells[0], GetlanguageData("dev_total", "总数量"));
             //xrTable3.Rows[0].Cells[0].Text = "总数量";
             xrTable3.Rows[0].Cells[0].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             xrTable3.Rows[0].Cells[1].Text = total.ToString();
@@ -385,11 +382,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             //}
             
             
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[0], GetlanguageData("dev_classify", languageData, "分类"));//二级分类（子分类）
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[1], GetlanguageData("dev_quantity", languageData, "数量"));//数量
+            setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[0], GetlanguageData("dev_classify", "分类"));//二级分类（子分类）
+            setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[1], GetlanguageData("dev_quantity", "数量"));//数量
 
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], GetlanguageData("dev_DimensionTable", languageData, "颗粒尺寸分析结果"));//颗粒尺寸分析结果
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[1].Cells[0], GetlanguageData("dev_DimensionTable_2", languageData, "尺寸计算基于:"));//尺寸计算基于:
+            setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], GetlanguageData("dev_dimensiontable",  "颗粒尺寸分析结果"));//颗粒尺寸分析结果
+            setXRLabelData(xrTa_ParticleSizeTable.Rows[1].Cells[0], GetlanguageData("dev_dimensiontable_2",  "尺寸计算基于:"));//尺寸计算基于:
 
            //dev_subdivision.Text = "子分类";
             xrTa_ParticleSizeTable.Rows[2].Cells[0].Font = new Font(Schriftart_chinese, xrTa_ParticleSizeTable.Rows[2].Cells[0].Font.Size);
@@ -932,7 +929,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 add_SetElementAvgGrid(datas);
         }
 
-        private XRTableRow AddInclusionIndex(DataTable a_data,string a_str)
+        private XRTableRow AddInclusionIndex(string a_str)
         {
             XRTableRow row = new XRTableRow();
             XRTableCell tCell_Name = new XRTableCell();
@@ -941,17 +938,20 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
             string name = "";
             string notes = "";
-            for (int i=0;i< a_data.Rows.Count;i++)
-            {
-                if (languageData.Rows[i]["Name"].ToString()== "tCell_Name")
-                {
-                    name = languageData.Rows[i]["Text"].ToString();
-                }
-                if (languageData.Rows[i]["Name"].ToString() == "tCell_Notes")
-                {
-                    notes = languageData.Rows[i]["Text"].ToString();
-                }
-            }
+            //for (int i=0;i< a_data.Rows.Count;i++)
+            //{
+            //    if (languageData.Rows[i]["Name"].ToString()== "tCell_Name")
+            //    {
+            //        name = languageData.Rows[i]["Text"].ToString();
+            //    }
+            //    if (languageData.Rows[i]["Name"].ToString() == "tCell_Notes")
+            //    {
+            //        notes = languageData.Rows[i]["Text"].ToString();
+            //    }
+            //}
+
+            name = GetlanguageData("tcell_name", "特征/夹杂物指数");
+            notes = GetlanguageData("tcell_notes", "夹杂物指数=夹杂物面积/扫描面积*比例因子");
             tCell_Name.Font = new Font(Schriftart_chinese, tCell_Name.Font.Size);
             tCell_Name.Text = name;
             tCell_Name.WidthF = 157.5f;
@@ -1193,7 +1193,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// <param name="TemplateClass"></param>
         public void InsertReportTemplateChart_Trianglediagram()
         {
-            this.Detail.Controls.Add(add_label(GetlanguageData("dev_Ternary_diagram", languageData, "三元图")));
+            this.Detail.Controls.Add(add_label(GetlanguageData("dev_ternary_diagram", "三元图")));
             List<Color> Color_list = new List<Color>();
             Color_list.Add(FromHex("#0f4471"));
             Color_list.Add(FromHex("#FFD700"));
@@ -1276,7 +1276,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             xrTable_kllb_surface.LocationF = new PointF(0, NeueStartposition + 5);
             xrTable_kllb_surface.Visible = true;
             NeueStartposition = xrTable_kllb_surface.LocationF.Y + xrTable_kllb_surface.SizeF.Height;
-            setXRLabelData(xrTable_kllb, GetlanguageData("dev_Particle_List", languageData, "颗粒列表"));
+            setXRLabelData(xrTable_kllb, GetlanguageData("dev_particle_list", "颗粒列表"));
             setXRLabelData(xrTableCell2, "Selected particles based on：" + TemplateClass.M_KLLBXX.str_cb_kllb_sort_p1.ToString() + "(μm)");
             
             ParticleList particleList = new ParticleList();
@@ -1330,7 +1330,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 Template.Rows.Add(Template_Rows_1);
                 Template.Rows.Add(Template_Rows_2);
                 Template.SizeF = new SizeF(688f, 25f);
-                Template.Rows[0].Cells[0].Text = GetlanguageData("dev_Frame_diagram", languageData, "帧图") + dt_pic.Rows[i]["id"];
+                Template.Rows[0].Cells[0].Text = GetlanguageData("dev_frame_diagram", "帧图") + dt_pic.Rows[i]["id"];
                 Template.LocationF = new PointF(0, NeueStartposition);
                 Template.Borders = DevExpress.XtraPrinting.BorderSide.All;
                 Template.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
@@ -1358,9 +1358,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                         {
                             //数据表
                             XRTable xRTable = add_XRTable_frame();
-                            xRTable.Rows[0].Cells[0].Text = GetlanguageData("dev_image", languageData, "图像");
+                            xRTable.Rows[0].Cells[0].Text = GetlanguageData("dev_image", "图像");
                             xRTable.Rows[0].Cells[0].Font = new Font(Schriftart_chinese, xRTable.Rows[0].Cells[0].Font.Size);
-                            xRTable.Rows[0].Cells[1].Text = GetlanguageData("dev_Class", languageData, "分类");
+                            xRTable.Rows[0].Cells[1].Text = GetlanguageData("dev_class", "分类");
                             xRTable.Rows[0].Cells[1].Font = new Font(Schriftart_chinese, xRTable.Rows[0].Cells[1].Font.Size);
                             xRTable.Rows[0].Cells[2].Text = TemplateClass.M_KLLBXX.str_cb_kllb_sort_p1.ToString();
                             xRTable.Rows[0].Cells[3].Text = TemplateClass.M_KLLBXX.str_cb_kllb_sort_p2.ToString();
@@ -1399,16 +1399,16 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// <param name="strName"></param>
         /// <param name="languageData"></param>
         /// <returns></returns>
-        private string GetlanguageData(string strName, DataTable languageData,string TextName)
+        private string GetlanguageData(string strName,string TextName)
         {
-            for (int i = 0; i < languageData.Rows.Count; i++)
+            string str = TextName;
+            try
             {
-                if (strName == languageData.Rows[i]["Name"].ToString())
-                {
-                    return languageData.Rows[i]["Text"].ToString();
-                }
+                str = table[strName].ToString();
             }
-            return TextName;
+            catch { }
+          
+            return str;
         }
         #region 整理成DEV需要的数据格式
         private void XRTableCellData(XRTableRow xR, XRTableCell rTableCell, string typeface, DevExpress.XtraPrinting.TextAlignment textAlignment, string cellText, List<ParticleSizeDEVData> switchDEVDatas, string cellName)
@@ -1861,10 +1861,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Template.Rows[1].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
 
             //元素分析表
-            setXRLabelData(Template.Rows[0].Cells[0], GetlanguageData("xrCellElementArea", languageData, "元素分析表"));//元素分析表表头
-            setXRLabelData(Template.Rows[1].Cells[0], GetlanguageData("xrCellElementArea_details", languageData, "Reported average chemical composition (w %), area(μ m^2)"));//详情
-            setXRLabelData(Template.Rows[2].Cells[0], GetlanguageData("xrCell_Element_classify", languageData, "分类"));//细分
-            setXRLabelData(Template.Rows[2].Cells[1], GetlanguageData("xrCell_Element_Area", languageData, "面积"));//面积
+            setXRLabelData(Template.Rows[0].Cells[0], GetlanguageData("xrcellelementarea", "元素分析表"));//元素分析表表头
+            setXRLabelData(Template.Rows[1].Cells[0], GetlanguageData("xrcellelementarea_details", "Reported average chemical composition (w %), area(μ m^2)"));//详情
+            setXRLabelData(Template.Rows[2].Cells[0], GetlanguageData("xrcell_element_classify",  "分类"));//细分
+            setXRLabelData(Template.Rows[2].Cells[1], GetlanguageData("xrcell_element_area",  "面积"));//面积
             return Template;
         }
         /// <summary>
@@ -1936,11 +1936,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
 
             //元素分析表
-            setXRLabelData(Template.Rows[0].Cells[0], GetlanguageData("xrCellElementArea", languageData, "元素分析表"));//元素分析表表头
-            setXRLabelData(Template.Rows[1].Cells[0], GetlanguageData("xrCellElementArea_details", languageData, "Reported average chemical composition (w %), area(μ m^2)"));//详情
-            setXRLabelData(Template.Rows[2].Cells[0], GetlanguageData("xrCell_Element_classify", languageData, "分类"));//分类
-            setXRLabelData(Template.Rows[2].Cells[1], GetlanguageData("xrCell_Element_subdivision", languageData, "二级分类"));//细分
-            setXRLabelData(Template.Rows[2].Cells[2], GetlanguageData("xrCell_Element_Area", languageData, "面积"));//面积
+            setXRLabelData(Template.Rows[0].Cells[0], GetlanguageData("xrcellelementarea",  "元素分析表"));//元素分析表表头
+            setXRLabelData(Template.Rows[1].Cells[0], GetlanguageData("xrcellelementarea_details",  "Reported average chemical composition (w %), area(μ m^2)"));//详情
+            setXRLabelData(Template.Rows[2].Cells[0], GetlanguageData("xrcell_element_classify",  "分类"));//分类
+            setXRLabelData(Template.Rows[2].Cells[1], GetlanguageData("xrcell_element_subdivision",  "二级分类"));//细分
+            setXRLabelData(Template.Rows[2].Cells[2], GetlanguageData("xrcell_element_area",  "面积"));//面积
             ////元素分析表————————
             //setXRLabelData(xrTableCell30, GetlanguageData("xrCellElementArea", languageData));//元素分析表表头
             //setXRLabelData(xrTableCell31, GetlanguageData("xrCellElementArea_details", languageData));//详情
@@ -1977,11 +1977,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Template.WidthF = 668f;
             Template.Borders = DevExpress.XtraPrinting.BorderSide.All;
             Template.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            setXRLabelData(Template.Rows[0].Cells[0], GetlanguageData("xrCellAreaOfInclusion", languageData, "夹杂物面积比表"));//夹杂物面积比表表头
+            setXRLabelData(Template.Rows[0].Cells[0], GetlanguageData("xrcellareaofinclusion",  "夹杂物面积比表"));//夹杂物面积比表表头
             setXRLabelData(Template.Rows[1].Cells[0], "分类");//细分类
-            setXRLabelData(Template.Rows[1].Cells[1], GetlanguageData("xrCell_inclusion_Area", languageData, "面积(μm^2)"));//面积(μm^2)
-            setXRLabelData(Template.Rows[1].Cells[2], GetlanguageData("xrCell_inclusion_percentageOfIncA", languageData, "夹杂物比(%)"));//夹杂物比(%)
-            setXRLabelData(Template.Rows[1].Cells[3], GetlanguageData("xrCell_inclusion_FieldRatio", languageData, "视场占比(%)"));//视场占比(%)
+            setXRLabelData(Template.Rows[1].Cells[1], GetlanguageData("xrcell_inclusion_area",  "面积(μm^2)"));//面积(μm^2)
+            setXRLabelData(Template.Rows[1].Cells[2], GetlanguageData("xrcell_inclusion_percentageofinca",  "夹杂物比(%)"));//夹杂物比(%)
+            setXRLabelData(Template.Rows[1].Cells[3], GetlanguageData("xrcell_inclusion_fieldratio",  "视场占比(%)"));//视场占比(%)
             return Template;
         }
         private XRTable add_IncaDormS()
@@ -2014,12 +2014,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Template.WidthF = 668f;
             Template.Borders = DevExpress.XtraPrinting.BorderSide.All;
             Template.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            setXRLabelData(Template.Rows[0].Cells[0], GetlanguageData("xrCellAreaOfInclusion", languageData, "夹杂物面积比表"));//夹杂物面积比表表头
-            setXRLabelData(Template.Rows[1].Cells[0], GetlanguageData("xrCell_inclusion_classify", languageData, "分类"));//分类
-            setXRLabelData(Template.Rows[1].Cells[1], GetlanguageData("xrCell_inclusion_subdivision", languageData, "二级分类"));//细分类
-            setXRLabelData(Template.Rows[1].Cells[2], GetlanguageData("xrCell_inclusion_Area", languageData, "面积(μm^2)"));//面积(μm^2)
-            setXRLabelData(Template.Rows[1].Cells[3], GetlanguageData("xrCell_inclusion_percentageOfIncA", languageData, "夹杂物比(%)"));//夹杂物比(%)
-            setXRLabelData(Template.Rows[1].Cells[4], GetlanguageData("xrCell_inclusion_FieldRatio", languageData, "视场占比(%)"));//视场占比(%)
+            setXRLabelData(Template.Rows[0].Cells[0], GetlanguageData("xrcellareaofinclusion",  "夹杂物面积比表"));//夹杂物面积比表表头
+            setXRLabelData(Template.Rows[1].Cells[0], GetlanguageData("xrcell_inclusion_classify",  "分类"));//分类
+            setXRLabelData(Template.Rows[1].Cells[1], GetlanguageData("xrcell_inclusion_subdivision",  "二级分类"));//细分类
+            setXRLabelData(Template.Rows[1].Cells[2], GetlanguageData("xrcell_inclusion_area",  "面积(μm^2)"));//面积(μm^2)
+            setXRLabelData(Template.Rows[1].Cells[3], GetlanguageData("xrcell_inclusion_percentageofinca", "夹杂物比(%)"));//夹杂物比(%)
+            setXRLabelData(Template.Rows[1].Cells[4], GetlanguageData("xrcell_inclusion_fieldratio",  "视场占比(%)"));//视场占比(%)
             return Template;
         }
         #region 颗粒列表
@@ -2376,7 +2376,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 xrLabel_pageinfo.Font = new Font(Schriftart_chinese, xrLabel_pageinfo.Font.Size);
                 this.xrLabel_pageinfo.Visible = true;
                 //this.xrLabel_pageinfo.Text = string.Format("第{0}页，共{1}页", pageindex, pagecount - 1);
-                this.xrLabel_pageinfo.Text = string.Format(GetlanguageData("dev_Page", languageData, "页码") + " {0} "+ GetlanguageData("dev_of", languageData, "/") + " {1}" , pageindex, pagecount - 1);
+                this.xrLabel_pageinfo.Text = string.Format(GetlanguageData("dev_page",  "页码") + " {0} "+ GetlanguageData("dev_of",  "/") + " {1}" , pageindex, pagecount - 1);
             }
         }
     }

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

@@ -16,12 +16,15 @@ namespace OTSIncAReportApp.ReportTemplate
         string typeface = "微软雅黑";
         public OTSReport_Export m_otsreport_export;
         float LowPlace = 1000f;
+        Hashtable table;
         GBData m_export_reporttemplate;
-        public GBReport(OTSReport_Export in_export)
+        public GBReport(OTSReport_Export in_export, Hashtable a_table)
         {
             m_otsreport_export = in_export;
             m_export_reporttemplate = new GBData(in_export);
             InitializeComponent();
+
+            table = a_table;
         }
         private void setXRLabelData(XRLabel cell, string str)
         {
@@ -29,33 +32,33 @@ namespace OTSIncAReportApp.ReportTemplate
             cell.Font = new Font(typeface, cell.Font.Size);
 
         }
-        private string GetlanguageData(string strName, DataTable languageData)
+        private string GetlanguageData(string strName, string TextName)
         {
-            for (int i = 0; i < languageData.Rows.Count; i++)
+            string str = TextName;
+            try
             {
-                if (strName == languageData.Rows[i]["Name"].ToString())
-                {
-                    return languageData.Rows[i]["Text"].ToString();
-                }
+                str = table[strName].ToString();
             }
-            return "";
+            catch { }
+
+            return str;
         }
         //国际化
-        public void International_language(DataTable languageData)
+        public void International_language()
         {
-            setXRLabelData(GB_dev_ym, GetlanguageData(GB_dev_ym.Name.ToString(), languageData));//表头
-            setXRLabelData(GB_bt, GetlanguageData(GB_bt.Name.ToString(), languageData));//标题
-
-
-            setXRLabelData(GB_dev_ypsm, GetlanguageData(GB_dev_ypsm.Name.ToString(), languageData));//样品说明
-            setXRLabelData(GB_dev_jcjgwj, GetlanguageData(GB_dev_jcjgwj.Name.ToString(), languageData));//测量结果名称:
-            setXRLabelData(GB_dev_cljggk, GetlanguageData(GB_dev_cljggk.Name.ToString(), languageData));//测量结果概况
-            setXRLabelData(GB_dev_yxsj, GetlanguageData(GB_dev_yxsj.Name.ToString(), languageData));//运行时间:
-            setXRLabelData(GB_dev_flfa, GetlanguageData(GB_dev_flfa.Name.ToString(), languageData));//分类方案:
-            setXRLabelData(GB_dev_scmj, GetlanguageData(GB_dev_scmj.Name.ToString(), languageData));//视场面积:
-            setXRLabelData(GB_dev_sczs, GetlanguageData(GB_dev_sczs.Name.ToString(), languageData));//视场总数:
-            setXRLabelData(GB_dev_yjctz, GetlanguageData(GB_dev_yjctz.Name.ToString(), languageData));//已检查特征:
-            setXRLabelData(GB_dev_ckbz, GetlanguageData(GB_dev_ckbz.Name.ToString(), languageData));//参考标准:
+            setXRLabelData(GB_dev_ym, GetlanguageData("gb_dev_ym", "GB30834"));//表头
+            setXRLabelData(GB_bt, GetlanguageData("gb_bt", "标准评级"));//标题
+
+
+            setXRLabelData(GB_dev_ypsm, GetlanguageData("gb_dev_ypsm", "样品说明"));//样品说明
+            setXRLabelData(GB_dev_jcjgwj, GetlanguageData("gb_dev_jcjgwj", "测量结果名称:"));//测量结果名称:
+            setXRLabelData(GB_dev_cljggk, GetlanguageData("gb_dev_cljggk", "测量结果概况"));//测量结果概况
+            setXRLabelData(GB_dev_yxsj, GetlanguageData("gb_dev_yxsj", "运行时间:"));//运行时间:
+            setXRLabelData(GB_dev_flfa, GetlanguageData("gb_dev_flfa", "分类方案:"));//分类方案:
+            setXRLabelData(GB_dev_scmj, GetlanguageData("gb_dev_scmj", "总视场面积:"));//视场面积:
+            setXRLabelData(GB_dev_sczs, GetlanguageData("gb_dev_sczs", "视场总数:"));//视场总数:
+            setXRLabelData(GB_dev_yjctz, GetlanguageData("gb_dev_yjctz", "已检查特征:"));//已检查特征:
+            setXRLabelData(GB_dev_ckbz, GetlanguageData("GB_dev_ckbz", "参考标准:"));//参考标准:
         }
         public void set_GB_Method(List<DataTable> GB_List,List<string> GB1_NameList,string GBName)
         {