Browse Source

Merge branch 'OTSRelease3_2' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_2

gsp 7 tháng trước cách đây
mục cha
commit
0dd8e52803

+ 10 - 10
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);