报告程序BUG修复

Bin/x64/Debug/Config/ProData/Li1-10.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="Li1-10" Sizes="1,1.5,2,3.5,5,7,10" Version="1.1.1" />
+<XMLData FileMark="626" Name="Li1-10" Sizes="1,1.5,2,3.5,5,7,10,15,20" Version="1.1.1" />

Bin/x64/Debug/Config/ReportTemplate/Inca_Template/ReportTemplateConfig.xml

@@ -3,7 +3,7 @@
     <str_tb_ZBT>夹杂物报告</str_tb_ZBT>
     <str_tb_FBT>
     </str_tb_FBT>
-    <str_tb_YPBH>1</str_tb_YPBH>
+    <str_tb_YPBH>21</str_tb_YPBH>
     <str_tb_CKBZ>
     </str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
@@ -15,6 +15,10 @@
     <LOGName>ReportIdentification.bmp</LOGName>
     <StandardLibraryName>
     </StandardLibraryName>
+    <str_tb_djsb>
+    </str_tb_djsb>
+    <str_tb_npsb>
+    </str_tb_npsb>
   </M_SY>
   <M_YMYJ>
     <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
@@ -80,14 +84,12 @@
       <MB1>Mg.Ca.Al</MB1>
       <MB2>S.Ca.Al</MB2>
       <MB3>S.Si.Al</MB3>
-      <MB4>S.Mn.Al</MB4>
     </list_lbv_syxt_mblb>
     <list_lbv_syxt_mblb_index>
       <MBIndex0>10</MBIndex0>
       <MBIndex1>11</MBIndex1>
       <MBIndex2>12</MBIndex2>
       <MBIndex3>13</MBIndex3>
-      <MBIndex4>14</MBIndex4>
     </list_lbv_syxt_mblb_index>
     <str_cb_syxt_ljb>lj.psf</str_cb_syxt_ljb>
   </M_SYXT>
@@ -127,10 +129,13 @@
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
       <YS0>C</YS0>
+      <YS1>Fe</YS1>
     </list_str_kllb_qcys>
-    <str_kllb_qcys>C</str_kllb_qcys>
+    <str_kllb_qcys>C,Fe</str_kllb_qcys>
     <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
+      <YS0>SiC</YS0>
+      <YS1>FeO</YS1>
     </list_str_kllb_DeleteClass>
     <list_int_kllb_number>20</list_int_kllb_number>
     <list_str_kllb_DeleteClass_Serial>

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="ProfessionalMode" SysType="TCCleannessA">
+<XMLData RunMode="ProfessionalMode" SysType="IncA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="OTS_TC_Axia_per" SteelTechnology="0" UseSysSTD="true" />
   <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="0:AUTO" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
     <Member RegName="BGGray" end="60" start="0" />

Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData systype="TCCleannessA">
+<XMLData systype="IncA">
   <Member RegName="Scale" strValue="1000" />
   <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation" />
   <Member RegName="ElementsColName" strValue="C,O,Al,Fe,F,Ti,Na,Mn,Mg" />
-  <Member RegName="PartSizeFile" name="lj.psf" />
+  <Member RegName="PartSizeFile" name="Li1-10.psf" />
   <Member RegName="TRIO_CHART_TYPE" strValue="CaO.SiO₂.Al₂O₃" />
   <Member RegName="SIZE_CAL_METHOD_TYPE" strValue="ECD" />
 </XMLData>

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

@@ -1,4 +1,5 @@
-using OTSIncAReportGrids;
+using OTSIncAReportApp.OTSRstMgrFunction;
+using OTSIncAReportGrids;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -13,6 +14,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
     /// </summary>
     class TableHeaderData
     {
+        public double filedsArea = 0;
         public DataTable GetData(OTSReport_Export m_otsreport_export)
         {
             //------------------加载模块,获取数据-------------------------------------------------
@@ -28,6 +30,11 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             keyValues_ResultGrid.TryGetValue("Magnification", out string Magnification);//放大倍数
             keyValues_ResultGrid.TryGetValue(ls_resultgrid.table["col10"].ToString(), out string InclusionIndex);//特征/夹杂物指数
 
+            ResultFile resfile = m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.GetWorkingResultId()];
+            filedsArea = resfile.GetTotalArea();
+            filedsArea = filedsArea * 1000000;
+
+
             DataTable data = new DataTable();
             data.Columns.Add("Name");
             data.Columns.Add("Data");

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.cs

@@ -186,8 +186,15 @@ namespace OTSIncAReportApp
                 /// </summary>
                 public bool b_ck_ypsm { get; set; }
 
-               
-               
+                /// <summary>
+                /// 设备名称
+                /// </summary>
+                public string str_tb_djsb { get; set; }
+                /// <summary>
+                /// 能谱名称
+                /// </summary>
+                public string str_tb_npsb { get; set; }
+
 
                 /// <summary>
                 /// 标准库名称
@@ -951,6 +958,9 @@ namespace OTSIncAReportApp
           
             m_mbszclass.M_SY.LOGName = xmlutil.Read("M_SY", "LOGName");
             m_mbszclass.M_SY.StandardLibraryName= xmlutil.Read("M_SY", "StandardLibraryName");
+
+            m_mbszclass.M_SY.str_tb_djsb= xmlutil.Read("M_SY", "str_tb_djsb");
+            m_mbszclass.M_SY.str_tb_npsb= xmlutil.Read("M_SY", "str_tb_npsb");
             if (m_mbszclass.M_SY.LOGName == null || m_mbszclass.M_SY.LOGName == "")
             {
                 m_mbszclass.M_SY.LOGName = "ReportIdentification.bmp";

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.Designer.cs

@@ -42,7 +42,6 @@
             this.label6 = new System.Windows.Forms.Label();
             this.ck_ym = new System.Windows.Forms.CheckBox();
             this.tb_yjwb = new System.Windows.Forms.TextBox();
-            this.label10 = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.pictureBox7 = new System.Windows.Forms.PictureBox();
@@ -85,6 +84,10 @@
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
+            this.tb_npsb = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.tb_djsb = new System.Windows.Forms.TextBox();
+            this.label10 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
@@ -98,7 +101,7 @@
             // 
             // tb_FBT
             // 
-            this.tb_FBT.Location = new System.Drawing.Point(5, 110);
+            this.tb_FBT.Location = new System.Drawing.Point(5, 93);
             this.tb_FBT.Margin = new System.Windows.Forms.Padding(2);
             this.tb_FBT.Name = "tb_FBT";
             this.tb_FBT.Size = new System.Drawing.Size(252, 21);
@@ -106,7 +109,7 @@
             // 
             // tb_ZBT
             // 
-            this.tb_ZBT.Location = new System.Drawing.Point(5, 51);
+            this.tb_ZBT.Location = new System.Drawing.Point(5, 34);
             this.tb_ZBT.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ZBT.Name = "tb_ZBT";
             this.tb_ZBT.Size = new System.Drawing.Size(252, 21);
@@ -115,7 +118,7 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(5, 85);
+            this.label5.Location = new System.Drawing.Point(5, 79);
             this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(41, 12);
@@ -125,7 +128,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(5, 26);
+            this.label3.Location = new System.Drawing.Point(5, 20);
             this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(41, 12);
@@ -157,7 +160,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(5, 144);
+            this.label1.Location = new System.Drawing.Point(5, 138);
             this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(53, 12);
@@ -166,7 +169,7 @@
             // 
             // tb_YPBH
             // 
-            this.tb_YPBH.Location = new System.Drawing.Point(5, 169);
+            this.tb_YPBH.Location = new System.Drawing.Point(5, 152);
             this.tb_YPBH.Margin = new System.Windows.Forms.Padding(2);
             this.tb_YPBH.Name = "tb_YPBH";
             this.tb_YPBH.Size = new System.Drawing.Size(252, 21);
@@ -175,7 +178,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(5, 203);
+            this.label4.Location = new System.Drawing.Point(5, 197);
             this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(53, 12);
@@ -184,7 +187,7 @@
             // 
             // tb_CKBZ
             // 
-            this.tb_CKBZ.Location = new System.Drawing.Point(4, 228);
+            this.tb_CKBZ.Location = new System.Drawing.Point(5, 211);
             this.tb_CKBZ.Margin = new System.Windows.Forms.Padding(2);
             this.tb_CKBZ.Name = "tb_CKBZ";
             this.tb_CKBZ.Size = new System.Drawing.Size(252, 21);
@@ -222,22 +225,12 @@
             // 
             // tb_yjwb
             // 
-            this.tb_yjwb.Location = new System.Drawing.Point(9, 51);
+            this.tb_yjwb.Location = new System.Drawing.Point(9, 18);
             this.tb_yjwb.Margin = new System.Windows.Forms.Padding(2);
             this.tb_yjwb.Name = "tb_yjwb";
             this.tb_yjwb.Size = new System.Drawing.Size(250, 21);
             this.tb_yjwb.TabIndex = 42;
             // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(7, 26);
-            this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(53, 12);
-            this.label10.TabIndex = 41;
-            this.label10.Text = "页脚文本";
-            // 
             // label9
             // 
             this.label9.AutoSize = true;
@@ -253,19 +246,18 @@
             this.groupBox1.Controls.Add(this.ck_ym);
             this.groupBox1.Controls.Add(this.label9);
             this.groupBox1.Controls.Add(this.tb_yjwb);
-            this.groupBox1.Controls.Add(this.label10);
-            this.groupBox1.Location = new System.Drawing.Point(11, 302);
+            this.groupBox1.Location = new System.Drawing.Point(13, 386);
             this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox1.Size = new System.Drawing.Size(263, 95);
+            this.groupBox1.Size = new System.Drawing.Size(263, 49);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "页脚设置";
             // 
             // pictureBox7
             // 
-            this.pictureBox7.Location = new System.Drawing.Point(6, 66);
+            this.pictureBox7.Location = new System.Drawing.Point(10, 40);
             this.pictureBox7.Name = "pictureBox7";
             this.pictureBox7.Size = new System.Drawing.Size(249, 144);
             this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -275,7 +267,7 @@
             // label8312
             // 
             this.label8312.AutoSize = true;
-            this.label8312.Location = new System.Drawing.Point(17, 30);
+            this.label8312.Location = new System.Drawing.Point(18, 25);
             this.label8312.Name = "label8312";
             this.label8312.Size = new System.Drawing.Size(47, 12);
             this.label8312.TabIndex = 54;
@@ -283,7 +275,7 @@
             // 
             // button1217
             // 
-            this.button1217.Location = new System.Drawing.Point(181, 25);
+            this.button1217.Location = new System.Drawing.Point(182, 20);
             this.button1217.Name = "button1217";
             this.button1217.Size = new System.Drawing.Size(75, 23);
             this.button1217.TabIndex = 53;
@@ -546,6 +538,10 @@
             // 
             // groupBox9
             // 
+            this.groupBox9.Controls.Add(this.tb_npsb);
+            this.groupBox9.Controls.Add(this.label8);
+            this.groupBox9.Controls.Add(this.tb_djsb);
+            this.groupBox9.Controls.Add(this.label10);
             this.groupBox9.Controls.Add(this.tb_YPBH);
             this.groupBox9.Controls.Add(this.ck_ypsm);
             this.groupBox9.Controls.Add(this.label4);
@@ -558,7 +554,7 @@
             this.groupBox9.Controls.Add(this.label3);
             this.groupBox9.Location = new System.Drawing.Point(13, 12);
             this.groupBox9.Name = "groupBox9";
-            this.groupBox9.Size = new System.Drawing.Size(263, 270);
+            this.groupBox9.Size = new System.Drawing.Size(263, 369);
             this.groupBox9.TabIndex = 1;
             this.groupBox9.TabStop = false;
             this.groupBox9.Text = "首页设置";
@@ -709,13 +705,47 @@
             this.groupBox6.Controls.Add(this.pictureBox7);
             this.groupBox6.Controls.Add(this.button1217);
             this.groupBox6.Controls.Add(this.label8312);
-            this.groupBox6.Location = new System.Drawing.Point(11, 412);
+            this.groupBox6.Location = new System.Drawing.Point(13, 440);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(263, 221);
+            this.groupBox6.Size = new System.Drawing.Size(263, 193);
             this.groupBox6.TabIndex = 80;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "图标选择";
             // 
+            // tb_npsb
+            // 
+            this.tb_npsb.Location = new System.Drawing.Point(5, 329);
+            this.tb_npsb.Margin = new System.Windows.Forms.Padding(2);
+            this.tb_npsb.Name = "tb_npsb";
+            this.tb_npsb.Size = new System.Drawing.Size(252, 21);
+            this.tb_npsb.TabIndex = 59;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(5, 315);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(53, 12);
+            this.label8.TabIndex = 58;
+            this.label8.Text = "能谱设备";
+            // 
+            // tb_djsb
+            // 
+            this.tb_djsb.Location = new System.Drawing.Point(5, 270);
+            this.tb_djsb.Margin = new System.Windows.Forms.Padding(2);
+            this.tb_djsb.Name = "tb_djsb";
+            this.tb_djsb.Size = new System.Drawing.Size(252, 21);
+            this.tb_djsb.TabIndex = 57;
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Location = new System.Drawing.Point(5, 256);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(53, 12);
+            this.label10.TabIndex = 56;
+            this.label10.Text = "电镜设备";
+            // 
             // OTSReport_Template_CleannessA
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -777,7 +807,6 @@
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.TextBox tb_yjwb;
-        private System.Windows.Forms.Label label10;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.CheckBox ck_klcc_xsmk;
         private System.Windows.Forms.CheckBox ck_ysfx_xsmk;
@@ -820,5 +849,9 @@
         private System.Windows.Forms.GroupBox groupBox6;
         private System.Windows.Forms.CheckBox cb_TccleanlinessA;
         private System.Windows.Forms.ComboBox comboBox2;
+        private System.Windows.Forms.TextBox tb_npsb;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.TextBox tb_djsb;
+        private System.Windows.Forms.Label label10;
     }
 }

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.cs

@@ -1,4 +1,5 @@
 
+using DevExpress.Utils.Extensions;
 using NPOI.Util;
 using OTSCommon.DBOperate;
 using OTSIncAReportApp._1_UI.OTSReportExport;
@@ -165,6 +166,9 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.LOGName.ToString(), "M_SY", "LOGName");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName.ToString(), "M_SY", "StandardLibraryName");
 
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_djsb.ToString(), "M_SY", "str_tb_djsb");
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_npsb.ToString(), "M_SY", "str_tb_npsb");
+
 
                 //页眉页脚
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_ymwb.ToString(), "M_YMYJ", "str_tb_ymwb");
@@ -388,8 +392,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ = tb_CKBZ.Text;
             m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_yjwb = tb_yjwb.Text;
             //ResultFile resfile = m_OTSReport_Export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_OTSReport_Export.m_ReportApp.m_rstDataMgr.getSelectedIndex()];
-            
-            
+            m_OTSReport_Export.m_mbszclass.M_SY.str_tb_djsb = tb_djsb.Text;
+            m_OTSReport_Export.m_mbszclass.M_SY.str_tb_npsb = tb_npsb.Text;
             //VDA19
             m_OTSReport_Export.m_mbszclass.M_VDA19.IsVDA19 = cb_TccleanlinessA.Checked;
 
@@ -445,6 +449,9 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             ck_ypsm.Checked = m_OTSReport_Export.m_mbszclass.M_SY.b_ck_ypsm;
             ck_ym.Checked = m_OTSReport_Export.m_mbszclass.M_YMYJ.b_ck_ym;
             tb_yjwb.Text = m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_yjwb;
+
+            tb_djsb.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_djsb;
+            tb_npsb.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_npsb;
             //VDA19
             cb_TccleanlinessA.Checked = m_OTSReport_Export.m_mbszclass.M_VDA19.IsVDA19;
 

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_INCA.Designer.cs

@@ -42,7 +42,6 @@
             this.label6 = new System.Windows.Forms.Label();
             this.ck_ym = new System.Windows.Forms.CheckBox();
             this.tb_yjwb = new System.Windows.Forms.TextBox();
-            this.label10 = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.pictureBox7 = new System.Windows.Forms.PictureBox();
@@ -74,6 +73,9 @@
             this.ck_jzwzb_surface = new System.Windows.Forms.CheckBox();
             this.groupBox9 = new System.Windows.Forms.GroupBox();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.comboBox2 = new System.Windows.Forms.ComboBox();
+            this.comboBox1 = new System.Windows.Forms.ComboBox();
+            this.ck_klcc_xsddt = new System.Windows.Forms.CheckBox();
             this.button8 = new System.Windows.Forms.Button();
             this.label2 = new System.Windows.Forms.Label();
             this.ck_syxt_xsmk = new System.Windows.Forms.CheckBox();
@@ -85,9 +87,10 @@
             this.button3 = new System.Windows.Forms.Button();
             this.label_delete_Class = new System.Windows.Forms.Label();
             this.delete_Class = new System.Windows.Forms.TextBox();
-            this.ck_klcc_xsddt = new System.Windows.Forms.CheckBox();
-            this.comboBox1 = new System.Windows.Forms.ComboBox();
-            this.comboBox2 = new System.Windows.Forms.ComboBox();
+            this.label7 = new System.Windows.Forms.Label();
+            this.tb_djsb = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.tb_npsb = new System.Windows.Forms.TextBox();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
@@ -101,7 +104,7 @@
             // 
             // tb_FBT
             // 
-            this.tb_FBT.Location = new System.Drawing.Point(5, 128);
+            this.tb_FBT.Location = new System.Drawing.Point(5, 97);
             this.tb_FBT.Margin = new System.Windows.Forms.Padding(2);
             this.tb_FBT.Name = "tb_FBT";
             this.tb_FBT.Size = new System.Drawing.Size(252, 21);
@@ -109,7 +112,7 @@
             // 
             // tb_ZBT
             // 
-            this.tb_ZBT.Location = new System.Drawing.Point(5, 57);
+            this.tb_ZBT.Location = new System.Drawing.Point(5, 40);
             this.tb_ZBT.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ZBT.Name = "tb_ZBT";
             this.tb_ZBT.Size = new System.Drawing.Size(252, 21);
@@ -118,7 +121,7 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(5, 97);
+            this.label5.Location = new System.Drawing.Point(5, 80);
             this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(41, 12);
@@ -128,7 +131,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(5, 26);
+            this.label3.Location = new System.Drawing.Point(5, 23);
             this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(41, 12);
@@ -160,7 +163,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(5, 168);
+            this.label1.Location = new System.Drawing.Point(5, 137);
             this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(53, 12);
@@ -169,7 +172,7 @@
             // 
             // tb_YPBH
             // 
-            this.tb_YPBH.Location = new System.Drawing.Point(5, 199);
+            this.tb_YPBH.Location = new System.Drawing.Point(5, 154);
             this.tb_YPBH.Margin = new System.Windows.Forms.Padding(2);
             this.tb_YPBH.Name = "tb_YPBH";
             this.tb_YPBH.Size = new System.Drawing.Size(252, 21);
@@ -178,7 +181,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(5, 239);
+            this.label4.Location = new System.Drawing.Point(5, 194);
             this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(53, 12);
@@ -187,7 +190,7 @@
             // 
             // tb_CKBZ
             // 
-            this.tb_CKBZ.Location = new System.Drawing.Point(5, 270);
+            this.tb_CKBZ.Location = new System.Drawing.Point(5, 211);
             this.tb_CKBZ.Margin = new System.Windows.Forms.Padding(2);
             this.tb_CKBZ.Name = "tb_CKBZ";
             this.tb_CKBZ.Size = new System.Drawing.Size(252, 21);
@@ -225,22 +228,12 @@
             // 
             // tb_yjwb
             // 
-            this.tb_yjwb.Location = new System.Drawing.Point(5, 58);
+            this.tb_yjwb.Location = new System.Drawing.Point(5, 28);
             this.tb_yjwb.Margin = new System.Windows.Forms.Padding(2);
             this.tb_yjwb.Name = "tb_yjwb";
-            this.tb_yjwb.Size = new System.Drawing.Size(250, 21);
+            this.tb_yjwb.Size = new System.Drawing.Size(252, 21);
             this.tb_yjwb.TabIndex = 42;
             // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(6, 29);
-            this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(53, 12);
-            this.label10.TabIndex = 41;
-            this.label10.Text = "页脚文本";
-            // 
             // label9
             // 
             this.label9.AutoSize = true;
@@ -256,19 +249,18 @@
             this.groupBox1.Controls.Add(this.ck_ym);
             this.groupBox1.Controls.Add(this.label9);
             this.groupBox1.Controls.Add(this.tb_yjwb);
-            this.groupBox1.Controls.Add(this.label10);
-            this.groupBox1.Location = new System.Drawing.Point(13, 327);
+            this.groupBox1.Location = new System.Drawing.Point(13, 382);
             this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox1.Size = new System.Drawing.Size(263, 100);
+            this.groupBox1.Size = new System.Drawing.Size(263, 65);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "页脚设置";
             // 
             // pictureBox7
             // 
-            this.pictureBox7.Location = new System.Drawing.Point(8, 57);
+            this.pictureBox7.Location = new System.Drawing.Point(8, 48);
             this.pictureBox7.Name = "pictureBox7";
             this.pictureBox7.Size = new System.Drawing.Size(249, 154);
             this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -278,7 +270,7 @@
             // label8312
             // 
             this.label8312.AutoSize = true;
-            this.label8312.Location = new System.Drawing.Point(18, 33);
+            this.label8312.Location = new System.Drawing.Point(12, 27);
             this.label8312.Name = "label8312";
             this.label8312.Size = new System.Drawing.Size(47, 12);
             this.label8312.TabIndex = 54;
@@ -286,7 +278,7 @@
             // 
             // button1217
             // 
-            this.button1217.Location = new System.Drawing.Point(182, 28);
+            this.button1217.Location = new System.Drawing.Point(182, 19);
             this.button1217.Name = "button1217";
             this.button1217.Size = new System.Drawing.Size(75, 23);
             this.button1217.TabIndex = 53;
@@ -575,6 +567,10 @@
             // 
             // groupBox9
             // 
+            this.groupBox9.Controls.Add(this.tb_npsb);
+            this.groupBox9.Controls.Add(this.label8);
+            this.groupBox9.Controls.Add(this.tb_djsb);
+            this.groupBox9.Controls.Add(this.label7);
             this.groupBox9.Controls.Add(this.tb_YPBH);
             this.groupBox9.Controls.Add(this.ck_ypsm);
             this.groupBox9.Controls.Add(this.label4);
@@ -587,7 +583,7 @@
             this.groupBox9.Controls.Add(this.label3);
             this.groupBox9.Location = new System.Drawing.Point(13, 13);
             this.groupBox9.Name = "groupBox9";
-            this.groupBox9.Size = new System.Drawing.Size(263, 309);
+            this.groupBox9.Size = new System.Drawing.Size(263, 364);
             this.groupBox9.TabIndex = 1;
             this.groupBox9.TabStop = false;
             this.groupBox9.Text = "首页设置";
@@ -619,6 +615,33 @@
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "模块设定";
             // 
+            // comboBox2
+            // 
+            this.comboBox2.FormattingEnabled = true;
+            this.comboBox2.Location = new System.Drawing.Point(130, 84);
+            this.comboBox2.Name = "comboBox2";
+            this.comboBox2.Size = new System.Drawing.Size(121, 20);
+            this.comboBox2.TabIndex = 71;
+            // 
+            // comboBox1
+            // 
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Location = new System.Drawing.Point(403, 53);
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Size = new System.Drawing.Size(121, 20);
+            this.comboBox1.TabIndex = 70;
+            // 
+            // ck_klcc_xsddt
+            // 
+            this.ck_klcc_xsddt.AutoSize = true;
+            this.ck_klcc_xsddt.Location = new System.Drawing.Point(31, 55);
+            this.ck_klcc_xsddt.Margin = new System.Windows.Forms.Padding(2);
+            this.ck_klcc_xsddt.Name = "ck_klcc_xsddt";
+            this.ck_klcc_xsddt.Size = new System.Drawing.Size(84, 16);
+            this.ck_klcc_xsddt.TabIndex = 69;
+            this.ck_klcc_xsddt.Text = "颗粒堆叠图";
+            this.ck_klcc_xsddt.UseVisualStyleBackColor = true;
+            // 
             // button8
             // 
             this.button8.Location = new System.Drawing.Point(565, 117);
@@ -684,9 +707,9 @@
             this.groupBox6.Controls.Add(this.pictureBox7);
             this.groupBox6.Controls.Add(this.label8312);
             this.groupBox6.Controls.Add(this.button1217);
-            this.groupBox6.Location = new System.Drawing.Point(13, 432);
+            this.groupBox6.Location = new System.Drawing.Point(13, 452);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(263, 233);
+            this.groupBox6.Size = new System.Drawing.Size(263, 213);
             this.groupBox6.TabIndex = 69;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "图标选择";
@@ -730,32 +753,39 @@
             this.delete_Class.Size = new System.Drawing.Size(691, 49);
             this.delete_Class.TabIndex = 62;
             // 
-            // ck_klcc_xsddt
+            // label7
             // 
-            this.ck_klcc_xsddt.AutoSize = true;
-            this.ck_klcc_xsddt.Location = new System.Drawing.Point(31, 55);
-            this.ck_klcc_xsddt.Margin = new System.Windows.Forms.Padding(2);
-            this.ck_klcc_xsddt.Name = "ck_klcc_xsddt";
-            this.ck_klcc_xsddt.Size = new System.Drawing.Size(84, 16);
-            this.ck_klcc_xsddt.TabIndex = 69;
-            this.ck_klcc_xsddt.Text = "颗粒堆叠图";
-            this.ck_klcc_xsddt.UseVisualStyleBackColor = true;
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(5, 251);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(53, 12);
+            this.label7.TabIndex = 52;
+            this.label7.Text = "电镜设备";
             // 
-            // comboBox1
+            // tb_djsb
             // 
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(403, 53);
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(121, 20);
-            this.comboBox1.TabIndex = 70;
+            this.tb_djsb.Location = new System.Drawing.Point(5, 268);
+            this.tb_djsb.Margin = new System.Windows.Forms.Padding(2);
+            this.tb_djsb.Name = "tb_djsb";
+            this.tb_djsb.Size = new System.Drawing.Size(252, 21);
+            this.tb_djsb.TabIndex = 53;
             // 
-            // comboBox2
+            // label8
             // 
-            this.comboBox2.FormattingEnabled = true;
-            this.comboBox2.Location = new System.Drawing.Point(130, 84);
-            this.comboBox2.Name = "comboBox2";
-            this.comboBox2.Size = new System.Drawing.Size(121, 20);
-            this.comboBox2.TabIndex = 71;
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(5, 308);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(53, 12);
+            this.label8.TabIndex = 54;
+            this.label8.Text = "能谱设备";
+            // 
+            // tb_npsb
+            // 
+            this.tb_npsb.Location = new System.Drawing.Point(5, 325);
+            this.tb_npsb.Margin = new System.Windows.Forms.Padding(2);
+            this.tb_npsb.Name = "tb_npsb";
+            this.tb_npsb.Size = new System.Drawing.Size(252, 21);
+            this.tb_npsb.TabIndex = 55;
             // 
             // OTSReport_Template_INCA
             // 
@@ -816,7 +846,6 @@
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.TextBox tb_yjwb;
-        private System.Windows.Forms.Label label10;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.CheckBox ck_klcc_xsmk;
         private System.Windows.Forms.CheckBox ck_ysfx_xsmk;
@@ -862,5 +891,9 @@
         private System.Windows.Forms.CheckBox ck_klcc_xsddt;
         private System.Windows.Forms.ComboBox comboBox1;
         private System.Windows.Forms.ComboBox comboBox2;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.TextBox tb_djsb;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.TextBox tb_npsb;
     }
 }

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_INCA.cs

@@ -159,6 +159,9 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.b_ck_ypsm.ToString(), "M_SY", "b_ck_ypsm");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.LOGName.ToString(), "M_SY", "LOGName");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName.ToString(), "M_SY", "StandardLibraryName");
+
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_djsb.ToString(), "M_SY", "str_tb_djsb");
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_npsb.ToString(), "M_SY", "str_tb_npsb");
                 //页眉页脚
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_ymwb.ToString(), "M_YMYJ", "str_tb_ymwb");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_KHH.ToString(), "M_YMYJ", "str_tb_KHH");
@@ -384,6 +387,9 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_YPBH = tb_YPBH.Text;
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ = tb_CKBZ.Text;
             m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_yjwb = tb_yjwb.Text;
+
+            m_OTSReport_Export.m_mbszclass.M_SY.str_tb_djsb = tb_djsb.Text;
+            m_OTSReport_Export.m_mbszclass.M_SY.str_tb_npsb = tb_npsb.Text;
             //颗粒分析结果
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk = ck_klcc_xsmk.Checked;
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_xsddt = ck_klcc_xsddt.Checked;
@@ -438,6 +444,9 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             ck_ypsm.Checked = m_OTSReport_Export.m_mbszclass.M_SY.b_ck_ypsm;
             ck_ym.Checked = m_OTSReport_Export.m_mbszclass.M_YMYJ.b_ck_ym;
             tb_yjwb.Text = m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_yjwb;
+
+            tb_djsb.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_djsb;
+            tb_npsb.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_npsb;
             //颗粒分析结果
             ck_klcc_xsmk.Checked = m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk;
             ck_klcc_xsddt.Checked = m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_xsddt;
@@ -854,11 +863,13 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             if(category.IsModify)
             {
                 //List<string> ls = category.OutElementList;
+                DeleteClass_Serial = category.vs.Copy();
+                var MainPriority = category.OutElementList.Copy();
+
                 m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial.Clear();
-                m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial= category.vs.Copy();
-                DeleteClass_Serial = category.vs;
-                var MainPriority = category.OutElementList;
-                m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass = category.OutElementList;
+                m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial= DeleteClass_Serial.Copy();
+                
+                m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass = MainPriority.Copy();
                 string str = "";
                 for (int i = 0; i < MainPriority.Count; i++)
                 {

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

@@ -165,6 +165,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_ypbh_up = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_fbt = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_zbt = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrTableRow19 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.dev_sb_text = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.dev_np_text = new DevExpress.XtraReports.UI.XRTableCell();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xt_TCleannessA)).BeginInit();
@@ -1348,8 +1353,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrTableRow4,
             this.xrTableRow5,
             this.xrTableRow6,
-            this.xrTableRow7});
-            this.xrTable1.SizeF = new System.Drawing.SizeF(629.9998F, 175F);
+            this.xrTableRow7,
+            this.xrTableRow19});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(629.9998F, 200F);
             this.xrTable1.StylePriority.UseBorders = false;
             // 
             // xrTableRow1
@@ -1686,6 +1692,52 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_zbt.Text = "dev_zbt";
             this.dev_zbt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
+            // xrTableRow19
+            // 
+            this.xrTableRow19.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell48,
+            this.dev_sb_text,
+            this.xrTableCell50,
+            this.dev_np_text});
+            this.xrTableRow19.Name = "xrTableRow19";
+            this.xrTableRow19.Weight = 1D;
+            // 
+            // xrTableCell48
+            // 
+            this.xrTableCell48.Multiline = true;
+            this.xrTableCell48.Name = "xrTableCell48";
+            this.xrTableCell48.StylePriority.UseTextAlignment = false;
+            this.xrTableCell48.Text = "电镜型号:";
+            this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell48.Weight = 1D;
+            // 
+            // dev_sb_text
+            // 
+            this.dev_sb_text.Multiline = true;
+            this.dev_sb_text.Name = "dev_sb_text";
+            this.dev_sb_text.StylePriority.UseTextAlignment = false;
+            this.dev_sb_text.Text = "dev_sb_text";
+            this.dev_sb_text.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.dev_sb_text.Weight = 1D;
+            // 
+            // xrTableCell50
+            // 
+            this.xrTableCell50.Multiline = true;
+            this.xrTableCell50.Name = "xrTableCell50";
+            this.xrTableCell50.StylePriority.UseTextAlignment = false;
+            this.xrTableCell50.Text = "能谱型号:";
+            this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell50.Weight = 1D;
+            // 
+            // dev_np_text
+            // 
+            this.dev_np_text.Multiline = true;
+            this.dev_np_text.Name = "dev_np_text";
+            this.dev_np_text.StylePriority.UseTextAlignment = false;
+            this.dev_np_text.Text = "dev_np_text";
+            this.dev_np_text.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.dev_np_text.Weight = 1D;
+            // 
             // OTS_DEVReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1852,5 +1904,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         private DevExpress.XtraReports.UI.XRLabel xrLabel6;
         private DevExpress.XtraReports.UI.XRLabel xrLabel5;
         private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow19;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
+        private DevExpress.XtraReports.UI.XRTableCell dev_sb_text;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
+        private DevExpress.XtraReports.UI.XRTableCell dev_np_text;
     }
 }

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

@@ -187,7 +187,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(dev_fdbs_text, data.Rows[6][1].ToString());//放大倍数
             setXRLabelData(dev_bgsj_text, DateTime.Now.ToShortDateString().ToString());//报告时间:
             setXRLabelData(dev_ckbz_text, TemplateClass.M_SY.str_tb_CKBZ.ToString());//参考标准
-            FieldOfViewArea = data.Rows[5][1].ToString();
+            FieldOfViewArea= HeaderData.filedsArea.ToString();
+            //FieldOfViewArea = data.Rows[5][1].ToString();
             #endregion
             #region 加载模板设置文档数据
             setXRLabelData(dev_yj, TemplateClass.M_YMYJ.str_tb_yjwb.ToString());//页脚
@@ -195,6 +196,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(dev_fbt, TemplateClass.M_SY.str_tb_FBT.ToString());//副标题
             setXRLabelData(dev_ypbh_text_up, TemplateClass.M_SY.str_tb_YPBH.ToString());//样品编号
             setXRLabelData(dev_bgsj_text_up, DateTime.Now.ToShortDateString().ToString());//当前日期
+
+            setXRLabelData(dev_sb_text, TemplateClass.M_SY.str_tb_djsb.ToString());//电镜设备名称
+            setXRLabelData(dev_np_text, TemplateClass.M_SY.str_tb_npsb.ToString());//能谱设备名称
+
+
             //setXRLabelData(xrTableCell1, xrTableCell1)
             #endregion
             if (a_isINCA)