界面调整

UAS-MES/FunctionCode/Employee/Employee_Data.Designer.cs

@@ -66,7 +66,7 @@
             this.Employee.Margin = new System.Windows.Forms.Padding(4);
             this.Employee.Name = "Employee";
             this.Employee.RowTemplate.Height = 23;
-            this.Employee.Size = new System.Drawing.Size(1416, 644);
+            this.Employee.Size = new System.Drawing.Size(1243, 644);
             this.Employee.TabIndex = 0;
             // 
             // em_code
@@ -125,7 +125,7 @@
             this.Screen.DownImage = ((System.Drawing.Image)(resources.GetObject("Screen.DownImage")));
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
             this.Screen.IsShowBorder = true;
-            this.Screen.Location = new System.Drawing.Point(1323, 24);
+            this.Screen.Location = new System.Drawing.Point(1149, 23);
             this.Screen.Margin = new System.Windows.Forms.Padding(4);
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.Name = "Screen";
@@ -142,11 +142,11 @@
             this.em_code11.AllPower = null;
             this.em_code11.BackColor = System.Drawing.Color.White;
             this.em_code11.ID = null;
-            this.em_code11.Location = new System.Drawing.Point(452, 26);
+            this.em_code11.Location = new System.Drawing.Point(392, 25);
             this.em_code11.Margin = new System.Windows.Forms.Padding(4);
             this.em_code11.Name = "em_code11";
             this.em_code11.Power = null;
-            this.em_code11.Size = new System.Drawing.Size(199, 25);
+            this.em_code11.Size = new System.Drawing.Size(150, 25);
             this.em_code11.Str = null;
             this.em_code11.Str1 = null;
             this.em_code11.Str2 = null;
@@ -158,11 +158,11 @@
             this.em_name11.AllPower = null;
             this.em_name11.BackColor = System.Drawing.Color.White;
             this.em_name11.ID = null;
-            this.em_name11.Location = new System.Drawing.Point(124, 26);
+            this.em_name11.Location = new System.Drawing.Point(112, 25);
             this.em_name11.Margin = new System.Windows.Forms.Padding(4);
             this.em_name11.Name = "em_name11";
             this.em_name11.Power = null;
-            this.em_name11.Size = new System.Drawing.Size(199, 25);
+            this.em_name11.Size = new System.Drawing.Size(150, 25);
             this.em_name11.Str = null;
             this.em_name11.Str1 = null;
             this.em_name11.Str2 = null;
@@ -173,7 +173,7 @@
             // 
             this.em_name_label.AutoSize = true;
             this.em_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_name_label.Location = new System.Drawing.Point(20, 26);
+            this.em_name_label.Location = new System.Drawing.Point(8, 26);
             this.em_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_name_label.Name = "em_name_label";
             this.em_name_label.Size = new System.Drawing.Size(92, 27);
@@ -184,7 +184,7 @@
             // 
             this.em_code_label.AutoSize = true;
             this.em_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code_label.Location = new System.Drawing.Point(345, 26);
+            this.em_code_label.Location = new System.Drawing.Point(285, 25);
             this.em_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_code_label.Name = "em_code_label";
             this.em_code_label.Size = new System.Drawing.Size(92, 27);
@@ -200,7 +200,7 @@
             this.pagination1.Location = new System.Drawing.Point(0, 721);
             this.pagination1.Margin = new System.Windows.Forms.Padding(5);
             this.pagination1.Name = "pagination1";
-            this.pagination1.Size = new System.Drawing.Size(1420, 40);
+            this.pagination1.Size = new System.Drawing.Size(1245, 40);
             this.pagination1.TabIndex = 238;
             // 
             // em_depart1
@@ -208,11 +208,11 @@
             this.em_depart1.AllPower = null;
             this.em_depart1.BackColor = System.Drawing.Color.White;
             this.em_depart1.ID = null;
-            this.em_depart1.Location = new System.Drawing.Point(773, 26);
+            this.em_depart1.Location = new System.Drawing.Point(675, 25);
             this.em_depart1.Margin = new System.Windows.Forms.Padding(4);
             this.em_depart1.Name = "em_depart1";
             this.em_depart1.Power = null;
-            this.em_depart1.Size = new System.Drawing.Size(199, 25);
+            this.em_depart1.Size = new System.Drawing.Size(150, 25);
             this.em_depart1.Str = null;
             this.em_depart1.Str1 = null;
             this.em_depart1.Str2 = null;
@@ -223,7 +223,7 @@
             // 
             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(667, 26);
+            this.label1.Location = new System.Drawing.Point(569, 23);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
@@ -235,11 +235,11 @@
             this.em_position1.AllPower = null;
             this.em_position1.BackColor = System.Drawing.Color.White;
             this.em_position1.ID = null;
-            this.em_position1.Location = new System.Drawing.Point(1096, 25);
+            this.em_position1.Location = new System.Drawing.Point(960, 25);
             this.em_position1.Margin = new System.Windows.Forms.Padding(4);
             this.em_position1.Name = "em_position1";
             this.em_position1.Power = null;
-            this.em_position1.Size = new System.Drawing.Size(199, 25);
+            this.em_position1.Size = new System.Drawing.Size(150, 25);
             this.em_position1.Str = null;
             this.em_position1.Str1 = null;
             this.em_position1.Str2 = null;
@@ -250,18 +250,18 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(989, 25);
+            this.label2.Location = new System.Drawing.Point(853, 25);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 241;
             this.label2.Text = "员工岗位";
             // 
-            // 人员资料
+            // Employee_Data
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1420, 761);
+            this.ClientSize = new System.Drawing.Size(1245, 761);
             this.Controls.Add(this.em_position1);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.em_depart1);
@@ -275,7 +275,7 @@
             this.Controls.Add(this.Employee);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Margin = new System.Windows.Forms.Padding(4);
-            this.Name = "人员资料";
+            this.Name = "Employee_Data";
             this.Tag = "Employee!Group";
             this.Text = "人员分组";
             this.Load += new System.EventHandler(this.人员分组_Load);

UAS-MES/FunctionCode/Employee/Employee_Group.cs

@@ -47,12 +47,12 @@ namespace UAS_MES.Employee
 
             ug_code1.KeyDown += KeyDownEvent;
             ug_name1.KeyDown += KeyDownEvent;
-            //asc.controllInitializeSize(this);
+            asc.controllInitializeSize(this);
         }
 
         private void 人员分组_SizeChanged(object sender, EventArgs e)
         {
-            //asc.controlAutoSize(this);
+            asc.controlAutoSize(this);
         }
 
         private void Screen_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/Employee/Employee_NewGroup.Designer.cs

@@ -45,8 +45,9 @@
             this.headBar1.Location = new System.Drawing.Point(0, 0);
             this.headBar1.Margin = new System.Windows.Forms.Padding(4);
             this.headBar1.Name = "headBar1";
-            this.headBar1.Size = new System.Drawing.Size(463, 40);
+            this.headBar1.Size = new System.Drawing.Size(439, 40);
             this.headBar1.TabIndex = 0;
+            this.headBar1.Title = null;
             // 
             // ProductName
             // 
@@ -65,7 +66,7 @@
             // 
             this.ug_code_label.AutoSize = true;
             this.ug_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_code_label.Location = new System.Drawing.Point(34, 88);
+            this.ug_code_label.Location = new System.Drawing.Point(22, 88);
             this.ug_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_code_label.Name = "ug_code_label";
             this.ug_code_label.Size = new System.Drawing.Size(112, 27);
@@ -76,7 +77,7 @@
             // 
             this.ug_name_label.AutoSize = true;
             this.ug_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_name_label.Location = new System.Drawing.Point(34, 148);
+            this.ug_name_label.Location = new System.Drawing.Point(22, 148);
             this.ug_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_name_label.Name = "ug_name_label";
             this.ug_name_label.Size = new System.Drawing.Size(112, 27);
@@ -91,12 +92,12 @@
             this.SaveGroup.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.SaveGroup.Image = null;
             this.SaveGroup.IsShowBorder = true;
-            this.SaveGroup.Location = new System.Drawing.Point(194, 212);
+            this.SaveGroup.Location = new System.Drawing.Point(191, 212);
             this.SaveGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveGroup.MoveImage")));
             this.SaveGroup.Name = "SaveGroup";
             this.SaveGroup.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveGroup.NormalImage")));
             this.SaveGroup.Power = null;
-            this.SaveGroup.Size = new System.Drawing.Size(75, 39);
+            this.SaveGroup.Size = new System.Drawing.Size(60, 30);
             this.SaveGroup.TabIndex = 16;
             this.SaveGroup.Text = "保存";
             this.SaveGroup.UseVisualStyleBackColor = false;
@@ -107,7 +108,7 @@
             this.ug_code.AllPower = null;
             this.ug_code.BackColor = System.Drawing.Color.White;
             this.ug_code.ID = null;
-            this.ug_code.Location = new System.Drawing.Point(182, 88);
+            this.ug_code.Location = new System.Drawing.Point(170, 88);
             this.ug_code.Name = "ug_code";
             this.ug_code.Power = null;
             this.ug_code.Size = new System.Drawing.Size(235, 25);
@@ -121,7 +122,7 @@
             this.ug_name.AllPower = null;
             this.ug_name.BackColor = System.Drawing.Color.White;
             this.ug_name.ID = null;
-            this.ug_name.Location = new System.Drawing.Point(182, 148);
+            this.ug_name.Location = new System.Drawing.Point(170, 148);
             this.ug_name.Name = "ug_name";
             this.ug_name.Power = null;
             this.ug_name.Size = new System.Drawing.Size(235, 25);
@@ -130,11 +131,11 @@
             this.ug_name.Str2 = null;
             this.ug_name.TabIndex = 18;
             // 
-            // 新增分组
+            // Employee_NewGroup
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(463, 283);
+            this.ClientSize = new System.Drawing.Size(439, 266);
             this.Controls.Add(this.ug_name);
             this.Controls.Add(this.ug_code);
             this.Controls.Add(this.SaveGroup);
@@ -143,7 +144,7 @@
             this.Controls.Add(this.ProductName);
             this.Controls.Add(this.headBar1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "新增分组";
+            this.Name = "Employee_NewGroup";
             this.Tag = "ShowDialogWindow";
             this.Text = "新增分组";
             this.Load += new System.EventHandler(this.新增分组_Load);

UAS-MES/FunctionCode/Employee/Employee_Power.Designer.cs

@@ -125,7 +125,7 @@
             this.SavePower.DownImage = ((System.Drawing.Image)(resources.GetObject("SavePower.DownImage")));
             this.SavePower.Image = ((System.Drawing.Image)(resources.GetObject("SavePower.Image")));
             this.SavePower.IsShowBorder = true;
-            this.SavePower.Location = new System.Drawing.Point(537, 571);
+            this.SavePower.Location = new System.Drawing.Point(484, 575);
             this.SavePower.Margin = new System.Windows.Forms.Padding(4);
             this.SavePower.MoveImage = ((System.Drawing.Image)(resources.GetObject("SavePower.MoveImage")));
             this.SavePower.Name = "SavePower";
@@ -153,7 +153,7 @@
             this.GroupPowerDGV.Margin = new System.Windows.Forms.Padding(4);
             this.GroupPowerDGV.Name = "GroupPowerDGV";
             this.GroupPowerDGV.RowTemplate.Height = 23;
-            this.GroupPowerDGV.Size = new System.Drawing.Size(1140, 500);
+            this.GroupPowerDGV.Size = new System.Drawing.Size(1038, 500);
             this.GroupPowerDGV.TabIndex = 0;
             this.GroupPowerDGV.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.GroupPower_DataError);
             // 
@@ -198,7 +198,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1149, 619);
+            this.ClientSize = new System.Drawing.Size(1045, 619);
             this.Controls.Add(this.sn_module);
             this.Controls.Add(this.ug_code);
             this.Controls.Add(this.Screen);

UAS-MES/FunctionCode/Employee/Employee_PowerSarch.Designer.cs

@@ -106,7 +106,7 @@
             this.PowerSearchDGV.Name = "PowerSearchDGV";
             this.PowerSearchDGV.ReadOnly = true;
             this.PowerSearchDGV.RowTemplate.Height = 23;
-            this.PowerSearchDGV.Size = new System.Drawing.Size(1195, 606);
+            this.PowerSearchDGV.Size = new System.Drawing.Size(1089, 606);
             this.PowerSearchDGV.TabIndex = 220;
             // 
             // ug_group
@@ -239,7 +239,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1197, 698);
+            this.ClientSize = new System.Drawing.Size(1093, 698);
             this.Controls.Add(this.PowerSearchDGV);
             this.Controls.Add(this.Screen);
             this.Controls.Add(this.ug_code);

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

@@ -224,7 +224,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(18, 403);
+            this.pr_detail_label.Location = new System.Drawing.Point(18, 407);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
@@ -501,7 +501,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(139, 403);
+            this.pr_detail.Location = new System.Drawing.Point(139, 407);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);