修改报告摸板设置界面

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

@@ -33,7 +33,7 @@
     <str_cb_klcc_jsfs>ECD</str_cb_klcc_jsfs>
     <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
     <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
-    <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
+    <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
     <str_cb_klcc_ljb>lj.psf</str_cb_klcc_ljb>
   </M_KLFXJG>
   <M_YSFXJG>
@@ -66,7 +66,7 @@
     </list_str_tb_yscf_ysxx>
   </M_YSFXJG>
   <M_SYXT>
-    <b_ck_syxt_xsmk>False</b_ck_syxt_xsmk>
+    <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
     <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>

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

@@ -1,9 +1,10 @@
 <XmlConfig>
   <M_SY>
-    <str_tb_ZBT>OTS Report</str_tb_ZBT>
-    <str_tb_FBT>XX有限公司</str_tb_FBT>
+    <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
+    <str_tb_FBT>宁德时代</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
+    <str_tb_CKBZ>
+    </str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
     <str_bz>
@@ -33,7 +34,7 @@
     <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
   </M_KLFXJG>
   <M_YSFXJG>
-    <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
+    <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
     <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
     <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
     <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
@@ -62,7 +63,7 @@
     </list_str_tb_yscf_ysxx>
   </M_YSFXJG>
   <M_SYXT>
-    <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
+    <b_ck_syxt_xsmk>False</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
     <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
@@ -111,13 +112,11 @@
     <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,Fe</str_kllb_qcys>
-    <str_kllb_DeleteClass>FeO,SiC</str_kllb_DeleteClass>
+    <str_kllb_qcys>C</str_kllb_qcys>
+    <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
-      <YS0>FeO</YS0>
-      <YS1>SiC</YS1>
+      <YS0>misc</YS0>
     </list_str_kllb_DeleteClass>
     <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
@@ -125,7 +124,7 @@
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
   </M_address>
   <M_JZWZB>
-    <b_ck_surface>True</b_ck_surface>
-    <b_ck_chart>True</b_ck_chart>
+    <b_ck_surface>False</b_ck_surface>
+    <b_ck_chart>False</b_ck_chart>
   </M_JZWZB>
 </XmlConfig>

Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="3">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="0">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />
@@ -54,7 +54,7 @@
         <Member HoleName="7" rectDomian="-23000,0,15000,0" shape="0" />
       </Collection>
     </Member>
-    <Member strName="Apero90mm">
+    <Member strName="Apero12_90">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,90000,90000" shape="1:RECTANGLE" />
       <Member RegName="std" PolygonPoint="" rectDomian="6300,0,2,0" shape="0:ROUND" />
       <Collection RegName="Holes">
@@ -78,29 +78,5 @@
         <Member HoleName="18" rectDomian="-14500,-24500,12000,0" shape="0" />
       </Collection>
     </Member>
-    <Member strName="Apero">
-      <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,130000,120000" shape="1:RECTANGLE" />
-      <Member RegName="std" PolygonPoint="" rectDomian="6300,0,2,0" shape="0:ROUND" />
-      <Collection RegName="Holes">
-        <Member HoleName="9" rectDomian="0,0,10000,0" shape="0" />
-        <Member HoleName="2" rectDomian="0,25000,10000,0" shape="0" />
-        <Member HoleName="3" rectDomian="-15000,25000,10000,0" shape="0" />
-        <Member HoleName="1" rectDomian="15000,25500,10000,0" shape="0" />
-        <Member HoleName="4" rectDomian="22000,13000,10000,0" shape="0" />
-        <Member HoleName="5" rectDomian="7000,13000,10000,0" shape="0" />
-        <Member HoleName="6" rectDomian="-7500,13000,10000,0" shape="0" />
-        <Member HoleName="7" rectDomian="-22500,13000,10000,0" shape="0" />
-        <Member HoleName="8" rectDomian="14000,0,10000,0" shape="0" />
-        <Member HoleName="10" rectDomian="-15000,0,10000,0" shape="0" />
-        <Member HoleName="11" rectDomian="-30000,0,10000,0" shape="0" />
-        <Member HoleName="12" rectDomian="22000,-12500,10000,0" shape="0" />
-        <Member HoleName="13" rectDomian="7000,-12500,10000,0" shape="0" />
-        <Member HoleName="14" rectDomian="-7500,-12500,10000,0" shape="0" />
-        <Member HoleName="15" rectDomian="-22500,-12500,10000,0" shape="0" />
-        <Member HoleName="16" rectDomian="14500,-24500,10000,0" shape="0" />
-        <Member HoleName="17" rectDomian="-500,-24500,10000,0" shape="0" />
-        <Member HoleName="18" rectDomian="-14500,-24500,10000,0" shape="0" />
-      </Collection>
-    </Member>
   </Collection>
 </XMLData>

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.cs

@@ -932,27 +932,28 @@ namespace OTSIncAReportApp
             }
             try
             {
-
-                if (m_mbszclass.M_KLFXJG.b_ck_klcc_dfl == true || m_mbszclass.M_KLFXJG.b_ck_klcc_xfl == true)
+                if (m_mbszclass.M_JZWZB.b_ck_surface)
                 {
-                    double d1 = Convert.ToDouble(Serial / total) * 100.0;
-                    Serial++;
-                    richTextBox1.SelectionColor = Color.Black;
-                    richTextBox1.SelectionStart = 0; // 设置选择开始位置 
-                    richTextBox1.AppendText("加载：夹杂物面积比图……\n");
-                    richTextBox1.AppendText("加载：" + Math.Round(d1, length).ToString() + "%\n");
-                    DEVReport.XRPageBreak();
-                    if (m_mbszclass.M_KLFXJG.b_ck_klcc_dfl)
+                    if (m_mbszclass.M_KLFXJG.b_ck_klcc_dfl == true || m_mbszclass.M_KLFXJG.b_ck_klcc_xfl == true)
                     {
-                        DEVReport.set_incaPIC_classify();
+                        double d1 = Convert.ToDouble(Serial / total) * 100.0;
+                        Serial++;
+                        richTextBox1.SelectionColor = Color.Black;
+                        richTextBox1.SelectionStart = 0; // 设置选择开始位置 
+                        richTextBox1.AppendText("加载：夹杂物面积比图……\n");
+                        richTextBox1.AppendText("加载：" + Math.Round(d1, length).ToString() + "%\n");
+                        DEVReport.XRPageBreak();
+                        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();
                     }
-                    if (m_mbszclass.M_KLFXJG.b_ck_klcc_xfl)
-                    {
-                        DEVReport.set_incaPIC_subdivision();
-                    }
-                    richTextBox1.ScrollToCaret();
                 }
-
             }
             catch
             {
@@ -1228,6 +1229,11 @@ namespace OTSIncAReportApp
             m_mbszclass.str_SecondaryPriority = Convert.ToString(xmlutil.Read("whole", "str_SecondaryPriority"));
             m_mbszclass.M_KLFXJG.str_cb_klcc_ljb = Convert.ToString(xmlutil.Read("M_KLFXJG", "str_cb_klcc_ljb"));
             m_mbszclass.M_SYXT.str_cb_syxt_ljb = Convert.ToString(xmlutil.Read("M_SYXT", "str_cb_syxt_ljb"));
+
+
+            m_mbszclass.M_KLFXJG.b_ck_klcc_dfl = Convert.ToBoolean(xmlutil.Read("M_KLFXJG", "b_ck_klcc_dfl"));
+            m_mbszclass.M_KLFXJG.b_ck_klcc_xfl = Convert.ToBoolean(xmlutil.Read("M_KLFXJG", "b_ck_klcc_xfl"));
+           
         }
         #endregion
         private void button7_Click(object sender, EventArgs e)

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

@@ -48,31 +48,22 @@
             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.ck_klcc_xsddt = new System.Windows.Forms.CheckBox();
-            this.label111231 = new System.Windows.Forms.Label();
             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.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();
@@ -86,7 +77,6 @@
             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();
@@ -101,16 +91,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.label2 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
-            this.groupBox4.SuspendLayout();
-            this.groupBox6.SuspendLayout();
-            this.groupBox8.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
             this.groupBox_zt.SuspendLayout();
             this.groupBox_px.SuspendLayout();
             this.groupBox9.SuspendLayout();
             this.groupBox2.SuspendLayout();
+            this.groupBox3.SuspendLayout();
             this.SuspendLayout();
             // 
             // tb_FBT
@@ -239,7 +229,7 @@
             // 
             // tb_yjwb
             // 
-            this.tb_yjwb.Location = new System.Drawing.Point(8, 68);
+            this.tb_yjwb.Location = new System.Drawing.Point(5, 56);
             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);
@@ -278,14 +268,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, 293);
             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(9, 137);
             this.pictureBox7.Name = "pictureBox7";
             this.pictureBox7.Size = new System.Drawing.Size(249, 144);
             this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -295,7 +285,7 @@
             // label8312
             // 
             this.label8312.AutoSize = true;
-            this.label8312.Location = new System.Drawing.Point(10, 125);
+            this.label8312.Location = new System.Drawing.Point(10, 108);
             this.label8312.Name = "label8312";
             this.label8312.Size = new System.Drawing.Size(47, 12);
             this.label8312.TabIndex = 54;
@@ -303,7 +293,7 @@
             // 
             // button1217
             // 
-            this.button1217.Location = new System.Drawing.Point(174, 120);
+            this.button1217.Location = new System.Drawing.Point(174, 103);
             this.button1217.Name = "button1217";
             this.button1217.Size = new System.Drawing.Size(75, 23);
             this.button1217.TabIndex = 53;
@@ -311,133 +301,77 @@
             this.button1217.UseVisualStyleBackColor = true;
             this.button1217.Click += new System.EventHandler(this.button1217_Click);
             // 
-            // groupBox4
-            // 
-            this.groupBox4.Controls.Add(this.ck_klcc_xsddt);
-            this.groupBox4.Controls.Add(this.label111231);
-            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, 324);
-            this.groupBox4.TabIndex = 2;
-            this.groupBox4.TabStop = false;
-            this.groupBox4.Text = "颗粒尺寸分析结果";
-            // 
             // ck_klcc_xsddt
             // 
             this.ck_klcc_xsddt.AutoSize = true;
-            this.ck_klcc_xsddt.Location = new System.Drawing.Point(224, 77);
+            this.ck_klcc_xsddt.Location = new System.Drawing.Point(21, 50);
             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(15, 14);
+            this.ck_klcc_xsddt.Size = new System.Drawing.Size(84, 16);
             this.ck_klcc_xsddt.TabIndex = 59;
+            this.ck_klcc_xsddt.Text = "颗粒堆叠图";
             this.ck_klcc_xsddt.UseVisualStyleBackColor = true;
             // 
-            // label111231
-            // 
-            this.label111231.AutoSize = true;
-            this.label111231.Location = new System.Drawing.Point(12, 78);
-            this.label111231.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label111231.Name = "label111231";
-            this.label111231.Size = new System.Drawing.Size(65, 12);
-            this.label111231.TabIndex = 58;
-            this.label111231.Text = "显示堆叠图";
-            // 
             // checkBox2
             // 
             this.checkBox2.AutoSize = true;
-            this.checkBox2.Location = new System.Drawing.Point(224, 165);
+            this.checkBox2.Location = new System.Drawing.Point(267, 50);
             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;
+            this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged);
             // 
             // checkBox1
             // 
             this.checkBox1.AutoSize = true;
-            this.checkBox1.Location = new System.Drawing.Point(224, 121);
+            this.checkBox1.Location = new System.Drawing.Point(136, 50);
             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, 164);
-            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, 121);
-            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 = "显示大分类";
+            this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
             // 
             // 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(21, 25);
             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 = "显示该模块";
+            this.ck_klcc_xsmk.CheckedChanged += new System.EventHandler(this.ck_klcc_xsmk_CheckedChanged);
             // 
             // 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, 284);
+            this.cb_klcc_ljb.Location = new System.Drawing.Point(127, 113);
             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, 224);
+            this.cb_klcc_jsfs.Location = new System.Drawing.Point(21, 113);
             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, 258);
+            this.label15.Location = new System.Drawing.Point(128, 92);
             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);
@@ -447,33 +381,16 @@
             // label14
             // 
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(12, 198);
+            this.label14.Location = new System.Drawing.Point(19, 92);
             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(281, 485);
-            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, 167);
-            this.groupBox6.TabIndex = 4;
-            this.groupBox6.TabStop = false;
-            this.groupBox6.Text = "元素分析表";
-            // 
             // button3
             // 
-            this.button3.Location = new System.Drawing.Point(202, 64);
+            this.button3.Location = new System.Drawing.Point(159, 181);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(55, 23);
             this.button3.TabIndex = 60;
@@ -484,25 +401,25 @@
             // comboBox_PeriodicTable
             // 
             this.comboBox_PeriodicTable.FormattingEnabled = true;
-            this.comboBox_PeriodicTable.Location = new System.Drawing.Point(16, 114);
+            this.comboBox_PeriodicTable.Location = new System.Drawing.Point(21, 210);
             this.comboBox_PeriodicTable.Name = "comboBox_PeriodicTable";
-            this.comboBox_PeriodicTable.Size = new System.Drawing.Size(141, 20);
+            this.comboBox_PeriodicTable.Size = new System.Drawing.Size(84, 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(16, 66);
+            this.tb_ysfx_xsys.Location = new System.Drawing.Point(21, 183);
             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(129, 21);
             this.tb_ysfx_xsys.TabIndex = 58;
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(167, 114);
+            this.button4.Location = new System.Drawing.Point(142, 209);
             this.button4.Margin = new System.Windows.Forms.Padding(2);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(72, 20);
@@ -514,42 +431,14 @@
             // ck_ysfx_xsmk
             // 
             this.ck_ysfx_xsmk.AutoSize = true;
-            this.ck_ysfx_xsmk.Location = new System.Drawing.Point(224, 25);
+            this.ck_ysfx_xsmk.Location = new System.Drawing.Point(136, 25);
             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(5, 27);
-            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 = "显示该模块";
-            // 
-            // 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(548, 163);
-            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, 489);
-            this.groupBox8.TabIndex = 6;
-            this.groupBox8.TabStop = false;
-            this.groupBox8.Text = "颗粒列表";
-            // 
             // numericMin
             // 
             this.numericMin.Increment = new decimal(new int[] {
@@ -557,7 +446,7 @@
             0,
             0,
             0});
-            this.numericMin.Location = new System.Drawing.Point(170, 91);
+            this.numericMin.Location = new System.Drawing.Point(337, 78);
             this.numericMin.Maximum = new decimal(new int[] {
             99999,
             0,
@@ -575,29 +464,22 @@
             // label112121
             // 
             this.label112121.AutoSize = true;
-            this.label112121.Location = new System.Drawing.Point(8, 93);
+            this.label112121.Location = new System.Drawing.Point(236, 80);
             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, 57);
+            this.ck_kllb_fjzt.Location = new System.Drawing.Point(370, 25);
             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(8, 57);
-            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
             // 
@@ -605,9 +487,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(9, 331);
+            this.groupBox_zt.Location = new System.Drawing.Point(238, 197);
             this.groupBox_zt.Name = "groupBox_zt";
-            this.groupBox_zt.Size = new System.Drawing.Size(249, 148);
+            this.groupBox_zt.Size = new System.Drawing.Size(292, 79);
             this.groupBox_zt.TabIndex = 55;
             this.groupBox_zt.TabStop = false;
             this.groupBox_zt.Text = "帧图表";
@@ -615,7 +497,7 @@
             // ParticleList_5
             // 
             this.ParticleList_5.AutoSize = true;
-            this.ParticleList_5.Location = new System.Drawing.Point(17, 81);
+            this.ParticleList_5.Location = new System.Drawing.Point(102, 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);
@@ -626,16 +508,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, 106);
+            this.cb_FrameChart_p2.Location = new System.Drawing.Point(102, 48);
             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(80, 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);
@@ -646,10 +528,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, 48);
+            this.cb_FrameChart_p1.Location = new System.Drawing.Point(15, 48);
             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(80, 20);
             this.cb_FrameChart_p1.TabIndex = 54;
             // 
             // groupBox_px
@@ -660,9 +542,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(9, 131);
+            this.groupBox_px.Location = new System.Drawing.Point(238, 108);
             this.groupBox_px.Name = "groupBox_px";
-            this.groupBox_px.Size = new System.Drawing.Size(249, 194);
+            this.groupBox_px.Size = new System.Drawing.Size(292, 83);
             this.groupBox_px.TabIndex = 54;
             this.groupBox_px.TabStop = false;
             this.groupBox_px.Text = "最大排序表";
@@ -671,36 +553,38 @@
             // 
             this.comboBox_p3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox_p3.FormattingEnabled = true;
-            this.comboBox_p3.Location = new System.Drawing.Point(13, 162);
+            this.comboBox_p3.Location = new System.Drawing.Point(191, 50);
             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;
+            this.comboBox_p3.SelectedIndexChanged += new System.EventHandler(this.comboBox_p3_SelectedIndexChanged);
             // 
             // ParticleList_3
             // 
             this.ParticleList_3.AutoSize = true;
-            this.ParticleList_3.Location = new System.Drawing.Point(15, 138);
+            this.ParticleList_3.Location = new System.Drawing.Point(193, 26);
             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);
             this.ParticleList_3.TabIndex = 56;
             this.ParticleList_3.Text = "参数3";
+            this.ParticleList_3.Click += new System.EventHandler(this.ParticleList_3_Click);
             // 
             // comboBox_p2
             // 
             this.comboBox_p2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox_p2.FormattingEnabled = true;
-            this.comboBox_p2.Location = new System.Drawing.Point(13, 106);
+            this.comboBox_p2.Location = new System.Drawing.Point(102, 50);
             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, 82);
+            this.ParticleList_2.Location = new System.Drawing.Point(100, 26);
             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);
@@ -724,28 +608,20 @@
             this.comboBox_p1.Location = new System.Drawing.Point(13, 50);
             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(251, 25);
             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
             // 
@@ -853,14 +729,14 @@
             this.groupBox2.Controls.Add(this.label11111);
             this.groupBox2.Location = new System.Drawing.Point(281, 12);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(530, 140);
+            this.groupBox2.Size = new System.Drawing.Size(547, 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, 104);
             this.textBox_cypxss.Name = "textBox_cypxss";
             this.textBox_cypxss.Size = new System.Drawing.Size(181, 21);
             this.textBox_cypxss.TabIndex = 67;
@@ -868,7 +744,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, 86);
             this.label_cypxss.Name = "label_cypxss";
             this.label_cypxss.Size = new System.Drawing.Size(77, 12);
             this.label_cypxss.TabIndex = 66;
@@ -876,7 +752,7 @@
             // 
             // textBox_zypxss
             // 
-            this.textBox_zypxss.Location = new System.Drawing.Point(18, 106);
+            this.textBox_zypxss.Location = new System.Drawing.Point(15, 107);
             this.textBox_zypxss.Name = "textBox_zypxss";
             this.textBox_zypxss.Size = new System.Drawing.Size(181, 21);
             this.textBox_zypxss.TabIndex = 65;
@@ -884,25 +760,61 @@
             // label_zypxss
             // 
             this.label_zypxss.AutoSize = true;
-            this.label_zypxss.Location = new System.Drawing.Point(16, 85);
+            this.label_zypxss.Location = new System.Drawing.Point(13, 86);
             this.label_zypxss.Name = "label_zypxss";
             this.label_zypxss.Size = new System.Drawing.Size(77, 12);
             this.label_zypxss.TabIndex = 64;
             this.label_zypxss.Text = "主要排序显示";
             // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.numericMin);
+            this.groupBox3.Controls.Add(this.groupBox_zt);
+            this.groupBox3.Controls.Add(this.label112121);
+            this.groupBox3.Controls.Add(this.groupBox_px);
+            this.groupBox3.Controls.Add(this.button3);
+            this.groupBox3.Controls.Add(this.label2);
+            this.groupBox3.Controls.Add(this.comboBox_PeriodicTable);
+            this.groupBox3.Controls.Add(this.ck_klcc_xsddt);
+            this.groupBox3.Controls.Add(this.tb_ysfx_xsys);
+            this.groupBox3.Controls.Add(this.button4);
+            this.groupBox3.Controls.Add(this.checkBox2);
+            this.groupBox3.Controls.Add(this.ck_klcc_xsmk);
+            this.groupBox3.Controls.Add(this.checkBox1);
+            this.groupBox3.Controls.Add(this.cb_klcc_ljb);
+            this.groupBox3.Controls.Add(this.label15);
+            this.groupBox3.Controls.Add(this.ck_ysfx_xsmk);
+            this.groupBox3.Controls.Add(this.cb_klcc_jsfs);
+            this.groupBox3.Controls.Add(this.ck_kllb_fjzt);
+            this.groupBox3.Controls.Add(this.label14);
+            this.groupBox3.Controls.Add(this.ck_kllb_xsmk);
+            this.groupBox3.Location = new System.Drawing.Point(281, 158);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(547, 476);
+            this.groupBox3.TabIndex = 78;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "颗粒筛选";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(19, 164);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(77, 12);
+            this.label2.TabIndex = 68;
+            this.label2.Text = "元素选择设置";
+            // 
             // OTSReport_Template_CleannessA
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(817, 654);
+            this.ClientSize = new System.Drawing.Size(839, 646);
+            this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.cb_ParticleRange);
-            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);
@@ -913,17 +825,11 @@
             this.Name = "OTSReport_Template_CleannessA";
             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.groupBox8.ResumeLayout(false);
-            this.groupBox8.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).EndInit();
             this.groupBox_zt.ResumeLayout(false);
             this.groupBox_zt.PerformLayout();
@@ -933,6 +839,8 @@
             this.groupBox9.PerformLayout();
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -955,19 +863,13 @@
         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 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.Button button6;
         private System.Windows.Forms.GroupBox groupBox9;
@@ -990,7 +892,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.Button button5;
         private System.Windows.Forms.TextBox tb_RemoveElements;
         private System.Windows.Forms.Label label11111;
@@ -1000,10 +901,7 @@
         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.CheckBox ck_klcc_xsddt;
-        private System.Windows.Forms.Label label111231;
         private System.Windows.Forms.PictureBox pictureBox7;
         private System.Windows.Forms.Label label8312;
         private System.Windows.Forms.Button button1217;
@@ -1012,5 +910,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.Label label2;
     }
 }

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.cs

@@ -662,5 +662,63 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 }
             }
         }
+
+        private void ParticleList_3_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void comboBox_p3_SelectedIndexChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void ck_kllb_xsmk_CheckedChanged(object sender, EventArgs e)
+        {
+
+            if (!ck_kllb_xsmk.Checked)
+            {
+                ck_kllb_fjzt.Checked = false;
+            }
+
+        }
+
+        private void ck_kllb_fjzt_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!ck_kllb_xsmk.Checked)
+            {
+                ck_kllb_fjzt.Checked = false;
+            }
+        }
+
+        private void ck_klcc_xsmk_CheckedChanged(object sender, EventArgs e)
+        {
+            if(!ck_klcc_xsmk.Checked)
+            {
+                checkBox1.Checked = false;
+                checkBox2.Checked = false;
+                ck_klcc_xsddt.Checked = false;
+            }
+        }
+
+        private void checkBox1_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!ck_klcc_xsmk.Checked)
+            {
+                checkBox1.Checked = false;
+                checkBox2.Checked = false;
+                ck_klcc_xsddt.Checked = false;
+            }
+        }
+
+        private void checkBox2_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!ck_klcc_xsmk.Checked)
+            {
+                checkBox1.Checked = false;
+                checkBox2.Checked = false;
+                ck_klcc_xsddt.Checked = false;
+            }
+        }
     }
 }

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

@@ -95,6 +95,7 @@
             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.label2 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
@@ -313,6 +314,7 @@
             this.checkBox2.TabIndex = 57;
             this.checkBox2.Text = "显示小分类图表";
             this.checkBox2.UseVisualStyleBackColor = true;
+            this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged);
             // 
             // checkBox1
             // 
@@ -324,6 +326,7 @@
             this.checkBox1.TabIndex = 56;
             this.checkBox1.Text = "显示大分类图表";
             this.checkBox1.UseVisualStyleBackColor = true;
+            this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
             // 
             // ck_klcc_xsmk
             // 
@@ -335,6 +338,7 @@
             this.ck_klcc_xsmk.TabIndex = 53;
             this.ck_klcc_xsmk.Text = "颗粒尺寸";
             this.ck_klcc_xsmk.UseVisualStyleBackColor = true;
+            this.ck_klcc_xsmk.CheckedChanged += new System.EventHandler(this.ck_klcc_xsmk_CheckedChanged);
             // 
             // cb_klcc_ljb
             // 
@@ -378,7 +382,7 @@
             // 
             // button3
             // 
-            this.button3.Location = new System.Drawing.Point(172, 116);
+            this.button3.Location = new System.Drawing.Point(172, 141);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(55, 23);
             this.button3.TabIndex = 60;
@@ -389,7 +393,7 @@
             // comboBox_PeriodicTable
             // 
             this.comboBox_PeriodicTable.FormattingEnabled = true;
-            this.comboBox_PeriodicTable.Location = new System.Drawing.Point(16, 149);
+            this.comboBox_PeriodicTable.Location = new System.Drawing.Point(16, 174);
             this.comboBox_PeriodicTable.Name = "comboBox_PeriodicTable";
             this.comboBox_PeriodicTable.Size = new System.Drawing.Size(116, 20);
             this.comboBox_PeriodicTable.TabIndex = 59;
@@ -398,7 +402,7 @@
             // 
             // tb_ysfx_xsys
             // 
-            this.tb_ysfx_xsys.Location = new System.Drawing.Point(16, 118);
+            this.tb_ysfx_xsys.Location = new System.Drawing.Point(16, 143);
             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;
@@ -407,7 +411,7 @@
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(155, 150);
+            this.button4.Location = new System.Drawing.Point(155, 175);
             this.button4.Margin = new System.Windows.Forms.Padding(2);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(72, 20);
@@ -432,7 +436,7 @@
             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(15, 203);
+            this.lbv_syxt_mblb.Location = new System.Drawing.Point(15, 226);
             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(236, 141);
@@ -443,7 +447,7 @@
             // label33
             // 
             this.label33.AutoSize = true;
-            this.label33.Location = new System.Drawing.Point(13, 189);
+            this.label33.Location = new System.Drawing.Point(13, 212);
             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);
@@ -508,7 +512,7 @@
             // ParticleList_5
             // 
             this.ParticleList_5.AutoSize = true;
-            this.ParticleList_5.Location = new System.Drawing.Point(88, 23);
+            this.ParticleList_5.Location = new System.Drawing.Point(105, 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);
@@ -519,7 +523,7 @@
             // 
             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(88, 37);
+            this.cb_FrameChart_p2.Location = new System.Drawing.Point(105, 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(85, 20);
@@ -528,7 +532,7 @@
             // ParticleList_4
             // 
             this.ParticleList_4.AutoSize = true;
-            this.ParticleList_4.Location = new System.Drawing.Point(13, 23);
+            this.ParticleList_4.Location = new System.Drawing.Point(5, 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);
@@ -539,7 +543,7 @@
             // 
             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(13, 37);
+            this.cb_FrameChart_p1.Location = new System.Drawing.Point(5, 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(85, 20);
@@ -788,6 +792,7 @@
             // 
             // groupBox3
             // 
+            this.groupBox3.Controls.Add(this.label2);
             this.groupBox3.Controls.Add(this.groupBox_zt);
             this.groupBox3.Controls.Add(this.numericMin);
             this.groupBox3.Controls.Add(this.groupBox_px);
@@ -828,6 +833,15 @@
             this.ck_syxt_xsmk.Text = "三元图";
             this.ck_syxt_xsmk.UseVisualStyleBackColor = true;
             // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(16, 121);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(77, 12);
+            this.label2.TabIndex = 67;
+            this.label2.Text = "元素选择设置";
+            // 
             // OTSReport_Template_INCA
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -938,5 +952,6 @@
         private System.Windows.Forms.Label label_zypxss;
         private System.Windows.Forms.GroupBox groupBox3;
         private System.Windows.Forms.CheckBox ck_syxt_xsmk;
+        private System.Windows.Forms.Label label2;
     }
 }

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_INCA.cs

@@ -732,12 +732,45 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
         private void ck_kllb_fjzt_CheckedChanged(object sender, EventArgs e)
         {
-
+            if (!ck_kllb_xsmk.Checked)
+            {
+                ck_kllb_fjzt.Checked = false;
+            }
         }
 
         private void ck_kllb_xsmk_CheckedChanged(object sender, EventArgs e)
         {
+            if(!ck_kllb_xsmk.Checked)
+            {
+                ck_kllb_fjzt.Checked = false;
+            }
+        }
 
+        private void ck_klcc_xsmk_CheckedChanged(object sender, EventArgs e)
+        {
+            if(!ck_klcc_xsmk.Checked)
+            {
+                checkBox1.Checked = false;
+                checkBox2.Checked = false;
+            }
+        }
+
+        private void checkBox1_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!ck_klcc_xsmk.Checked)
+            {
+                checkBox1.Checked = false;
+                checkBox2.Checked = false;
+            }
+        }
+
+        private void checkBox2_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!ck_klcc_xsmk.Checked)
+            {
+                checkBox1.Checked = false;
+                checkBox2.Checked = false;
+            }
         }
     }
 }