临时提交

Bin/x64/Debug/Config/ProData/lj2.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi2" Sizes="0.1,0.5,1,3,5,9,12,20,30,40,50,60" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi2" Sizes="0,0.5,1,2,5,30,100" Version="1.1.1" />

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

@@ -822,8 +822,8 @@
 	  <Control name="OriginalSplicing" text="Original splicing"/>
 	  <Control name="OriginalDistribution" text="Original distribution"/>
 	  <Control name="ParticleSizeTable" text="Particle size table"/>
-	  <Control name="ChineseStandard1" text="GB Function1(30834)"/>
-	  <Control name="ChineseStandard2" text="GB Function2(30834)"/>
+	  <Control name="ChineseStandard1" text="GB30834(10561)Function1"/>
+	  <Control name="ChineseStandard2" text="GB30834Function2"/>
 	  <Control name="AmericanStandard" text="American Standard"/>
 	  <Control name="GermanStandard" text="German standard"/>
 	  <Control name="CommonClassification" text="Common classification"/>

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

@@ -364,11 +364,9 @@
 	  <Control name="RictBox7" text="等待" />
 	  <Control name="RictBox8" text="加载测量结果信息表模块完成" />
 	  <Control name="RictBox9" text="加载颗粒列表模块中...." />
-	  <Control name="RictBox10" text="加载:颗粒列表" />
-	  <Control name="RictBox11" text="测量结果信息表" />
+	 
 	  <Control name="RictBox12" text="加载:" />
-	  <Control name="RictBox13" text="颗粒列表" />
-	  <Control name="RictBox14" text="加载颗粒列表模块完成" />
+	
 	  
 	  <Control name="RictBox15" text="加载平均元素含量表模块中...." />
 	  <Control name="RictBox16" text="加载:平均元素含量表" />
@@ -409,6 +407,51 @@
 	  
 	  <Control name="RictBox44" text="报告模板已打开，请先关闭！" />
 	  <Control name="RictBox45" text="提示" />
+	  
+	  
+	  
+	  <Control name="Result_information_ing" text="加载测量结果信息表模块中...." />
+	  <Control name="Load_result_information" text="加载:测量结果信息表" />
+	  <Control name="Loading_result_information_completed" text="加载测量结果信息表模块完成" />
+	  
+	  <Control name="Dimensional_analysis_table_ing" text="加载颗粒尺寸分析表模块中...." />
+	  <Control name="Loading_dimension_analysis_table" text="加载:颗粒尺寸分析表" />
+	  <Control name="Loading_dimension_analysis_table_completed" text="加载颗粒尺寸分析表模块完成" />
+	  
+	  <Control name="Element_analysis_table_ing" text="加载元素分析表模块中...." />
+	  <Control name="Load_element_analysis_table" text="加载:元素分析表" />
+	  <Control name="Loading_element_analysis_table_completed" text="加载元素分析表模块完成" />
+	  
+	  <Control name="inca_area_ratio_table_ing" text="加载夹杂物面积比表模块中...." />
+	  <Control name="Load_inca_area_ratio_table" text="加载:夹杂物面积比表" />
+	  <Control name="Loading_inca_area_ratio_table_completed" text="加载夹杂物面积比表模块完成" />
+	  
+	  <Control name="inca_area_ratio_diagram_ing" text="加载夹杂物面积比图模块中...." />
+	  <Control name="Load_inca_area_ratio_diagram" text="加载:夹杂物面积比图" />
+	  <Control name="Loading_inca_area_ratio_diagram_completed" text="加载夹杂物面积比图模块完成" />
+	  
+	  <Control name="ternary_graph_ing" text="加载三元图模块中...." />
+	  <Control name="Load_ternary_graph" text="加载:三元图" />
+	  <Control name="Loading_ternary_graph_completed" text="加载三元图模块完成" />
+	  
+	  <Control name="Particle_list_ing" text="加载颗粒列表模块中...." />
+	  <Control name="Load_particle_list" text="加载:颗粒列表" />
+	  <Control name="Loading_particle_list_completed" text="加载颗粒列表模块完成" />
+	  
+	  <Control name="Particle_list_frame_diagram_ing" text="加载颗粒帧图列表模块中...." />
+	  <Control name="Load_particle_list_frame_diagram" text="加载:颗粒帧图列表" />
+	  <Control name="Loading_Particle_list_frame_diagram_completed" text="加载颗粒帧图列表模块完成" />
+	  
+	  
+	  
+	  <Control name="Result_information" text="测量结果信息表" />
+	  <Control name="Dimensional_analysis_table" text="颗粒尺寸分析表" />
+	  <Control name="Element_analysis_table" text="元素分析表" />
+	  <Control name="inca_area_ratio_table" text="夹杂物面积比表" />
+	  <Control name="inca_area_ratio_diagram" text="夹杂物面积比图" />
+	  <Control name="ternary_graph" text="三元图" />
+	  <Control name="particle_list" text="颗粒列表" />
+	  <Control name="particle_list_frame_diagram" text="颗粒帧图列表" />
     </Controls>
  </Form>
  <Form>
@@ -818,8 +861,8 @@
 	  <Control name="OriginalSplicing" text="原图拼接" />
 	  <Control name="OriginalDistribution" text="原图颗粒分布" />
 	  <Control name="ParticleSizeTable" text="粒级表" />
-	  <Control name="ChineseStandard1" text="GB方法一(30834)" />
-	  <Control name="ChineseStandard2" text="GB方法二(30834)" />
+	  <Control name="ChineseStandard1" text="GB30834(10561)方法一" />
+	  <Control name="ChineseStandard2" text="GB30834方法二" />
 	  <Control name="AmericanStandard" text="美标" />
 	  <Control name="GermanStandard" text="德标" />
 	  <Control name="CommonClassification" text="颗粒成分分类" />

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -17,6 +17,7 @@ using System.Windows.Forms;
 using System.Xml;
 using OTSIncAReportApp._1_UI.OTSTemplateDesigner;
 using DevExpress.XtraReports.UI;
+using OTSIncAReportApp.ReportTemplate;
 
 namespace OTSIncAReportApp
 {
@@ -44,6 +45,7 @@ namespace OTSIncAReportApp
         public XmlConfigUtil xmlutil2;
         public MBSZClass m_mbszclass = null;
         OTS_DEVReport DEVReport;
+        GBReport GB_Report;
         /*public bool ReportExporting = false;*///判断报告是不在是在导出的过程中
 
         #endregion
@@ -1765,33 +1767,12 @@ namespace OTSIncAReportApp
 
         private void button7_Click(object sender, EventArgs e)
         {
-            //为防止重复打开报告后，显示数据库占用错误，先确保报告模板进程已关闭
-            Process[] processes = Process.GetProcesses();
-            foreach (Process proc in processes)
-            {
-                if (proc.ProcessName == "OTSIncAReportTemplate")
-                {
-                    DialogResult dr = MessageBox.Show(table["rictbox44"].ToString(), table["rictbox45"].ToString(), MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                    if (dr == DialogResult.OK)
-                    {
-                        return;
-                    }
-                }
-            }
+            GB_Report = new GBReport(this);
+            GB_Report.International_language(dev_internationalLanguage());
 
-            //通过底层CLR运算，获取国标参数信息
-            string resultfile = m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
-                                + m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()].FileName;
-            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile);
-            OTSCLRINTERFACE.CPropParamClr clr_prop = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
-            List<DataTable> GB1 = m_export_reporttemplate.InsertReportTemplateTable_ChineseStandardABCDDS(clr_prop);
-            List<DataTable> GB2 = m_export_reporttemplate.InsertReportTemplateTable_NationalStandardMethodTwo(clr_prop);
-            DataTable ResultGrid = m_export_reporttemplate.InsertReportTemplateTable_ResultGrid();
-            SaveReportGBTemplateDBFile(GB1, GB2, ResultGrid);//将国标信息存储到数据库中
-            OpenOTSINcAreportGBTemplateAPP();//打开报告模板程序
+            ReportPrintTool tool = new ReportPrintTool(GB_Report);
+            tool.ShowPreview();
 
-            m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
-            this.Close();
 
         }
         /// <summary>
@@ -2144,7 +2125,7 @@ namespace OTSIncAReportApp
         private DataTable dev_internationalLanguage()
         {
             string Language = "ZH";
-            OTSCommon.SqLiteHelper sh = new OTSCommon.SqLiteHelper("data source='" + System.IO.Directory.GetCurrentDirectory() + "\\Resources\\ReportTemplate\\language.db'");
+            OTSCommon.SqLiteHelper sh = new OTSCommon.SqLiteHelper("data source='" + System.IO.Directory.GetCurrentDirectory() + "\\ReportProfile\\language.db'");
             DataTable dt_stl = sh.ExecuteQuery("select * from "+ Language);
             return dt_stl;
         }

OTSIncAReportApp/ReportTemplate/GBReport.Designer.cs

@@ -31,55 +31,60 @@ namespace OTSIncAReportApp.ReportTemplate
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GBReport));
             this.TopMargin = new DevExpress.XtraReports.UI.TopMarginBand();
-            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.GB_dev_ym = new DevExpress.XtraReports.UI.XRLabel();
             this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.BottomMargin = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_ypsm = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_jcjgwj = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_jcjgwj_text = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_cljggk = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_yxsj = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_yxsj_text = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_sczs = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_sczs_text = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_flfa = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_flfa_text = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_yjctz = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_yjctz_text = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_scmj = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_scmj_text = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_ckbz = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_ckbz_text = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_bt = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.GB_dev_bgsj = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_bgsj_text = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_fdbs = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GB_dev_fdbs_text = new DevExpress.XtraReports.UI.XRTableCell();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // TopMargin
             // 
             this.TopMargin.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel1,
+            this.GB_dev_ym,
             this.xrPictureBox1});
             this.TopMargin.HeightF = 64.58334F;
             this.TopMargin.Name = "TopMargin";
             // 
-            // xrLabel1
+            // GB_dev_ym
             // 
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(170.3751F, 15.95834F);
-            this.xrLabel1.Multiline = true;
-            this.xrLabel1.Name = "xrLabel1";
-            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(469.6248F, 23F);
-            this.xrLabel1.StylePriority.UseTextAlignment = false;
-            this.xrLabel1.Text = "标准名";
-            this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.GB_dev_ym.LocationFloat = new DevExpress.Utils.PointFloat(170.3751F, 15.95834F);
+            this.GB_dev_ym.Multiline = true;
+            this.GB_dev_ym.Name = "GB_dev_ym";
+            this.GB_dev_ym.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.GB_dev_ym.SizeF = new System.Drawing.SizeF(469.6248F, 23F);
+            this.GB_dev_ym.StylePriority.UseTextAlignment = false;
+            this.GB_dev_ym.Text = "标准名";
+            this.GB_dev_ym.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
             // xrPictureBox1
             // 
@@ -96,29 +101,16 @@ namespace OTSIncAReportApp.ReportTemplate
             // 
             this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
             this.xrTable1,
-            this.xrLabel2});
-            this.Detail.HeightF = 713.5417F;
+            this.GB_bt});
+            this.Detail.HeightF = 934.3749F;
             this.Detail.Name = "Detail";
             // 
-            // xrLabel2
-            // 
-            this.xrLabel2.Font = new System.Drawing.Font("Arial", 48F);
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(276.875F, 89.95831F);
-            this.xrLabel2.Multiline = true;
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(100F, 330.2917F);
-            this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.StylePriority.UseTextAlignment = false;
-            this.xrLabel2.Text = "标准评级";
-            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            // 
             // xrTable1
             // 
             this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(4F, 532.2917F);
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(5.000051F, 749.3749F);
             this.xrTable1.Name = "xrTable1";
             this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -127,8 +119,9 @@ namespace OTSIncAReportApp.ReportTemplate
             this.xrTableRow3,
             this.xrTableRow4,
             this.xrTableRow5,
-            this.xrTableRow6});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(640F, 150F);
+            this.xrTableRow6,
+            this.xrTableRow7});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(640F, 175F);
             this.xrTable1.StylePriority.UseBorders = false;
             this.xrTable1.StylePriority.UseTextAlignment = false;
             this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
@@ -136,166 +129,223 @@ namespace OTSIncAReportApp.ReportTemplate
             // xrTableRow1
             // 
             this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell4});
+            this.GB_dev_ypsm});
             this.xrTableRow1.Name = "xrTableRow1";
             this.xrTableRow1.Weight = 1D;
             // 
-            // xrTableCell4
+            // GB_dev_ypsm
             // 
-            this.xrTableCell4.Multiline = true;
-            this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Text = "样品说明";
-            this.xrTableCell4.Weight = 4D;
+            this.GB_dev_ypsm.BackColor = System.Drawing.Color.DarkGray;
+            this.GB_dev_ypsm.Multiline = true;
+            this.GB_dev_ypsm.Name = "GB_dev_ypsm";
+            this.GB_dev_ypsm.StylePriority.UseBackColor = false;
+            this.GB_dev_ypsm.Text = "样品说明";
+            this.GB_dev_ypsm.Weight = 4D;
             // 
             // xrTableRow2
             // 
             this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell5,
-            this.xrTableCell6});
+            this.GB_dev_jcjgwj,
+            this.GB_dev_jcjgwj_text});
             this.xrTableRow2.Name = "xrTableRow2";
             this.xrTableRow2.Weight = 1D;
             // 
-            // xrTableCell5
+            // GB_dev_jcjgwj
+            // 
+            this.GB_dev_jcjgwj.Multiline = true;
+            this.GB_dev_jcjgwj.Name = "GB_dev_jcjgwj";
+            this.GB_dev_jcjgwj.Text = "测量结果名称:";
+            this.GB_dev_jcjgwj.Weight = 1D;
             // 
-            this.xrTableCell5.Multiline = true;
-            this.xrTableCell5.Name = "xrTableCell5";
-            this.xrTableCell5.Text = "xrTableCell5";
-            this.xrTableCell5.Weight = 1D;
+            // GB_dev_jcjgwj_text
+            // 
+            this.GB_dev_jcjgwj_text.Multiline = true;
+            this.GB_dev_jcjgwj_text.Name = "GB_dev_jcjgwj_text";
+            this.GB_dev_jcjgwj_text.StylePriority.UseTextAlignment = false;
+            this.GB_dev_jcjgwj_text.Text = "GB_dev_jcjgwj_text";
+            this.GB_dev_jcjgwj_text.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.GB_dev_jcjgwj_text.Weight = 3D;
             // 
             // xrTableRow3
             // 
             this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell12});
+            this.GB_dev_cljggk});
             this.xrTableRow3.Name = "xrTableRow3";
             this.xrTableRow3.Weight = 1D;
             // 
-            // xrTableCell12
+            // GB_dev_cljggk
             // 
-            this.xrTableCell12.Multiline = true;
-            this.xrTableCell12.Name = "xrTableCell12";
-            this.xrTableCell12.Text = "测量结果概况";
-            this.xrTableCell12.Weight = 4D;
+            this.GB_dev_cljggk.BackColor = System.Drawing.Color.DarkGray;
+            this.GB_dev_cljggk.Multiline = true;
+            this.GB_dev_cljggk.Name = "GB_dev_cljggk";
+            this.GB_dev_cljggk.StylePriority.UseBackColor = false;
+            this.GB_dev_cljggk.Text = "测量结果概况";
+            this.GB_dev_cljggk.Weight = 4D;
             // 
             // xrTableRow4
             // 
             this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell13,
-            this.xrTableCell14,
-            this.xrTableCell15,
-            this.xrTableCell16});
+            this.GB_dev_yxsj,
+            this.GB_dev_yxsj_text,
+            this.GB_dev_sczs,
+            this.GB_dev_sczs_text});
             this.xrTableRow4.Name = "xrTableRow4";
             this.xrTableRow4.Weight = 1D;
             // 
-            // xrTableCell13
-            // 
-            this.xrTableCell13.Multiline = true;
-            this.xrTableCell13.Name = "xrTableCell13";
-            this.xrTableCell13.Text = "xrTableCell13";
-            this.xrTableCell13.Weight = 1D;
+            // GB_dev_yxsj
             // 
-            // xrTableCell14
+            this.GB_dev_yxsj.Multiline = true;
+            this.GB_dev_yxsj.Name = "GB_dev_yxsj";
+            this.GB_dev_yxsj.Text = "运行时间:";
+            this.GB_dev_yxsj.Weight = 1D;
             // 
-            this.xrTableCell14.Multiline = true;
-            this.xrTableCell14.Name = "xrTableCell14";
-            this.xrTableCell14.Text = "xrTableCell14";
-            this.xrTableCell14.Weight = 1D;
+            // GB_dev_yxsj_text
             // 
-            // xrTableCell15
+            this.GB_dev_yxsj_text.Multiline = true;
+            this.GB_dev_yxsj_text.Name = "GB_dev_yxsj_text";
+            this.GB_dev_yxsj_text.Text = "GB_dev_yxsj_text";
+            this.GB_dev_yxsj_text.Weight = 1D;
             // 
-            this.xrTableCell15.Multiline = true;
-            this.xrTableCell15.Name = "xrTableCell15";
-            this.xrTableCell15.Text = "xrTableCell15";
-            this.xrTableCell15.Weight = 1D;
+            // GB_dev_sczs
             // 
-            // xrTableCell16
+            this.GB_dev_sczs.Multiline = true;
+            this.GB_dev_sczs.Name = "GB_dev_sczs";
+            this.GB_dev_sczs.Text = "视场总数:";
+            this.GB_dev_sczs.Weight = 1D;
             // 
-            this.xrTableCell16.Multiline = true;
-            this.xrTableCell16.Name = "xrTableCell16";
-            this.xrTableCell16.Text = "xrTableCell16";
-            this.xrTableCell16.Weight = 1D;
+            // GB_dev_sczs_text
             // 
-            // xrTableCell6
-            // 
-            this.xrTableCell6.Multiline = true;
-            this.xrTableCell6.Name = "xrTableCell6";
-            this.xrTableCell6.Text = "xrTableCell6";
-            this.xrTableCell6.Weight = 3D;
+            this.GB_dev_sczs_text.Multiline = true;
+            this.GB_dev_sczs_text.Name = "GB_dev_sczs_text";
+            this.GB_dev_sczs_text.Text = "GB_dev_sczs_text";
+            this.GB_dev_sczs_text.Weight = 1D;
             // 
             // xrTableRow5
             // 
             this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell1,
-            this.xrTableCell2,
-            this.xrTableCell3,
-            this.xrTableCell7});
+            this.GB_dev_flfa,
+            this.GB_dev_flfa_text,
+            this.GB_dev_yjctz,
+            this.GB_dev_yjctz_text});
             this.xrTableRow5.Name = "xrTableRow5";
             this.xrTableRow5.Weight = 1D;
             // 
-            // xrTableCell1
+            // GB_dev_flfa
             // 
-            this.xrTableCell1.Multiline = true;
-            this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Text = "xrTableCell1";
-            this.xrTableCell1.Weight = 1D;
+            this.GB_dev_flfa.Multiline = true;
+            this.GB_dev_flfa.Name = "GB_dev_flfa";
+            this.GB_dev_flfa.Text = "分类方案:";
+            this.GB_dev_flfa.Weight = 1D;
             // 
-            // xrTableCell2
+            // GB_dev_flfa_text
             // 
-            this.xrTableCell2.Multiline = true;
-            this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Text = "xrTableCell2";
-            this.xrTableCell2.Weight = 1D;
+            this.GB_dev_flfa_text.Multiline = true;
+            this.GB_dev_flfa_text.Name = "GB_dev_flfa_text";
+            this.GB_dev_flfa_text.Text = "GB_dev_flfa_text";
+            this.GB_dev_flfa_text.Weight = 1D;
             // 
-            // xrTableCell3
+            // GB_dev_yjctz
             // 
-            this.xrTableCell3.Multiline = true;
-            this.xrTableCell3.Name = "xrTableCell3";
-            this.xrTableCell3.Text = "xrTableCell3";
-            this.xrTableCell3.Weight = 1D;
+            this.GB_dev_yjctz.Multiline = true;
+            this.GB_dev_yjctz.Name = "GB_dev_yjctz";
+            this.GB_dev_yjctz.Text = "已检查特征:";
+            this.GB_dev_yjctz.Weight = 1D;
             // 
-            // xrTableCell7
+            // GB_dev_yjctz_text
             // 
-            this.xrTableCell7.Multiline = true;
-            this.xrTableCell7.Name = "xrTableCell7";
-            this.xrTableCell7.Text = "xrTableCell7";
-            this.xrTableCell7.Weight = 1D;
+            this.GB_dev_yjctz_text.Multiline = true;
+            this.GB_dev_yjctz_text.Name = "GB_dev_yjctz_text";
+            this.GB_dev_yjctz_text.Text = "GB_dev_yjctz_text";
+            this.GB_dev_yjctz_text.Weight = 1D;
             // 
             // xrTableRow6
             // 
             this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell8,
-            this.xrTableCell9,
-            this.xrTableCell10,
-            this.xrTableCell11});
+            this.GB_dev_scmj,
+            this.GB_dev_scmj_text,
+            this.GB_dev_ckbz,
+            this.GB_dev_ckbz_text});
             this.xrTableRow6.Name = "xrTableRow6";
             this.xrTableRow6.Weight = 1D;
             // 
-            // xrTableCell8
+            // GB_dev_scmj
+            // 
+            this.GB_dev_scmj.Multiline = true;
+            this.GB_dev_scmj.Name = "GB_dev_scmj";
+            this.GB_dev_scmj.Text = "视场面积:";
+            this.GB_dev_scmj.Weight = 1D;
+            // 
+            // GB_dev_scmj_text
+            // 
+            this.GB_dev_scmj_text.Multiline = true;
+            this.GB_dev_scmj_text.Name = "GB_dev_scmj_text";
+            this.GB_dev_scmj_text.Text = "GB_dev_scmj_text";
+            this.GB_dev_scmj_text.Weight = 1D;
+            // 
+            // GB_dev_ckbz
+            // 
+            this.GB_dev_ckbz.Multiline = true;
+            this.GB_dev_ckbz.Name = "GB_dev_ckbz";
+            this.GB_dev_ckbz.Text = "参考标准:";
+            this.GB_dev_ckbz.Weight = 1D;
+            // 
+            // GB_dev_ckbz_text
+            // 
+            this.GB_dev_ckbz_text.Multiline = true;
+            this.GB_dev_ckbz_text.Name = "GB_dev_ckbz_text";
+            this.GB_dev_ckbz_text.Text = "GB_dev_ckbz_text";
+            this.GB_dev_ckbz_text.Weight = 1D;
+            // 
+            // GB_bt
+            // 
+            this.GB_bt.Font = new System.Drawing.Font("Arial", 48F);
+            this.GB_bt.LocationFloat = new DevExpress.Utils.PointFloat(275.8334F, 191F);
+            this.GB_bt.Multiline = true;
+            this.GB_bt.Name = "GB_bt";
+            this.GB_bt.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.GB_bt.SizeF = new System.Drawing.SizeF(100F, 330.2917F);
+            this.GB_bt.StylePriority.UseFont = false;
+            this.GB_bt.StylePriority.UseTextAlignment = false;
+            this.GB_bt.Text = "标准评级";
+            this.GB_bt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            // 
+            // xrTableRow7
+            // 
+            this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.GB_dev_bgsj,
+            this.GB_dev_bgsj_text,
+            this.GB_dev_fdbs,
+            this.GB_dev_fdbs_text});
+            this.xrTableRow7.Name = "xrTableRow7";
+            this.xrTableRow7.Weight = 1D;
+            // 
+            // GB_dev_bgsj
             // 
-            this.xrTableCell8.Multiline = true;
-            this.xrTableCell8.Name = "xrTableCell8";
-            this.xrTableCell8.Text = "xrTableCell8";
-            this.xrTableCell8.Weight = 1D;
+            this.GB_dev_bgsj.Multiline = true;
+            this.GB_dev_bgsj.Name = "GB_dev_bgsj";
+            this.GB_dev_bgsj.Text = "报告时间:";
+            this.GB_dev_bgsj.Weight = 1D;
             // 
-            // xrTableCell9
+            // GB_dev_bgsj_text
             // 
-            this.xrTableCell9.Multiline = true;
-            this.xrTableCell9.Name = "xrTableCell9";
-            this.xrTableCell9.Text = "xrTableCell9";
-            this.xrTableCell9.Weight = 1D;
+            this.GB_dev_bgsj_text.Multiline = true;
+            this.GB_dev_bgsj_text.Name = "GB_dev_bgsj_text";
+            this.GB_dev_bgsj_text.Text = "GB_dev_bgsj_text";
+            this.GB_dev_bgsj_text.Weight = 1D;
             // 
-            // xrTableCell10
+            // GB_dev_fdbs
             // 
-            this.xrTableCell10.Multiline = true;
-            this.xrTableCell10.Name = "xrTableCell10";
-            this.xrTableCell10.Text = "xrTableCell10";
-            this.xrTableCell10.Weight = 1D;
+            this.GB_dev_fdbs.Multiline = true;
+            this.GB_dev_fdbs.Name = "GB_dev_fdbs";
+            this.GB_dev_fdbs.Text = "测量放大倍数:";
+            this.GB_dev_fdbs.Weight = 1D;
             // 
-            // xrTableCell11
+            // GB_dev_fdbs_text
             // 
-            this.xrTableCell11.Multiline = true;
-            this.xrTableCell11.Name = "xrTableCell11";
-            this.xrTableCell11.Text = "xrTableCell11";
-            this.xrTableCell11.Weight = 1D;
+            this.GB_dev_fdbs_text.Multiline = true;
+            this.GB_dev_fdbs_text.Name = "GB_dev_fdbs_text";
+            this.GB_dev_fdbs_text.Text = "GB_dev_fdbs_text";
+            this.GB_dev_fdbs_text.Weight = 1D;
             // 
             // GBReport
             // 
@@ -317,30 +367,35 @@ namespace OTSIncAReportApp.ReportTemplate
         private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
         private DevExpress.XtraReports.UI.BottomMarginBand BottomMargin;
         private DevExpress.XtraReports.UI.DetailBand Detail;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRLabel GB_dev_ym;
         private DevExpress.XtraReports.UI.XRTable xrTable1;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_ypsm;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_jcjgwj;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_jcjgwj_text;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_cljggk;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_yxsj;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_yxsj_text;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_sczs;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_sczs_text;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_flfa;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_flfa_text;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_yjctz;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_yjctz_text;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_scmj;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_scmj_text;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_ckbz;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_ckbz_text;
+        private DevExpress.XtraReports.UI.XRLabel GB_bt;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_bgsj;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_bgsj_text;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_fdbs;
+        private DevExpress.XtraReports.UI.XRTableCell GB_dev_fdbs_text;
     }
 }

OTSIncAReportApp/ReportTemplate/GBReport.cs

@@ -2,16 +2,55 @@
 using System;
 using System.Collections;
 using System.ComponentModel;
+using System.Data;
 using System.Drawing;
 
 namespace OTSIncAReportApp.ReportTemplate
 {
     public partial class GBReport : DevExpress.XtraReports.UI.XtraReport
     {
-        public GBReport()
+        string typeface = "宋体";
+        public OTSReport_Export m_otsreport_export;
+        public GBReport(OTSReport_Export in_export)
         {
+            m_otsreport_export = in_export;
             InitializeComponent();
         }
+        private void setXRLabelData(XRLabel cell, string str)
+        {
+            cell.Text = str;
+            cell.Font = new Font(typeface, cell.Font.Size);
+
+        }
+        private string GetlanguageData(string strName, DataTable languageData)
+        {
+            for (int i = 0; i < languageData.Rows.Count; i++)
+            {
+                if (strName == languageData.Rows[i]["Name"].ToString())
+                {
+                    return languageData.Rows[i]["Text"].ToString();
+                }
+            }
+            return "";
+        }
+        //国际化
+        public void International_language(DataTable languageData)
+        {
+            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_bgsj, GetlanguageData(GB_dev_bgsj.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_fdbs, GetlanguageData(GB_dev_fdbs.Name.ToString(), languageData));//测量放大倍数:
+        }
     }
 }