zhangjiaxin 2 месяцев назад
Родитель
Сommit
79c826d434

+ 12 - 12
OTSIncAReportApp/1-UI/OTSReportExport/Cleanness/OTSReport_Template_CleannessA.Designer.cs

@@ -55,6 +55,7 @@
 			this.label112121 = new System.Windows.Forms.Label();
 			this.ck_kllb_fjzt = new System.Windows.Forms.CheckBox();
 			this.groupBox_px = new System.Windows.Forms.GroupBox();
+			this.button9 = new System.Windows.Forms.Button();
 			this.tb_RemoveElements = new System.Windows.Forms.TextBox();
 			this.button5 = new System.Windows.Forms.Button();
 			this.comboBox_p3 = new System.Windows.Forms.ComboBox();
@@ -95,7 +96,6 @@
 			this.groupBox5 = new System.Windows.Forms.GroupBox();
 			this.textBox1 = new System.Windows.Forms.TextBox();
 			this.groupBox6 = new System.Windows.Forms.GroupBox();
-			this.button9 = new System.Windows.Forms.Button();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
 			this.groupBox_px.SuspendLayout();
@@ -397,6 +397,16 @@
 			this.groupBox_px.TabStop = false;
 			this.groupBox_px.Text = "颗粒显示排序设置";
 			// 
+			// button9
+			// 
+			this.button9.Location = new System.Drawing.Point(446, 48);
+			this.button9.Name = "button9";
+			this.button9.Size = new System.Drawing.Size(75, 23);
+			this.button9.TabIndex = 69;
+			this.button9.Text = "颗粒筛选";
+			this.button9.UseVisualStyleBackColor = true;
+			this.button9.Click += new System.EventHandler(this.button9_Click);
+			// 
 			// tb_RemoveElements
 			// 
 			this.tb_RemoveElements.Location = new System.Drawing.Point(124, 86);
@@ -649,6 +659,7 @@
 			// 
 			// groupBox3
 			// 
+			this.groupBox3.Controls.Add(this.checkBox1);
 			this.groupBox3.Controls.Add(this.comboBox1);
 			this.groupBox3.Controls.Add(this.checkBox6);
 			this.groupBox3.Controls.Add(this.checkBox5);
@@ -663,7 +674,6 @@
 			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.ck_ysfx_xsmk);
 			this.groupBox3.Controls.Add(this.ck_kllb_fjzt);
 			this.groupBox3.Controls.Add(this.ck_kllb_xsmk);
@@ -826,16 +836,6 @@
 			this.groupBox6.TabStop = false;
 			this.groupBox6.Text = "图标选择";
 			// 
-			// button9
-			// 
-			this.button9.Location = new System.Drawing.Point(446, 48);
-			this.button9.Name = "button9";
-			this.button9.Size = new System.Drawing.Size(75, 23);
-			this.button9.TabIndex = 69;
-			this.button9.Text = "颗粒筛选";
-			this.button9.UseVisualStyleBackColor = true;
-			this.button9.Click += new System.EventHandler(this.button9_Click);
-			// 
 			// OTSReport_Template_CleannessA
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

+ 1 - 1
OTSIncAReportApp/1-UI/OTSReportExport/Cleanness/OTSReport_Template_CleannessA.cs

@@ -447,7 +447,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_sort_p3 = comboBox_p3.SelectedIndex;
             
             //夹杂物占比
-            m_OTSReport_Export.m_mbszclass.M_JZWZB.b_ck_surface = false;//夹杂物占比表
+            //m_OTSReport_Export.m_mbszclass.M_JZWZB.b_ck_surface = false;//夹杂物占比表
             //去除信息
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_kllb_qcys = tb_RemoveElements.Text;//去除不要的物质元素