界面调整

UAS-MES/FunctionCode/Make/Make_UpdateCollectCode.Designer.cs

@@ -34,7 +34,6 @@
             this.psr_length = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -48,6 +47,7 @@
             this.Imei3 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
             this.inputValue = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.label3 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.collectCodeRules)).BeginInit();
             this.collects.SuspendLayout();
             this.SuspendLayout();
@@ -60,11 +60,12 @@
             this.psr_prefix,
             this.psr_length,
             this.Column1});
-            this.collectCodeRules.Location = new System.Drawing.Point(279, 70);
+            this.collectCodeRules.Location = new System.Drawing.Point(248, 58);
+            this.collectCodeRules.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.collectCodeRules.Name = "collectCodeRules";
             this.collectCodeRules.RowHeadersVisible = false;
             this.collectCodeRules.RowTemplate.Height = 30;
-            this.collectCodeRules.Size = new System.Drawing.Size(733, 235);
+            this.collectCodeRules.Size = new System.Drawing.Size(652, 196);
             this.collectCodeRules.TabIndex = 6;
             // 
             // psr_type
@@ -99,21 +100,12 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(275, 27);
+            this.label1.Location = new System.Drawing.Point(244, 22);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 31);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 7;
             this.label1.Text = "防呆规则";
             // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(54, 583);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(62, 18);
-            this.label2.TabIndex = 91;
-            this.label2.Text = "采集栏";
-            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.HeaderText = "采集项";
@@ -147,9 +139,11 @@
             this.collects.Controls.Add(this.Imei1);
             this.collects.Controls.Add(this.Imei2);
             this.collects.Controls.Add(this.Imei3);
-            this.collects.Location = new System.Drawing.Point(27, 18);
+            this.collects.Location = new System.Drawing.Point(24, 15);
+            this.collects.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.collects.Name = "collects";
-            this.collects.Size = new System.Drawing.Size(185, 287);
+            this.collects.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.collects.Size = new System.Drawing.Size(164, 239);
             this.collects.TabIndex = 92;
             this.collects.TabStop = false;
             this.collects.TextColor = System.Drawing.Color.Black;
@@ -157,10 +151,11 @@
             // Mac
             // 
             this.Mac.AutoSize = true;
-            this.Mac.Location = new System.Drawing.Point(37, 31);
+            this.Mac.Location = new System.Drawing.Point(33, 26);
+            this.Mac.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Mac.Name = "Mac";
             this.Mac.Power = null;
-            this.Mac.Size = new System.Drawing.Size(106, 22);
+            this.Mac.Size = new System.Drawing.Size(93, 19);
             this.Mac.TabIndex = 5;
             this.Mac.Text = "MAC/WIFI";
             this.Mac.UseVisualStyleBackColor = true;
@@ -169,10 +164,11 @@
             // Bt
             // 
             this.Bt.AutoSize = true;
-            this.Bt.Location = new System.Drawing.Point(37, 74);
+            this.Bt.Location = new System.Drawing.Point(33, 62);
+            this.Bt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Bt.Name = "Bt";
             this.Bt.Power = null;
-            this.Bt.Size = new System.Drawing.Size(52, 22);
+            this.Bt.Size = new System.Drawing.Size(45, 19);
             this.Bt.TabIndex = 4;
             this.Bt.Text = "BT";
             this.Bt.UseVisualStyleBackColor = true;
@@ -181,10 +177,11 @@
             // NetCode
             // 
             this.NetCode.AutoSize = true;
-            this.NetCode.Location = new System.Drawing.Point(37, 112);
+            this.NetCode.Location = new System.Drawing.Point(33, 93);
+            this.NetCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.NetCode.Name = "NetCode";
             this.NetCode.Power = null;
-            this.NetCode.Size = new System.Drawing.Size(70, 22);
+            this.NetCode.Size = new System.Drawing.Size(59, 19);
             this.NetCode.TabIndex = 3;
             this.NetCode.Text = "网标";
             this.NetCode.UseVisualStyleBackColor = true;
@@ -193,10 +190,11 @@
             // Imei1
             // 
             this.Imei1.AutoSize = true;
-            this.Imei1.Location = new System.Drawing.Point(37, 156);
+            this.Imei1.Location = new System.Drawing.Point(33, 130);
+            this.Imei1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Imei1.Name = "Imei1";
             this.Imei1.Power = null;
-            this.Imei1.Size = new System.Drawing.Size(79, 22);
+            this.Imei1.Size = new System.Drawing.Size(69, 19);
             this.Imei1.TabIndex = 2;
             this.Imei1.Text = "IMEI1";
             this.Imei1.UseVisualStyleBackColor = true;
@@ -205,10 +203,11 @@
             // Imei2
             // 
             this.Imei2.AutoSize = true;
-            this.Imei2.Location = new System.Drawing.Point(37, 196);
+            this.Imei2.Location = new System.Drawing.Point(33, 163);
+            this.Imei2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Imei2.Name = "Imei2";
             this.Imei2.Power = null;
-            this.Imei2.Size = new System.Drawing.Size(79, 22);
+            this.Imei2.Size = new System.Drawing.Size(69, 19);
             this.Imei2.TabIndex = 1;
             this.Imei2.Text = "IMEI2";
             this.Imei2.UseVisualStyleBackColor = true;
@@ -217,10 +216,11 @@
             // Imei3
             // 
             this.Imei3.AutoSize = true;
-            this.Imei3.Location = new System.Drawing.Point(37, 239);
+            this.Imei3.Location = new System.Drawing.Point(33, 199);
+            this.Imei3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Imei3.Name = "Imei3";
             this.Imei3.Power = null;
-            this.Imei3.Size = new System.Drawing.Size(79, 22);
+            this.Imei3.Size = new System.Drawing.Size(69, 19);
             this.Imei3.TabIndex = 0;
             this.Imei3.Text = "IMEI3";
             this.Imei3.UseVisualStyleBackColor = true;
@@ -231,10 +231,11 @@
             this.inputValue.AllPower = null;
             this.inputValue.BackColor = System.Drawing.Color.White;
             this.inputValue.ID = null;
-            this.inputValue.Location = new System.Drawing.Point(195, 573);
+            this.inputValue.Location = new System.Drawing.Point(173, 477);
+            this.inputValue.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.inputValue.Name = "inputValue";
             this.inputValue.Power = null;
-            this.inputValue.Size = new System.Drawing.Size(257, 28);
+            this.inputValue.Size = new System.Drawing.Size(229, 25);
             this.inputValue.Str = null;
             this.inputValue.Str1 = null;
             this.inputValue.Str2 = null;
@@ -244,25 +245,36 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(27, 327);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(24, 272);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1006, 228);
+            this.OperateResult.Size = new System.Drawing.Size(895, 191);
             this.OperateResult.TabIndex = 88;
             this.OperateResult.Text = "";
             // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label3.Location = new System.Drawing.Point(95, 475);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(72, 27);
+            this.label3.TabIndex = 93;
+            this.label3.Text = "输入框";
+            // 
             // Make_UpdateCollectCode
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1120, 614);
+            this.ClientSize = new System.Drawing.Size(996, 512);
+            this.Controls.Add(this.label3);
             this.Controls.Add(this.collects);
-            this.Controls.Add(this.label2);
             this.Controls.Add(this.inputValue);
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.collectCodeRules);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Make_UpdateCollectCode";
             this.Text = "Make!UpdateCollectCode";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_UpdateCollectCode_FormClosing);
@@ -281,7 +293,6 @@
         private System.Windows.Forms.Label label1;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.TextBoxWithIcon.EnterTextBox inputValue;
-        private System.Windows.Forms.Label label2;
         private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder collects;
         private CustomControl.CustomCheckBox.CustomCheckBox Imei3;
         private CustomControl.CustomCheckBox.CustomCheckBox Imei2;
@@ -297,5 +308,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn psr_prefix;
         private System.Windows.Forms.DataGridViewTextBoxColumn psr_length;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+        private System.Windows.Forms.Label label3;
     }
 }

UAS-MES/FunctionCode/Make/Make_UpdateCollectCode.resx

@@ -129,4 +129,16 @@
   <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="psr_type.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="psr_prefix.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="psr_length.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>