清洁度报告设置样式修改

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

@@ -135,9 +135,9 @@
     <b_ck_chart>False</b_ck_chart>
   </M_JZWZB>
   <whole>
-    <list_str_MainPriority>System.Collections.Generic.List`1[System.String]<YS0>Glass</YS0><YS1>Glass</YS1><YS2>Si Rich</YS2><YS3>Al-Alloy</YS3><YS4>Oxidized Al</YS4><YS5>Al2O3 with S</YS5><YS6>Al2O3</YS6><YS7>Al-Rich</YS7><YS8>SiO2</YS8><YS9>W Rich (W-C)</YS9><YS10>Aluminosilicates</YS10><YS11>Ca-Aluminosilicates</YS11><YS12>High Ca</YS12><YS13>Mn-P Coating</YS13><YS14>Cr Coating</YS14><YS15>Zn-Cr Coating</YS15><YS16>Zn Coating</YS16><YS17>Zn-P Coating</YS17><YS18>Zn-Cu</YS18><YS19>Steel</YS19><YS20>Steel</YS20><YS21>Steel</YS21><YS22>Steel</YS22><YS23>Flourinated</YS23><YS24>Brass</YS24><YS25>Bronze CuSn</YS25><YS26>Non-Ferrous Metal</YS26><YS27>Misc Salts</YS27><YS28>Mineral Fiber</YS28><YS29>Mineral</YS29><YS30>Al alloy -Cu</YS30><YS31>Misc Carbons</YS31></list_str_MainPriority>
+    <list_str_MainPriority>System.Collections.Generic.List`1[System.String]<YS0>Glass</YS0><YS1>Glass</YS1><YS2>Si Rich</YS2><YS3>Al-Alloy</YS3><YS4>Oxidized Al</YS4><YS5>Al2O3 with S</YS5><YS6>Al2O3</YS6><YS7>Al-Rich</YS7><YS8>SiO2</YS8><YS9>W Rich (W-C)</YS9><YS10>Aluminosilicates</YS10><YS11>Ca-Aluminosilicates</YS11><YS12>High Ca</YS12><YS13>Mn-P Coating</YS13><YS14>Cr Coating</YS14><YS15>Zn-Cr Coating</YS15><YS16>Zn Coating</YS16><YS17>Zn-P Coating</YS17><YS18>Zn-Cu</YS18><YS19>Steel(Fe&gt;40)</YS19><YS20>Steel(FeCrNi)</YS20><YS21>Steel(Fe&gt;60)</YS21><YS22>Steel(Fe&gt;20)</YS22><YS23>Flourinated</YS23><YS24>Brass</YS24><YS25>Bronze CuSn</YS25><YS26>Non-Ferrous Metal</YS26><YS27>Misc Salts</YS27><YS28>Mineral Fiber</YS28><YS29>Mineral</YS29><YS30>Al alloy -Cu</YS30><YS31>Misc Carbons</YS31></list_str_MainPriority>
     <list_str_SecondaryPriority>System.Collections.Generic.List`1[System.String]<YS0>Nialloy</YS0><YS1>Fe-O</YS1><YS2>Fe-Cr</YS2><YS3>Fe-alloy</YS3></list_str_SecondaryPriority>
-    <str_MainPriority>Glass , Glass , Si Rich , Al-Alloy , Oxidized Al , Al2O3 with S , Al2O3 , Al-Rich , SiO2 , W Rich (W-C) , Aluminosilicates , Ca-Aluminosilicates , High Ca , Mn-P Coating , Cr Coating , Zn-Cr Coating , Zn Coating , Zn-P Coating , Zn-Cu , Steel , Steel , Steel , Steel , Flourinated , Brass , Bronze CuSn , Non-Ferrous Metal , Misc Salts , Mineral Fiber , Mineral , Al alloy -Cu , Misc Carbons</str_MainPriority>
+    <str_MainPriority>Glass , Glass , Si Rich , Al-Alloy , Oxidized Al , Al2O3 with S , Al2O3 , Al-Rich , SiO2 , W Rich (W-C) , Aluminosilicates , Ca-Aluminosilicates , High Ca , Mn-P Coating , Cr Coating , Zn-Cr Coating , Zn Coating , Zn-P Coating , Zn-Cu , Steel(Fe&gt;40) , Steel(FeCrNi) , Steel(Fe&gt;60) , Steel(Fe&gt;20) , Flourinated , Brass , Bronze CuSn , Non-Ferrous Metal , Misc Salts , Mineral Fiber , Mineral , Al alloy -Cu , Misc Carbons</str_MainPriority>
     <str_SecondaryPriority>Nialloy,Fe-O,Fe-Cr,Fe-alloy</str_SecondaryPriority>
     <list_str_MainPriority_Serial>System.Collections.Generic.List`1[System.String]<YS0>40001</YS0><YS1>40002</YS1><YS2>40003</YS2><YS3>40004</YS3><YS4>40005</YS4><YS5>40006</YS5><YS6>40007</YS6><YS7>40008</YS7><YS8>40009</YS8><YS9>40010</YS9><YS10>40011</YS10><YS11>40012</YS11><YS12>40013</YS12><YS13>40014</YS13><YS14>40015</YS14><YS15>40016</YS15><YS16>40017</YS16><YS17>40018</YS17><YS18>40019</YS18><YS19>40020</YS19><YS20>40021</YS20><YS21>40022</YS21><YS22>40023</YS22><YS23>40024</YS23><YS24>40025</YS24><YS25>40026</YS25><YS26>40027</YS26><YS27>40028</YS27><YS28>40029</YS28><YS29>40030</YS29><YS30>40031</YS30><YS31>40033</YS31></list_str_MainPriority_Serial>
   </whole>

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

@@ -402,7 +402,7 @@
             // ck_kllb_fjzt
             // 
             this.ck_kllb_fjzt.AutoSize = true;
-            this.ck_kllb_fjzt.Location = new System.Drawing.Point(18, 382);
+            this.ck_kllb_fjzt.Location = new System.Drawing.Point(18, 339);
             this.ck_kllb_fjzt.Name = "ck_kllb_fjzt";
             this.ck_kllb_fjzt.Size = new System.Drawing.Size(96, 16);
             this.ck_kllb_fjzt.TabIndex = 57;
@@ -423,7 +423,7 @@
             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(152, 232);
+            this.groupBox_px.Location = new System.Drawing.Point(152, 214);
             this.groupBox_px.Name = "groupBox_px";
             this.groupBox_px.Size = new System.Drawing.Size(513, 125);
             this.groupBox_px.TabIndex = 54;
@@ -523,7 +523,7 @@
             // ck_kllb_xsmk
             // 
             this.ck_kllb_xsmk.AutoSize = true;
-            this.ck_kllb_xsmk.Location = new System.Drawing.Point(18, 227);
+            this.ck_kllb_xsmk.Location = new System.Drawing.Point(18, 209);
             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(72, 16);
@@ -564,7 +564,7 @@
             // 
             // button3
             // 
-            this.button3.Location = new System.Drawing.Point(578, 61);
+            this.button3.Location = new System.Drawing.Point(582, 100);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(83, 22);
             this.button3.TabIndex = 68;
@@ -578,7 +578,7 @@
             this.textBox_zypxss.Multiline = true;
             this.textBox_zypxss.Name = "textBox_zypxss";
             this.textBox_zypxss.ReadOnly = true;
-            this.textBox_zypxss.Size = new System.Drawing.Size(672, 41);
+            this.textBox_zypxss.Size = new System.Drawing.Size(672, 80);
             this.textBox_zypxss.TabIndex = 65;
             // 
             // groupBox3
@@ -595,9 +595,9 @@
             this.groupBox3.Controls.Add(this.ck_ysfx_xsmk);
             this.groupBox3.Controls.Add(this.ck_kllb_fjzt);
             this.groupBox3.Controls.Add(this.ck_kllb_xsmk);
-            this.groupBox3.Location = new System.Drawing.Point(285, 111);
+            this.groupBox3.Location = new System.Drawing.Point(285, 149);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(684, 418);
+            this.groupBox3.Size = new System.Drawing.Size(684, 380);
             this.groupBox3.TabIndex = 78;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "模块设定";
@@ -641,7 +641,7 @@
             this.groupBox4.Controls.Add(this.textBox_zypxss);
             this.groupBox4.Location = new System.Drawing.Point(285, 15);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(684, 90);
+            this.groupBox4.Size = new System.Drawing.Size(684, 128);
             this.groupBox4.TabIndex = 79;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "物质分类显示";
@@ -650,7 +650,7 @@
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(299, 66);
+            this.label7.Location = new System.Drawing.Point(303, 105);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(77, 12);
             this.label7.TabIndex = 70;
@@ -660,7 +660,7 @@
             // 
             this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(381, 63);
+            this.comboBox1.Location = new System.Drawing.Point(385, 102);
             this.comboBox1.Margin = new System.Windows.Forms.Padding(2);
             this.comboBox1.Name = "comboBox1";
             this.comboBox1.Size = new System.Drawing.Size(192, 20);