临时提交

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

@@ -82,7 +82,7 @@
       <MBIndex2>2</MBIndex2>
       <MBIndex3>3</MBIndex3>
     </list_lbv_syxt_mblb_index>
-    <str_cb_syxt_ljb>li3.psf</str_cb_syxt_ljb>
+    <str_cb_syxt_ljb>lj.psf</str_cb_syxt_ljb>
   </M_SYXT>
   <M_KLLBXX>
     <b_ck_kllb_xsmk>True</b_ck_kllb_xsmk>

OTSIncAReportApp/1-UI/Control_Graph/Controls/OutPIC.cs

@@ -180,6 +180,8 @@ namespace OTSIncAReportApp._3_ServiceCenter
 
                                 Bitmap image = new Bitmap(bitmap.Width, bitmap.Height);
                                 Graphics graph_2 = Graphics.FromImage(image);
+                                Color color1 = Color.FromArgb(217, 217, 217);
+                                graph_2.Clear(color1);
 
                                 for (int a = 0; a < fieldlist.Count; a++)
                                 {

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

@@ -26,7 +26,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
         /// </summary>
         /// <param name="m_mbszclass"></param>
         /// <returns></returns>
-        public DataTable Get_dev_kllb_data(c_TemplateClass m_mbszclass, OTSReport_Export m_otsreport_export,out DataTable FilteredData)
+        public DataTable Get_dev_kllb_data(c_TemplateClass m_mbszclass, OTSReport_Export m_otsreport_export,out DataTable FilteredData,out List<DataTable> ElementIcons)
         {
             int serialNumber = 1;
             //------------------加载模块,获取数据-------------------------------------------------
@@ -183,6 +183,8 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             DT_Largest20.Columns.Add("p3", typeof(Bitmap));
             #endregion
             DataTable Filtered = dt_ParticlesGridDevidePage.Clone();
+
+            ElementIcons = new List<DataTable>();
             #region 插入-前20颗粒部份
             for (int i_row = 0; i_row < dt_ParticlesGridDevidePage.Rows.Count; i_row++)
             {
@@ -207,7 +209,8 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                     bp_particle = fielddata.GetBitmapByParticle(bp_field, rectangle);
                     bp_particle.Tag = new List<string>() { dt_ParticlesGridDevidePage.Rows[i_row]["FieldId"].ToString(), dt_ParticlesGridDevidePage.Rows[i_row]["ParticleId"].ToString(), dt_ParticlesGridDevidePage.Rows[i_row]["TypeId"].ToString() };
                     //获取该颗粒的xray能谱图像
-                    ExportXRay(str_fieldid, str_particleid, fielddata);
+                    DataTable DT_XR= ExportXRay(str_fieldid, str_particleid, fielddata);
+                    ElementIcons.Add(DT_XR);
                     System.Drawing.Bitmap bp_xraybp = ExportXRayBitmap(str_fieldid,
                             str_particleid, Convert.ToInt32(str_typeid), str_typename, fielddata);
                     Bitmap ls_xraybpnew = OTSIncAReportGraph.Class.DrawFunction.KiResizeImage(bp_xraybp, 700, 115);//能谱图处理
@@ -481,7 +484,9 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
         private DataTable ExportXRay(string in_fieldid, string in_particleid, ParticleData particleData)
         {
             DataTable data = new DataTable();
-            data.Columns.Add("data");
+            data.Columns.Add("XName", typeof(string));
+            data.Columns.Add("Serial", typeof(double));
+            data.Columns.Add("data", typeof(double));
             uint[] Analysis_xray = new uint[2000];
             //获取Xray数据
             Particle list = particleData.GetParticleByFidAndPid(in_fieldid, in_particleid);
@@ -492,15 +497,15 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             Particle particle = list;
             if (particle.XrayId > -1)
             {
-                for (int i = 0; i < 2000; i++)
+                for (int i = 0; i < 999; i++)
                 {
-                    if (particle.XRayData != null)
-                    {
-                        DataRow dr  = data.NewRow();
-                        dr["data"] = BitConverter.ToUInt32(particle.XRayData, i * 4);
-                        Analysis_xray[i] = BitConverter.ToUInt32(particle.XRayData, i * 4);
-                        data.Rows.Add(dr);
-                    }
+                    DataRow dr = data.NewRow();
+                    dr["XName"] = i + 1;
+                    dr["Serial"] = i + 1;
+                    dr["data"] = BitConverter.ToUInt32(particle.XRayData, i * 4);
+                    Analysis_xray[i] = BitConverter.ToUInt32(particle.XRayData, i * 4);
+                    data.Rows.Add(dr);
+
                 }
             }
 

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.cs

@@ -932,7 +932,8 @@ namespace OTSIncAReportApp
             }
             try
             {
-                if (m_mbszclass.M_JZWZB.b_ck_chart)//夹杂物面积比图
+
+                if (m_mbszclass.M_KLFXJG.b_ck_klcc_dfl == true || m_mbszclass.M_KLFXJG.b_ck_klcc_xfl == true)
                 {
                     double d1 = Convert.ToDouble(Serial / total) * 100.0;
                     Serial++;
@@ -941,10 +942,17 @@ namespace OTSIncAReportApp
                     richTextBox1.AppendText("加载：夹杂物面积比图……\n");
                     richTextBox1.AppendText("加载：" + Math.Round(d1, length).ToString() + "%\n");
                     DEVReport.XRPageBreak();
-                    DEVReport.set_incaPIC_classify();
-                    DEVReport.set_incaPIC_subdivision();
+                    if (m_mbszclass.M_KLFXJG.b_ck_klcc_dfl)
+                    {
+                        DEVReport.set_incaPIC_classify();
+                    }
+                    if (m_mbszclass.M_KLFXJG.b_ck_klcc_xfl)
+                    {
+                        DEVReport.set_incaPIC_subdivision();
+                    }
                     richTextBox1.ScrollToCaret();
                 }
+
             }
             catch
             {

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

@@ -151,10 +151,10 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(224, 57);
+            this.button1.Location = new System.Drawing.Point(208, 57);
             this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(71, 22);
+            this.button1.Size = new System.Drawing.Size(55, 22);
             this.button1.TabIndex = 60;
             this.button1.Text = "另存";
             this.button1.UseVisualStyleBackColor = true;
@@ -796,7 +796,7 @@
             this.button6.Location = new System.Drawing.Point(149, 57);
             this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
-            this.button6.Size = new System.Drawing.Size(71, 22);
+            this.button6.Size = new System.Drawing.Size(55, 22);
             this.button6.TabIndex = 72;
             this.button6.Text = "保存";
             this.button6.UseVisualStyleBackColor = true;
@@ -851,9 +851,9 @@
             this.groupBox2.Controls.Add(this.label_delete_Class);
             this.groupBox2.Controls.Add(this.delete_Class);
             this.groupBox2.Controls.Add(this.label11111);
-            this.groupBox2.Location = new System.Drawing.Point(300, 13);
+            this.groupBox2.Location = new System.Drawing.Point(281, 12);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(511, 140);
+            this.groupBox2.Size = new System.Drawing.Size(530, 140);
             this.groupBox2.TabIndex = 77;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "去除信息";

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

@@ -48,36 +48,23 @@
             this.pictureBox7 = new System.Windows.Forms.PictureBox();
             this.label8312 = new System.Windows.Forms.Label();
             this.button1217 = new System.Windows.Forms.Button();
-            this.groupBox4 = new System.Windows.Forms.GroupBox();
             this.checkBox2 = new System.Windows.Forms.CheckBox();
             this.checkBox1 = new System.Windows.Forms.CheckBox();
-            this.label11zxc = new System.Windows.Forms.Label();
-            this.label1121ad = new System.Windows.Forms.Label();
             this.ck_klcc_xsmk = new System.Windows.Forms.CheckBox();
-            this.label17 = new System.Windows.Forms.Label();
             this.cb_klcc_ljb = new System.Windows.Forms.ComboBox();
             this.cb_klcc_jsfs = new System.Windows.Forms.ComboBox();
             this.label15 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
-            this.groupBox6 = new System.Windows.Forms.GroupBox();
             this.button3 = new System.Windows.Forms.Button();
             this.comboBox_PeriodicTable = new System.Windows.Forms.ComboBox();
             this.tb_ysfx_xsys = new System.Windows.Forms.TextBox();
             this.button4 = new System.Windows.Forms.Button();
             this.ck_ysfx_xsmk = new System.Windows.Forms.CheckBox();
-            this.label25 = new System.Windows.Forms.Label();
-            this.groupBox7 = new System.Windows.Forms.GroupBox();
             this.lbv_syxt_mblb = new System.Windows.Forms.ListView();
-            this.ck_syxt_xsmk = new System.Windows.Forms.CheckBox();
-            this.label40 = new System.Windows.Forms.Label();
-            this.cb_syxt_ljb = new System.Windows.Forms.ComboBox();
-            this.label38 = new System.Windows.Forms.Label();
             this.label33 = new System.Windows.Forms.Label();
-            this.groupBox8 = new System.Windows.Forms.GroupBox();
             this.numericMin = new System.Windows.Forms.NumericUpDown();
             this.label112121 = new System.Windows.Forms.Label();
             this.ck_kllb_fjzt = new System.Windows.Forms.CheckBox();
-            this.label111 = new System.Windows.Forms.Label();
             this.groupBox_zt = new System.Windows.Forms.GroupBox();
             this.ParticleList_5 = new System.Windows.Forms.Label();
             this.cb_FrameChart_p2 = new System.Windows.Forms.ComboBox();
@@ -91,17 +78,12 @@
             this.ParticleList_1 = new System.Windows.Forms.Label();
             this.comboBox_p1 = new System.Windows.Forms.ComboBox();
             this.ck_kllb_xsmk = new System.Windows.Forms.CheckBox();
-            this.label34 = new System.Windows.Forms.Label();
             this.label_delete_Class = new System.Windows.Forms.Label();
             this.delete_Class = new System.Windows.Forms.TextBox();
             this.label11111 = new System.Windows.Forms.Label();
             this.button5 = new System.Windows.Forms.Button();
             this.tb_RemoveElements = new System.Windows.Forms.TextBox();
             this.button6 = new System.Windows.Forms.Button();
-            this.groupBox211 = new System.Windows.Forms.GroupBox();
-            this.ck_jzwzb_chart = new System.Windows.Forms.CheckBox();
-            this.label1311 = new System.Windows.Forms.Label();
-            this.label1211 = new System.Windows.Forms.Label();
             this.ck_jzwzb_surface = new System.Windows.Forms.CheckBox();
             this.groupBox9 = new System.Windows.Forms.GroupBox();
             this.label39 = new System.Windows.Forms.Label();
@@ -111,18 +93,16 @@
             this.label_cypxss = new System.Windows.Forms.Label();
             this.textBox_zypxss = new System.Windows.Forms.TextBox();
             this.label_zypxss = new System.Windows.Forms.Label();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.ck_syxt_xsmk = new System.Windows.Forms.CheckBox();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
-            this.groupBox4.SuspendLayout();
-            this.groupBox6.SuspendLayout();
-            this.groupBox7.SuspendLayout();
-            this.groupBox8.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
             this.groupBox_zt.SuspendLayout();
             this.groupBox_px.SuspendLayout();
-            this.groupBox211.SuspendLayout();
             this.groupBox9.SuspendLayout();
             this.groupBox2.SuspendLayout();
+            this.groupBox3.SuspendLayout();
             this.SuspendLayout();
             // 
             // tb_FBT
@@ -163,10 +143,10 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(224, 57);
+            this.button1.Location = new System.Drawing.Point(208, 57);
             this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(71, 22);
+            this.button1.Size = new System.Drawing.Size(55, 22);
             this.button1.TabIndex = 60;
             this.button1.Text = "另存";
             this.button1.UseVisualStyleBackColor = true;
@@ -251,7 +231,7 @@
             // 
             // tb_yjwb
             // 
-            this.tb_yjwb.Location = new System.Drawing.Point(8, 68);
+            this.tb_yjwb.Location = new System.Drawing.Point(5, 42);
             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);
@@ -260,7 +240,7 @@
             // label10
             // 
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(8, 31);
+            this.label10.Location = new System.Drawing.Point(7, 19);
             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);
@@ -290,14 +270,14 @@
             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, 311);
+            this.groupBox1.Size = new System.Drawing.Size(263, 259);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "页脚设置";
             // 
             // pictureBox7
             // 
-            this.pictureBox7.Location = new System.Drawing.Point(9, 162);
+            this.pictureBox7.Location = new System.Drawing.Point(5, 104);
             this.pictureBox7.Name = "pictureBox7";
             this.pictureBox7.Size = new System.Drawing.Size(249, 144);
             this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -307,7 +287,7 @@
             // label8312
             // 
             this.label8312.AutoSize = true;
-            this.label8312.Location = new System.Drawing.Point(10, 125);
+            this.label8312.Location = new System.Drawing.Point(6, 80);
             this.label8312.Name = "label8312";
             this.label8312.Size = new System.Drawing.Size(47, 12);
             this.label8312.TabIndex = 54;
@@ -315,7 +295,7 @@
             // 
             // button1217
             // 
-            this.button1217.Location = new System.Drawing.Point(174, 120);
+            this.button1217.Location = new System.Drawing.Point(170, 75);
             this.button1217.Name = "button1217";
             this.button1217.Size = new System.Drawing.Size(75, 23);
             this.button1217.TabIndex = 53;
@@ -323,111 +303,63 @@
             this.button1217.UseVisualStyleBackColor = true;
             this.button1217.Click += new System.EventHandler(this.button1217_Click);
             // 
-            // groupBox4
-            // 
-            this.groupBox4.Controls.Add(this.checkBox2);
-            this.groupBox4.Controls.Add(this.checkBox1);
-            this.groupBox4.Controls.Add(this.label11zxc);
-            this.groupBox4.Controls.Add(this.label1121ad);
-            this.groupBox4.Controls.Add(this.ck_klcc_xsmk);
-            this.groupBox4.Controls.Add(this.label17);
-            this.groupBox4.Controls.Add(this.cb_klcc_ljb);
-            this.groupBox4.Controls.Add(this.cb_klcc_jsfs);
-            this.groupBox4.Controls.Add(this.label15);
-            this.groupBox4.Controls.Add(this.label14);
-            this.groupBox4.Location = new System.Drawing.Point(280, 157);
-            this.groupBox4.Margin = new System.Windows.Forms.Padding(2);
-            this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox4.Size = new System.Drawing.Size(263, 285);
-            this.groupBox4.TabIndex = 2;
-            this.groupBox4.TabStop = false;
-            this.groupBox4.Text = "颗粒尺寸分析结果";
-            // 
             // checkBox2
             // 
             this.checkBox2.AutoSize = true;
-            this.checkBox2.Location = new System.Drawing.Point(224, 112);
+            this.checkBox2.Location = new System.Drawing.Point(391, 59);
             this.checkBox2.Margin = new System.Windows.Forms.Padding(2);
             this.checkBox2.Name = "checkBox2";
-            this.checkBox2.Size = new System.Drawing.Size(15, 14);
+            this.checkBox2.Size = new System.Drawing.Size(108, 16);
             this.checkBox2.TabIndex = 57;
+            this.checkBox2.Text = "显示小分类图表";
             this.checkBox2.UseVisualStyleBackColor = true;
             // 
             // checkBox1
             // 
             this.checkBox1.AutoSize = true;
-            this.checkBox1.Location = new System.Drawing.Point(224, 68);
+            this.checkBox1.Location = new System.Drawing.Point(271, 59);
             this.checkBox1.Margin = new System.Windows.Forms.Padding(2);
             this.checkBox1.Name = "checkBox1";
-            this.checkBox1.Size = new System.Drawing.Size(15, 14);
+            this.checkBox1.Size = new System.Drawing.Size(108, 16);
             this.checkBox1.TabIndex = 56;
+            this.checkBox1.Text = "显示大分类图表";
             this.checkBox1.UseVisualStyleBackColor = true;
             // 
-            // label11zxc
-            // 
-            this.label11zxc.AutoSize = true;
-            this.label11zxc.Location = new System.Drawing.Point(12, 111);
-            this.label11zxc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label11zxc.Name = "label11zxc";
-            this.label11zxc.Size = new System.Drawing.Size(65, 12);
-            this.label11zxc.TabIndex = 55;
-            this.label11zxc.Text = "显示小分类";
-            // 
-            // label1121ad
-            // 
-            this.label1121ad.AutoSize = true;
-            this.label1121ad.Location = new System.Drawing.Point(12, 68);
-            this.label1121ad.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label1121ad.Name = "label1121ad";
-            this.label1121ad.Size = new System.Drawing.Size(65, 12);
-            this.label1121ad.TabIndex = 54;
-            this.label1121ad.Text = "显示大分类";
-            // 
             // ck_klcc_xsmk
             // 
             this.ck_klcc_xsmk.AutoSize = true;
-            this.ck_klcc_xsmk.Location = new System.Drawing.Point(224, 33);
+            this.ck_klcc_xsmk.Location = new System.Drawing.Point(16, 29);
             this.ck_klcc_xsmk.Margin = new System.Windows.Forms.Padding(2);
             this.ck_klcc_xsmk.Name = "ck_klcc_xsmk";
-            this.ck_klcc_xsmk.Size = new System.Drawing.Size(15, 14);
+            this.ck_klcc_xsmk.Size = new System.Drawing.Size(72, 16);
             this.ck_klcc_xsmk.TabIndex = 53;
+            this.ck_klcc_xsmk.Text = "颗粒尺寸";
             this.ck_klcc_xsmk.UseVisualStyleBackColor = true;
             // 
-            // label17
-            // 
-            this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(12, 35);
-            this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(65, 12);
-            this.label17.TabIndex = 52;
-            this.label17.Text = "显示该模块";
-            // 
             // cb_klcc_ljb
             // 
             this.cb_klcc_ljb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_klcc_ljb.FormattingEnabled = true;
-            this.cb_klcc_ljb.Location = new System.Drawing.Point(12, 236);
+            this.cb_klcc_ljb.Location = new System.Drawing.Point(140, 82);
             this.cb_klcc_ljb.Margin = new System.Windows.Forms.Padding(2);
             this.cb_klcc_ljb.Name = "cb_klcc_ljb";
-            this.cb_klcc_ljb.Size = new System.Drawing.Size(216, 20);
+            this.cb_klcc_ljb.Size = new System.Drawing.Size(92, 20);
             this.cb_klcc_ljb.TabIndex = 42;
             // 
             // cb_klcc_jsfs
             // 
             this.cb_klcc_jsfs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_klcc_jsfs.FormattingEnabled = true;
-            this.cb_klcc_jsfs.Location = new System.Drawing.Point(14, 176);
+            this.cb_klcc_jsfs.Location = new System.Drawing.Point(18, 82);
             this.cb_klcc_jsfs.Margin = new System.Windows.Forms.Padding(2);
             this.cb_klcc_jsfs.Name = "cb_klcc_jsfs";
-            this.cb_klcc_jsfs.Size = new System.Drawing.Size(216, 20);
+            this.cb_klcc_jsfs.Size = new System.Drawing.Size(92, 20);
             this.cb_klcc_jsfs.TabIndex = 42;
             // 
             // label15
             // 
             this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(12, 210);
+            this.label15.Location = new System.Drawing.Point(138, 59);
             this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(65, 12);
@@ -437,33 +369,16 @@
             // label14
             // 
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(12, 150);
+            this.label14.Location = new System.Drawing.Point(16, 59);
             this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(53, 12);
             this.label14.TabIndex = 41;
             this.label14.Text = "计算方式";
             // 
-            // groupBox6
-            // 
-            this.groupBox6.Controls.Add(this.button3);
-            this.groupBox6.Controls.Add(this.comboBox_PeriodicTable);
-            this.groupBox6.Controls.Add(this.tb_ysfx_xsys);
-            this.groupBox6.Controls.Add(this.button4);
-            this.groupBox6.Controls.Add(this.ck_ysfx_xsmk);
-            this.groupBox6.Controls.Add(this.label25);
-            this.groupBox6.Location = new System.Drawing.Point(280, 448);
-            this.groupBox6.Margin = new System.Windows.Forms.Padding(2);
-            this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox6.Size = new System.Drawing.Size(263, 199);
-            this.groupBox6.TabIndex = 4;
-            this.groupBox6.TabStop = false;
-            this.groupBox6.Text = "元素分析表";
-            // 
             // button3
             // 
-            this.button3.Location = new System.Drawing.Point(206, 82);
+            this.button3.Location = new System.Drawing.Point(172, 116);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(55, 23);
             this.button3.TabIndex = 60;
@@ -474,25 +389,25 @@
             // comboBox_PeriodicTable
             // 
             this.comboBox_PeriodicTable.FormattingEnabled = true;
-            this.comboBox_PeriodicTable.Location = new System.Drawing.Point(20, 143);
+            this.comboBox_PeriodicTable.Location = new System.Drawing.Point(16, 149);
             this.comboBox_PeriodicTable.Name = "comboBox_PeriodicTable";
-            this.comboBox_PeriodicTable.Size = new System.Drawing.Size(141, 20);
+            this.comboBox_PeriodicTable.Size = new System.Drawing.Size(116, 20);
             this.comboBox_PeriodicTable.TabIndex = 59;
             this.comboBox_PeriodicTable.SelectedIndexChanged += new System.EventHandler(this.comboBox_PeriodicTable_SelectedIndexChanged);
             this.comboBox_PeriodicTable.KeyDown += new System.Windows.Forms.KeyEventHandler(this.comboBox_PeriodicTable_KeyDown);
             // 
             // tb_ysfx_xsys
             // 
-            this.tb_ysfx_xsys.Location = new System.Drawing.Point(20, 84);
+            this.tb_ysfx_xsys.Location = new System.Drawing.Point(16, 118);
             this.tb_ysfx_xsys.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ysfx_xsys.Name = "tb_ysfx_xsys";
             this.tb_ysfx_xsys.ReadOnly = true;
-            this.tb_ysfx_xsys.Size = new System.Drawing.Size(181, 21);
+            this.tb_ysfx_xsys.Size = new System.Drawing.Size(137, 21);
             this.tb_ysfx_xsys.TabIndex = 58;
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(171, 143);
+            this.button4.Location = new System.Drawing.Point(155, 150);
             this.button4.Margin = new System.Windows.Forms.Padding(2);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(72, 20);
@@ -504,122 +419,37 @@
             // ck_ysfx_xsmk
             // 
             this.ck_ysfx_xsmk.AutoSize = true;
-            this.ck_ysfx_xsmk.Location = new System.Drawing.Point(228, 43);
+            this.ck_ysfx_xsmk.Location = new System.Drawing.Point(105, 29);
             this.ck_ysfx_xsmk.Margin = new System.Windows.Forms.Padding(2);
             this.ck_ysfx_xsmk.Name = "ck_ysfx_xsmk";
-            this.ck_ysfx_xsmk.Size = new System.Drawing.Size(15, 14);
+            this.ck_ysfx_xsmk.Size = new System.Drawing.Size(72, 16);
             this.ck_ysfx_xsmk.TabIndex = 53;
+            this.ck_ysfx_xsmk.Text = "元素分析";
             this.ck_ysfx_xsmk.UseVisualStyleBackColor = true;
             // 
-            // label25
-            // 
-            this.label25.AutoSize = true;
-            this.label25.Location = new System.Drawing.Point(9, 45);
-            this.label25.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(65, 12);
-            this.label25.TabIndex = 52;
-            this.label25.Text = "显示该模块";
-            // 
-            // groupBox7
-            // 
-            this.groupBox7.Controls.Add(this.lbv_syxt_mblb);
-            this.groupBox7.Controls.Add(this.ck_syxt_xsmk);
-            this.groupBox7.Controls.Add(this.label40);
-            this.groupBox7.Controls.Add(this.cb_syxt_ljb);
-            this.groupBox7.Controls.Add(this.label38);
-            this.groupBox7.Controls.Add(this.label33);
-            this.groupBox7.Location = new System.Drawing.Point(547, 158);
-            this.groupBox7.Margin = new System.Windows.Forms.Padding(2);
-            this.groupBox7.Name = "groupBox7";
-            this.groupBox7.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox7.Size = new System.Drawing.Size(263, 494);
-            this.groupBox7.TabIndex = 7;
-            this.groupBox7.TabStop = false;
-            this.groupBox7.Text = "三元相图";
-            // 
             // lbv_syxt_mblb
             // 
             this.lbv_syxt_mblb.CheckBoxes = true;
             this.lbv_syxt_mblb.FullRowSelect = true;
             this.lbv_syxt_mblb.HideSelection = false;
-            this.lbv_syxt_mblb.Location = new System.Drawing.Point(6, 135);
+            this.lbv_syxt_mblb.Location = new System.Drawing.Point(15, 203);
             this.lbv_syxt_mblb.Margin = new System.Windows.Forms.Padding(2);
             this.lbv_syxt_mblb.Name = "lbv_syxt_mblb";
-            this.lbv_syxt_mblb.Size = new System.Drawing.Size(249, 346);
+            this.lbv_syxt_mblb.Size = new System.Drawing.Size(236, 141);
             this.lbv_syxt_mblb.TabIndex = 55;
             this.lbv_syxt_mblb.UseCompatibleStateImageBehavior = false;
             this.lbv_syxt_mblb.View = System.Windows.Forms.View.List;
             // 
-            // ck_syxt_xsmk
-            // 
-            this.ck_syxt_xsmk.AutoSize = true;
-            this.ck_syxt_xsmk.Location = new System.Drawing.Point(224, 21);
-            this.ck_syxt_xsmk.Margin = new System.Windows.Forms.Padding(2);
-            this.ck_syxt_xsmk.Name = "ck_syxt_xsmk";
-            this.ck_syxt_xsmk.Size = new System.Drawing.Size(15, 14);
-            this.ck_syxt_xsmk.TabIndex = 53;
-            this.ck_syxt_xsmk.UseVisualStyleBackColor = true;
-            // 
-            // label40
-            // 
-            this.label40.AutoSize = true;
-            this.label40.Location = new System.Drawing.Point(4, 23);
-            this.label40.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label40.Name = "label40";
-            this.label40.Size = new System.Drawing.Size(65, 12);
-            this.label40.TabIndex = 52;
-            this.label40.Text = "显示该模块";
-            // 
-            // cb_syxt_ljb
-            // 
-            this.cb_syxt_ljb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_syxt_ljb.FormattingEnabled = true;
-            this.cb_syxt_ljb.Location = new System.Drawing.Point(14, 69);
-            this.cb_syxt_ljb.Margin = new System.Windows.Forms.Padding(2);
-            this.cb_syxt_ljb.Name = "cb_syxt_ljb";
-            this.cb_syxt_ljb.Size = new System.Drawing.Size(214, 20);
-            this.cb_syxt_ljb.TabIndex = 42;
-            // 
-            // label38
-            // 
-            this.label38.AutoSize = true;
-            this.label38.Location = new System.Drawing.Point(12, 45);
-            this.label38.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label38.Name = "label38";
-            this.label38.Size = new System.Drawing.Size(65, 12);
-            this.label38.TabIndex = 41;
-            this.label38.Text = "粒级表信息";
-            // 
             // label33
             // 
             this.label33.AutoSize = true;
-            this.label33.Location = new System.Drawing.Point(12, 112);
+            this.label33.Location = new System.Drawing.Point(13, 189);
             this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label33.Name = "label33";
             this.label33.Size = new System.Drawing.Size(101, 12);
             this.label33.TabIndex = 41;
             this.label33.Text = "三元相图模板列表";
             // 
-            // groupBox8
-            // 
-            this.groupBox8.Controls.Add(this.numericMin);
-            this.groupBox8.Controls.Add(this.label112121);
-            this.groupBox8.Controls.Add(this.ck_kllb_fjzt);
-            this.groupBox8.Controls.Add(this.label111);
-            this.groupBox8.Controls.Add(this.groupBox_zt);
-            this.groupBox8.Controls.Add(this.groupBox_px);
-            this.groupBox8.Controls.Add(this.ck_kllb_xsmk);
-            this.groupBox8.Controls.Add(this.label34);
-            this.groupBox8.Location = new System.Drawing.Point(815, 157);
-            this.groupBox8.Margin = new System.Windows.Forms.Padding(2);
-            this.groupBox8.Name = "groupBox8";
-            this.groupBox8.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox8.Size = new System.Drawing.Size(263, 409);
-            this.groupBox8.TabIndex = 6;
-            this.groupBox8.TabStop = false;
-            this.groupBox8.Text = "颗粒列表";
-            // 
             // numericMin
             // 
             this.numericMin.Increment = new decimal(new int[] {
@@ -627,7 +457,7 @@
             0,
             0,
             0});
-            this.numericMin.Location = new System.Drawing.Point(167, 68);
+            this.numericMin.Location = new System.Drawing.Point(387, 92);
             this.numericMin.Maximum = new decimal(new int[] {
             99999,
             0,
@@ -645,29 +475,22 @@
             // label112121
             // 
             this.label112121.AutoSize = true;
-            this.label112121.Location = new System.Drawing.Point(7, 77);
+            this.label112121.Location = new System.Drawing.Point(265, 94);
             this.label112121.Name = "label112121";
-            this.label112121.Size = new System.Drawing.Size(53, 12);
+            this.label112121.Size = new System.Drawing.Size(77, 12);
             this.label112121.TabIndex = 64;
-            this.label112121.Text = "显示数量";
+            this.label112121.Text = "颗粒显示数量";
             // 
             // ck_kllb_fjzt
             // 
             this.ck_kllb_fjzt.AutoSize = true;
-            this.ck_kllb_fjzt.Location = new System.Drawing.Point(224, 47);
+            this.ck_kllb_fjzt.Location = new System.Drawing.Point(461, 29);
             this.ck_kllb_fjzt.Name = "ck_kllb_fjzt";
-            this.ck_kllb_fjzt.Size = new System.Drawing.Size(15, 14);
+            this.ck_kllb_fjzt.Size = new System.Drawing.Size(96, 16);
             this.ck_kllb_fjzt.TabIndex = 57;
+            this.ck_kllb_fjzt.Text = "颗粒附加帧图";
             this.ck_kllb_fjzt.UseVisualStyleBackColor = true;
-            // 
-            // label111
-            // 
-            this.label111.AutoSize = true;
-            this.label111.Location = new System.Drawing.Point(7, 51);
-            this.label111.Name = "label111";
-            this.label111.Size = new System.Drawing.Size(53, 12);
-            this.label111.TabIndex = 56;
-            this.label111.Text = "附加帧图";
+            this.ck_kllb_fjzt.CheckedChanged += new System.EventHandler(this.ck_kllb_fjzt_CheckedChanged);
             // 
             // groupBox_zt
             // 
@@ -675,9 +498,9 @@
             this.groupBox_zt.Controls.Add(this.cb_FrameChart_p2);
             this.groupBox_zt.Controls.Add(this.ParticleList_4);
             this.groupBox_zt.Controls.Add(this.cb_FrameChart_p1);
-            this.groupBox_zt.Location = new System.Drawing.Point(8, 276);
+            this.groupBox_zt.Location = new System.Drawing.Point(267, 203);
             this.groupBox_zt.Name = "groupBox_zt";
-            this.groupBox_zt.Size = new System.Drawing.Size(249, 125);
+            this.groupBox_zt.Size = new System.Drawing.Size(290, 67);
             this.groupBox_zt.TabIndex = 55;
             this.groupBox_zt.TabStop = false;
             this.groupBox_zt.Text = "帧图表";
@@ -685,7 +508,7 @@
             // ParticleList_5
             // 
             this.ParticleList_5.AutoSize = true;
-            this.ParticleList_5.Location = new System.Drawing.Point(17, 70);
+            this.ParticleList_5.Location = new System.Drawing.Point(88, 23);
             this.ParticleList_5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ParticleList_5.Name = "ParticleList_5";
             this.ParticleList_5.Size = new System.Drawing.Size(35, 12);
@@ -696,16 +519,16 @@
             // 
             this.cb_FrameChart_p2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_FrameChart_p2.FormattingEnabled = true;
-            this.cb_FrameChart_p2.Location = new System.Drawing.Point(17, 84);
+            this.cb_FrameChart_p2.Location = new System.Drawing.Point(88, 37);
             this.cb_FrameChart_p2.Margin = new System.Windows.Forms.Padding(2);
             this.cb_FrameChart_p2.Name = "cb_FrameChart_p2";
-            this.cb_FrameChart_p2.Size = new System.Drawing.Size(216, 20);
+            this.cb_FrameChart_p2.Size = new System.Drawing.Size(85, 20);
             this.cb_FrameChart_p2.TabIndex = 56;
             // 
             // ParticleList_4
             // 
             this.ParticleList_4.AutoSize = true;
-            this.ParticleList_4.Location = new System.Drawing.Point(17, 23);
+            this.ParticleList_4.Location = new System.Drawing.Point(13, 23);
             this.ParticleList_4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ParticleList_4.Name = "ParticleList_4";
             this.ParticleList_4.Size = new System.Drawing.Size(35, 12);
@@ -716,10 +539,10 @@
             // 
             this.cb_FrameChart_p1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_FrameChart_p1.FormattingEnabled = true;
-            this.cb_FrameChart_p1.Location = new System.Drawing.Point(17, 37);
+            this.cb_FrameChart_p1.Location = new System.Drawing.Point(13, 37);
             this.cb_FrameChart_p1.Margin = new System.Windows.Forms.Padding(2);
             this.cb_FrameChart_p1.Name = "cb_FrameChart_p1";
-            this.cb_FrameChart_p1.Size = new System.Drawing.Size(216, 20);
+            this.cb_FrameChart_p1.Size = new System.Drawing.Size(85, 20);
             this.cb_FrameChart_p1.TabIndex = 54;
             // 
             // groupBox_px
@@ -730,9 +553,9 @@
             this.groupBox_px.Controls.Add(this.ParticleList_2);
             this.groupBox_px.Controls.Add(this.ParticleList_1);
             this.groupBox_px.Controls.Add(this.comboBox_p1);
-            this.groupBox_px.Location = new System.Drawing.Point(8, 104);
+            this.groupBox_px.Location = new System.Drawing.Point(267, 127);
             this.groupBox_px.Name = "groupBox_px";
-            this.groupBox_px.Size = new System.Drawing.Size(249, 166);
+            this.groupBox_px.Size = new System.Drawing.Size(290, 70);
             this.groupBox_px.TabIndex = 54;
             this.groupBox_px.TabStop = false;
             this.groupBox_px.Text = "最大排序表";
@@ -741,16 +564,16 @@
             // 
             this.comboBox_p3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox_p3.FormattingEnabled = true;
-            this.comboBox_p3.Location = new System.Drawing.Point(13, 128);
+            this.comboBox_p3.Location = new System.Drawing.Point(200, 40);
             this.comboBox_p3.Margin = new System.Windows.Forms.Padding(2);
             this.comboBox_p3.Name = "comboBox_p3";
-            this.comboBox_p3.Size = new System.Drawing.Size(216, 20);
+            this.comboBox_p3.Size = new System.Drawing.Size(85, 20);
             this.comboBox_p3.TabIndex = 57;
             // 
             // ParticleList_3
             // 
             this.ParticleList_3.AutoSize = true;
-            this.ParticleList_3.Location = new System.Drawing.Point(15, 114);
+            this.ParticleList_3.Location = new System.Drawing.Point(198, 25);
             this.ParticleList_3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ParticleList_3.Name = "ParticleList_3";
             this.ParticleList_3.Size = new System.Drawing.Size(35, 12);
@@ -761,16 +584,16 @@
             // 
             this.comboBox_p2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox_p2.FormattingEnabled = true;
-            this.comboBox_p2.Location = new System.Drawing.Point(13, 86);
+            this.comboBox_p2.Location = new System.Drawing.Point(105, 40);
             this.comboBox_p2.Margin = new System.Windows.Forms.Padding(2);
             this.comboBox_p2.Name = "comboBox_p2";
-            this.comboBox_p2.Size = new System.Drawing.Size(216, 20);
+            this.comboBox_p2.Size = new System.Drawing.Size(85, 20);
             this.comboBox_p2.TabIndex = 55;
             // 
             // ParticleList_2
             // 
             this.ParticleList_2.AutoSize = true;
-            this.ParticleList_2.Location = new System.Drawing.Point(11, 72);
+            this.ParticleList_2.Location = new System.Drawing.Point(103, 25);
             this.ParticleList_2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ParticleList_2.Name = "ParticleList_2";
             this.ParticleList_2.Size = new System.Drawing.Size(35, 12);
@@ -780,7 +603,7 @@
             // ParticleList_1
             // 
             this.ParticleList_1.AutoSize = true;
-            this.ParticleList_1.Location = new System.Drawing.Point(13, 26);
+            this.ParticleList_1.Location = new System.Drawing.Point(5, 25);
             this.ParticleList_1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ParticleList_1.Name = "ParticleList_1";
             this.ParticleList_1.Size = new System.Drawing.Size(35, 12);
@@ -791,31 +614,23 @@
             // 
             this.comboBox_p1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox_p1.FormattingEnabled = true;
-            this.comboBox_p1.Location = new System.Drawing.Point(13, 40);
+            this.comboBox_p1.Location = new System.Drawing.Point(5, 40);
             this.comboBox_p1.Margin = new System.Windows.Forms.Padding(2);
             this.comboBox_p1.Name = "comboBox_p1";
-            this.comboBox_p1.Size = new System.Drawing.Size(216, 20);
+            this.comboBox_p1.Size = new System.Drawing.Size(85, 20);
             this.comboBox_p1.TabIndex = 43;
             // 
             // ck_kllb_xsmk
             // 
             this.ck_kllb_xsmk.AutoSize = true;
-            this.ck_kllb_xsmk.Location = new System.Drawing.Point(224, 23);
+            this.ck_kllb_xsmk.Location = new System.Drawing.Point(372, 29);
             this.ck_kllb_xsmk.Margin = new System.Windows.Forms.Padding(2);
             this.ck_kllb_xsmk.Name = "ck_kllb_xsmk";
-            this.ck_kllb_xsmk.Size = new System.Drawing.Size(15, 14);
+            this.ck_kllb_xsmk.Size = new System.Drawing.Size(72, 16);
             this.ck_kllb_xsmk.TabIndex = 53;
+            this.ck_kllb_xsmk.Text = "颗粒列表";
             this.ck_kllb_xsmk.UseVisualStyleBackColor = true;
-            // 
-            // label34
-            // 
-            this.label34.AutoSize = true;
-            this.label34.Location = new System.Drawing.Point(4, 25);
-            this.label34.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label34.Name = "label34";
-            this.label34.Size = new System.Drawing.Size(65, 12);
-            this.label34.TabIndex = 52;
-            this.label34.Text = "显示该模块";
+            this.ck_kllb_xsmk.CheckedChanged += new System.EventHandler(this.ck_kllb_xsmk_CheckedChanged);
             // 
             // label_delete_Class
             // 
@@ -866,59 +681,20 @@
             this.button6.Location = new System.Drawing.Point(149, 57);
             this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
-            this.button6.Size = new System.Drawing.Size(71, 22);
+            this.button6.Size = new System.Drawing.Size(55, 22);
             this.button6.TabIndex = 72;
             this.button6.Text = "保存";
             this.button6.UseVisualStyleBackColor = true;
             this.button6.Click += new System.EventHandler(this.button6_Click);
             // 
-            // groupBox211
-            // 
-            this.groupBox211.Controls.Add(this.ck_jzwzb_chart);
-            this.groupBox211.Controls.Add(this.label1311);
-            this.groupBox211.Controls.Add(this.label1211);
-            this.groupBox211.Controls.Add(this.ck_jzwzb_surface);
-            this.groupBox211.Location = new System.Drawing.Point(815, 571);
-            this.groupBox211.Name = "groupBox211";
-            this.groupBox211.Size = new System.Drawing.Size(263, 81);
-            this.groupBox211.TabIndex = 8;
-            this.groupBox211.TabStop = false;
-            this.groupBox211.Text = "夹杂物占比表";
-            // 
-            // ck_jzwzb_chart
-            // 
-            this.ck_jzwzb_chart.AutoSize = true;
-            this.ck_jzwzb_chart.Location = new System.Drawing.Point(229, 53);
-            this.ck_jzwzb_chart.Name = "ck_jzwzb_chart";
-            this.ck_jzwzb_chart.Size = new System.Drawing.Size(15, 14);
-            this.ck_jzwzb_chart.TabIndex = 3;
-            this.ck_jzwzb_chart.UseVisualStyleBackColor = true;
-            // 
-            // label1311
-            // 
-            this.label1311.AutoSize = true;
-            this.label1311.Location = new System.Drawing.Point(19, 53);
-            this.label1311.Name = "label1311";
-            this.label1311.Size = new System.Drawing.Size(77, 12);
-            this.label1311.TabIndex = 2;
-            this.label1311.Text = "显示附加图形";
-            // 
-            // label1211
-            // 
-            this.label1211.AutoSize = true;
-            this.label1211.Location = new System.Drawing.Point(19, 28);
-            this.label1211.Name = "label1211";
-            this.label1211.Size = new System.Drawing.Size(65, 12);
-            this.label1211.TabIndex = 1;
-            this.label1211.Text = "显示该模块";
-            // 
             // ck_jzwzb_surface
             // 
             this.ck_jzwzb_surface.AutoSize = true;
-            this.ck_jzwzb_surface.Location = new System.Drawing.Point(229, 26);
+            this.ck_jzwzb_surface.Location = new System.Drawing.Point(271, 29);
             this.ck_jzwzb_surface.Name = "ck_jzwzb_surface";
-            this.ck_jzwzb_surface.Size = new System.Drawing.Size(15, 14);
+            this.ck_jzwzb_surface.Size = new System.Drawing.Size(84, 16);
             this.ck_jzwzb_surface.TabIndex = 0;
+            this.ck_jzwzb_surface.Text = "夹杂物占比";
             this.ck_jzwzb_surface.UseVisualStyleBackColor = true;
             this.ck_jzwzb_surface.CheckedChanged += new System.EventHandler(this.ck_jzwzb_surface_CheckedChanged);
             // 
@@ -971,16 +747,16 @@
             this.groupBox2.Controls.Add(this.label_delete_Class);
             this.groupBox2.Controls.Add(this.delete_Class);
             this.groupBox2.Controls.Add(this.label11111);
-            this.groupBox2.Location = new System.Drawing.Point(300, 13);
+            this.groupBox2.Location = new System.Drawing.Point(280, 13);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(778, 140);
+            this.groupBox2.Size = new System.Drawing.Size(569, 140);
             this.groupBox2.TabIndex = 77;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "去除信息";
             // 
             // textBox_cypxss
             // 
-            this.textBox_cypxss.Location = new System.Drawing.Point(234, 106);
+            this.textBox_cypxss.Location = new System.Drawing.Point(287, 106);
             this.textBox_cypxss.Name = "textBox_cypxss";
             this.textBox_cypxss.Size = new System.Drawing.Size(181, 21);
             this.textBox_cypxss.TabIndex = 67;
@@ -988,7 +764,7 @@
             // label_cypxss
             // 
             this.label_cypxss.AutoSize = true;
-            this.label_cypxss.Location = new System.Drawing.Point(232, 85);
+            this.label_cypxss.Location = new System.Drawing.Point(289, 85);
             this.label_cypxss.Name = "label_cypxss";
             this.label_cypxss.Size = new System.Drawing.Size(77, 12);
             this.label_cypxss.TabIndex = 66;
@@ -1010,21 +786,59 @@
             this.label_zypxss.TabIndex = 64;
             this.label_zypxss.Text = "主要排序显示";
             // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.groupBox_zt);
+            this.groupBox3.Controls.Add(this.numericMin);
+            this.groupBox3.Controls.Add(this.groupBox_px);
+            this.groupBox3.Controls.Add(this.label112121);
+            this.groupBox3.Controls.Add(this.lbv_syxt_mblb);
+            this.groupBox3.Controls.Add(this.label33);
+            this.groupBox3.Controls.Add(this.ck_kllb_fjzt);
+            this.groupBox3.Controls.Add(this.button3);
+            this.groupBox3.Controls.Add(this.comboBox_PeriodicTable);
+            this.groupBox3.Controls.Add(this.ck_syxt_xsmk);
+            this.groupBox3.Controls.Add(this.ck_jzwzb_surface);
+            this.groupBox3.Controls.Add(this.tb_ysfx_xsys);
+            this.groupBox3.Controls.Add(this.checkBox2);
+            this.groupBox3.Controls.Add(this.ck_kllb_xsmk);
+            this.groupBox3.Controls.Add(this.button4);
+            this.groupBox3.Controls.Add(this.checkBox1);
+            this.groupBox3.Controls.Add(this.ck_ysfx_xsmk);
+            this.groupBox3.Controls.Add(this.ck_klcc_xsmk);
+            this.groupBox3.Controls.Add(this.cb_klcc_jsfs);
+            this.groupBox3.Controls.Add(this.cb_klcc_ljb);
+            this.groupBox3.Controls.Add(this.label14);
+            this.groupBox3.Controls.Add(this.label15);
+            this.groupBox3.Location = new System.Drawing.Point(280, 157);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(569, 443);
+            this.groupBox3.TabIndex = 78;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "颗粒筛选";
+            // 
+            // ck_syxt_xsmk
+            // 
+            this.ck_syxt_xsmk.AutoSize = true;
+            this.ck_syxt_xsmk.Location = new System.Drawing.Point(194, 29);
+            this.ck_syxt_xsmk.Margin = new System.Windows.Forms.Padding(2);
+            this.ck_syxt_xsmk.Name = "ck_syxt_xsmk";
+            this.ck_syxt_xsmk.Size = new System.Drawing.Size(60, 16);
+            this.ck_syxt_xsmk.TabIndex = 58;
+            this.ck_syxt_xsmk.Text = "三元图";
+            this.ck_syxt_xsmk.UseVisualStyleBackColor = true;
+            // 
             // OTSReport_Template_INCA
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1093, 654);
+            this.ClientSize = new System.Drawing.Size(861, 610);
+            this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.groupBox211);
             this.Controls.Add(this.cb_ParticleRange);
-            this.Controls.Add(this.groupBox7);
-            this.Controls.Add(this.groupBox8);
             this.Controls.Add(this.button6);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.label39);
-            this.Controls.Add(this.groupBox6);
-            this.Controls.Add(this.groupBox4);
             this.Controls.Add(this.groupBox9);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.button2);
@@ -1035,30 +849,22 @@
             this.Name = "OTSReport_Template_INCA";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "报告预览信息设置";
+            this.Text = "模板设置";
             this.Load += new System.EventHandler(this.OTSReport_TemplateDesignerRM_Load);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
-            this.groupBox4.ResumeLayout(false);
-            this.groupBox4.PerformLayout();
-            this.groupBox6.ResumeLayout(false);
-            this.groupBox6.PerformLayout();
-            this.groupBox7.ResumeLayout(false);
-            this.groupBox7.PerformLayout();
-            this.groupBox8.ResumeLayout(false);
-            this.groupBox8.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).EndInit();
             this.groupBox_zt.ResumeLayout(false);
             this.groupBox_zt.PerformLayout();
             this.groupBox_px.ResumeLayout(false);
             this.groupBox_px.PerformLayout();
-            this.groupBox211.ResumeLayout(false);
-            this.groupBox211.PerformLayout();
             this.groupBox9.ResumeLayout(false);
             this.groupBox9.PerformLayout();
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -1081,27 +887,16 @@
         private System.Windows.Forms.TextBox tb_yjwb;
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.GroupBox groupBox4;
         private System.Windows.Forms.CheckBox ck_klcc_xsmk;
-        private System.Windows.Forms.Label label17;
         private System.Windows.Forms.ComboBox cb_klcc_ljb;
         private System.Windows.Forms.ComboBox cb_klcc_jsfs;
         private System.Windows.Forms.Label label15;
         private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.GroupBox groupBox6;
         private System.Windows.Forms.CheckBox ck_ysfx_xsmk;
-        private System.Windows.Forms.Label label25;
-        private System.Windows.Forms.GroupBox groupBox7;
-        private System.Windows.Forms.CheckBox ck_syxt_xsmk;
-        private System.Windows.Forms.Label label40;
-        private System.Windows.Forms.GroupBox groupBox8;
         private System.Windows.Forms.CheckBox ck_kllb_xsmk;
-        private System.Windows.Forms.Label label34;
         private System.Windows.Forms.CheckBox ck_ym;
         private System.Windows.Forms.Label label33;
         private System.Windows.Forms.ListView lbv_syxt_mblb;
-        private System.Windows.Forms.ComboBox cb_syxt_ljb;
-        private System.Windows.Forms.Label label38;
         private System.Windows.Forms.Button button6;
         private System.Windows.Forms.GroupBox groupBox9;
         private System.Windows.Forms.Label label39;
@@ -1123,11 +918,6 @@
         private System.Windows.Forms.ComboBox comboBox_p1;
         private System.Windows.Forms.ComboBox cb_ParticleRange;
         private System.Windows.Forms.CheckBox ck_kllb_fjzt;
-        private System.Windows.Forms.Label label111;
-        private System.Windows.Forms.GroupBox groupBox211;
-        private System.Windows.Forms.CheckBox ck_jzwzb_chart;
-        private System.Windows.Forms.Label label1311;
-        private System.Windows.Forms.Label label1211;
         private System.Windows.Forms.CheckBox ck_jzwzb_surface;
         private System.Windows.Forms.Button button5;
         private System.Windows.Forms.TextBox tb_RemoveElements;
@@ -1138,8 +928,6 @@
         private System.Windows.Forms.NumericUpDown numericMin;
         private System.Windows.Forms.CheckBox checkBox2;
         private System.Windows.Forms.CheckBox checkBox1;
-        private System.Windows.Forms.Label label11zxc;
-        private System.Windows.Forms.Label label1121ad;
         private System.Windows.Forms.PictureBox pictureBox7;
         private System.Windows.Forms.Label label8312;
         private System.Windows.Forms.Button button1217;
@@ -1148,5 +936,7 @@
         private System.Windows.Forms.Label label_cypxss;
         private System.Windows.Forms.TextBox textBox_zypxss;
         private System.Windows.Forms.Label label_zypxss;
+        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.CheckBox ck_syxt_xsmk;
     }
 }

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_INCA.cs

@@ -58,7 +58,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
            
       
             #region 三元相图
-             BindComboBox(cb_syxt_ljb, OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE);
+             BindComboBox(cb_klcc_ljb, OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE);
         
             //三元相图模板s
             ComboBox lscb = new ComboBox();
@@ -400,8 +400,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_ysfx_xsys = tb_ysfx_xsys.Text;//显示元素
             //三元相图
             m_OTSReport_Export.m_mbszclass.M_SYXT.b_ck_syxt_xsmk = ck_syxt_xsmk.Checked;
-            m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_ljb = cb_syxt_ljb.Text;//粒级表
-            m_OTSReport_Export.m_mbszclass.M_SYXT.index_cb_syxt_ljb = cb_syxt_ljb.SelectedIndex;
+            m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_ljb = cb_klcc_ljb.Text;//粒级表
+            m_OTSReport_Export.m_mbszclass.M_SYXT.index_cb_syxt_ljb = cb_klcc_ljb.SelectedIndex;
             //获取勾选的项
             m_OTSReport_Export.m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Clear();
             m_OTSReport_Export.m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Clear();
@@ -432,7 +432,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_chartSort_p2 = cb_FrameChart_p2.SelectedIndex;
             //夹杂物占比
             m_OTSReport_Export.m_mbszclass.M_JZWZB.b_ck_surface = ck_jzwzb_surface.Checked;//夹杂物占比表
-            m_OTSReport_Export.m_mbszclass.M_JZWZB.b_ck_chart = ck_jzwzb_chart.Checked;//夹杂物占比图
+            //m_OTSReport_Export.m_mbszclass.M_JZWZB.b_ck_chart = ck_jzwzb_chart.Checked;//夹杂物占比图
             //去除信息
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_kllb_qcys = tb_RemoveElements.Text;//去除不要的物质元素
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_kllb_DeleteClass = delete_Class.Text;//去除不要的物质分类
@@ -468,8 +468,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             tb_ysfx_xsys.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_ysfx_xsys;//显示元素
             //三元相图
             ck_syxt_xsmk.Checked = m_OTSReport_Export.m_mbszclass.M_SYXT.b_ck_syxt_xsmk;
-            cb_syxt_ljb.Text = m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_ljb;
-            cb_syxt_ljb.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_SYXT.index_cb_syxt_ljb;//粒级表
+            cb_klcc_ljb.Text = m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_ljb;
+            cb_klcc_ljb.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_SYXT.index_cb_syxt_ljb;//粒级表
             //获取勾选的项
             for (int i = 0; i < lbv_syxt_mblb.Items.Count; i++)
             {
@@ -498,7 +498,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             cb_klcc_ljb.Text = m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_klcc_ljb;
             //夹杂物占比
             ck_jzwzb_surface.Checked = m_OTSReport_Export.m_mbszclass.M_JZWZB.b_ck_surface;//夹杂物占比表
-            ck_jzwzb_chart.Checked = m_OTSReport_Export.m_mbszclass.M_JZWZB.b_ck_chart;//夹杂物占比图
+            //ck_jzwzb_chart.Checked = m_OTSReport_Export.m_mbszclass.M_JZWZB.b_ck_chart;//夹杂物占比图
             numericMin.Text = m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_int_kllb_number.ToString();
             LoadingIcon();
         }
@@ -688,10 +688,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
         private void ck_jzwzb_surface_CheckedChanged(object sender, EventArgs e)
         {
-            if (ck_jzwzb_surface.Checked==false)
-            {
-                ck_jzwzb_chart.Checked = false;
-            }
+           
         }
 
         private void button5_Click(object sender, EventArgs e)
@@ -732,5 +729,15 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 }
             }
         }
+
+        private void ck_kllb_fjzt_CheckedChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void ck_kllb_xsmk_CheckedChanged(object sender, EventArgs e)
+        {
+
+        }
     }
 }

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

@@ -46,6 +46,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTable_kllb_surface = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow16 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTable_kllb = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrLabel_inca_pic_subdivision = new DevExpress.XtraReports.UI.XRLabel();
             this.xrChart_incaSubdivision = new DevExpress.XtraReports.UI.XRChart();
             this.xrLabel_inca_pic_class = new DevExpress.XtraReports.UI.XRLabel();
@@ -91,19 +96,14 @@ 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.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTable_kllb = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow16 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTable_kllb_surface = new DevExpress.XtraReports.UI.XRTable();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable_kllb_surface)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_incaSubdivision)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_incaClass)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeCalss)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable_kllb_surface)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // TopMargin
@@ -302,6 +302,57 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             this.xrTableCell31.Weight = 2D;
             // 
+            // xrTable_kllb_surface
+            // 
+            this.xrTable_kllb_surface.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable_kllb_surface.BorderWidth = 0.5F;
+            this.xrTable_kllb_surface.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3868.858F);
+            this.xrTable_kllb_surface.Name = "xrTable_kllb_surface";
+            this.xrTable_kllb_surface.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
+            this.xrTable_kllb_surface.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow16,
+            this.xrTableRow17});
+            this.xrTable_kllb_surface.SizeF = new System.Drawing.SizeF(688F, 50F);
+            this.xrTable_kllb_surface.StylePriority.UseBorders = false;
+            this.xrTable_kllb_surface.StylePriority.UseBorderWidth = false;
+            this.xrTable_kllb_surface.Visible = false;
+            // 
+            // xrTableRow16
+            // 
+            this.xrTableRow16.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTable_kllb});
+            this.xrTableRow16.Name = "xrTableRow16";
+            this.xrTableRow16.Weight = 1D;
+            // 
+            // xrTable_kllb
+            // 
+            this.xrTable_kllb.BackColor = System.Drawing.Color.DarkGray;
+            this.xrTable_kllb.Font = new System.Drawing.Font("Arial", 9.75F);
+            this.xrTable_kllb.Multiline = true;
+            this.xrTable_kllb.Name = "xrTable_kllb";
+            this.xrTable_kllb.StylePriority.UseBackColor = false;
+            this.xrTable_kllb.StylePriority.UseFont = false;
+            this.xrTable_kllb.StylePriority.UseTextAlignment = false;
+            this.xrTable_kllb.Text = "颗粒列表";
+            this.xrTable_kllb.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTable_kllb.Weight = 1D;
+            // 
+            // xrTableRow17
+            // 
+            this.xrTableRow17.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell2});
+            this.xrTableRow17.Name = "xrTableRow17";
+            this.xrTableRow17.Weight = 1D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Multiline = true;
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Text = "\r\n";
+            this.xrTableCell2.Weight = 1D;
+            // 
             // xrLabel_inca_pic_subdivision
             // 
             this.xrLabel_inca_pic_subdivision.BackColor = System.Drawing.Color.DarkGray;
@@ -782,57 +833,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_zbt.Text = "dev_zbt";
             this.dev_zbt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
-            // xrTableCell2
-            // 
-            this.xrTableCell2.Multiline = true;
-            this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Text = "\r\n";
-            this.xrTableCell2.Weight = 1D;
-            // 
-            // xrTableRow17
-            // 
-            this.xrTableRow17.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell2});
-            this.xrTableRow17.Name = "xrTableRow17";
-            this.xrTableRow17.Weight = 1D;
-            // 
-            // xrTable_kllb
-            // 
-            this.xrTable_kllb.BackColor = System.Drawing.Color.DarkGray;
-            this.xrTable_kllb.Font = new System.Drawing.Font("Arial", 9.75F);
-            this.xrTable_kllb.Multiline = true;
-            this.xrTable_kllb.Name = "xrTable_kllb";
-            this.xrTable_kllb.StylePriority.UseBackColor = false;
-            this.xrTable_kllb.StylePriority.UseFont = false;
-            this.xrTable_kllb.StylePriority.UseTextAlignment = false;
-            this.xrTable_kllb.Text = "颗粒列表";
-            this.xrTable_kllb.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTable_kllb.Weight = 1D;
-            // 
-            // xrTableRow16
-            // 
-            this.xrTableRow16.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTable_kllb});
-            this.xrTableRow16.Name = "xrTableRow16";
-            this.xrTableRow16.Weight = 1D;
-            // 
-            // xrTable_kllb_surface
-            // 
-            this.xrTable_kllb_surface.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTable_kllb_surface.BorderWidth = 0.5F;
-            this.xrTable_kllb_surface.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3868.858F);
-            this.xrTable_kllb_surface.Name = "xrTable_kllb_surface";
-            this.xrTable_kllb_surface.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
-            this.xrTable_kllb_surface.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow16,
-            this.xrTableRow17});
-            this.xrTable_kllb_surface.SizeF = new System.Drawing.SizeF(688F, 50F);
-            this.xrTable_kllb_surface.StylePriority.UseBorders = false;
-            this.xrTable_kllb_surface.StylePriority.UseBorderWidth = false;
-            this.xrTable_kllb_surface.Visible = false;
-            // 
             // OTS_DEVReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -845,11 +845,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             ((System.ComponentModel.ISupportInitialize)(this.xrChart1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable_kllb_surface)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_incaSubdivision)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_incaClass)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeCalss)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable_kllb_surface)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }

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

@@ -555,6 +555,23 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             #endregion
             #endregion
         }
+        private XRChart ParticleSpectrogramControl(DataTable dt)
+        {
+            XRChart xRChart = new XRChart();
+            // 添加数据系列
+            Series series = new Series("", ViewType.Line);
+            series.ArgumentDataMember = "XName"; // X轴数据
+            series.ValueDataMembers.AddRange(new string[] { "data", "Serial" }); // Y轴数据
+            // 绑定数据源
+            series.DataSource = dt; // 获取数据源的方法
+            xrChart1.Legend.Visibility = DevExpress.Utils.DefaultBoolean.False;
+            series.LabelsVisibility = DevExpress.Utils.DefaultBoolean.False;
+            LineSeriesView lineView = (LineSeriesView)series.View;
+            lineView.LineMarkerOptions.Size = 1;
+            xRChart.Series.Add(series);
+            xRChart.SizeF = new SizeF(560f, 115f);
+            return xRChart;
+        }
 
         private void HistogramChart(ParticleAnalysis particleList)
         {
@@ -1141,7 +1158,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(xrTableCell2, "Selected particles based on：" + TemplateClass.M_KLLBXX.str_cb_kllb_sort_p1.ToString() + "(μm)");
             
             ParticleList particleList = new ParticleList();
-            DataTable dataTable = particleList.Get_dev_kllb_data(TemplateClass, m_otsreport_export,out DataTable data);
+            DataTable dataTable = particleList.Get_dev_kllb_data(TemplateClass, m_otsreport_export,out DataTable data ,out List<DataTable> ElementIcons);
             FrameData = data.Copy();
             for (int i = 0; i < dataTable.Rows.Count; i++)
             {
@@ -1151,7 +1168,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             for (int i = 0; i < dataTable.Rows.Count; i++)
             {
                 XRTable table = add_XRTable();
-                add_kllb(TemplateClass, dataTable, i, table);
+                add_kllb(TemplateClass, dataTable, i, table, ElementIcons[i]);
             }
             NeueStartposition = NeueStartposition + 10;
         }
@@ -2017,7 +2034,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
             return Template;
         }
-        private void add_kllb(c_TemplateClass TemplateClass, DataTable dataTable, int position, XRTable xRTable)
+        private void add_kllb(c_TemplateClass TemplateClass, DataTable dataTable, int position, XRTable xRTable, DataTable ElementIcons)
         {
             XRTable table = new XRTable();
             table = xRTable;
@@ -2057,8 +2074,15 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             xRPicture3.SizeF = new SizeF(117f, 121f);
             xRPicture3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
 
+
+            XRChart xRChart= ParticleSpectrogramControl(ElementIcons);
+
+
             table.Rows[4].Cells[0].Controls.Add(xRPicture3);
             table.Rows[4].Cells[1].Controls.Add(xRPicture2);
+            //table.Rows[4].Cells[1].Controls.Add(xRChart);
+            table.Rows[4].Cells[1].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+
             table.Visible = true;
             table.LocationF = new PointF(0, NeueStartposition);
             table.SendToBack();
@@ -2067,7 +2091,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             table.BorderWidth = 0.5f;
 
             this.Detail.Controls.Add(table);
-
             NeueStartposition = table.SizeF.Height + NeueStartposition;
         }
         #endregion