解决冲突

UAS-MES/CustomControl/AccordionMenu/AccordionMenu.Designer.cs

@@ -49,6 +49,8 @@
             this.仓库作业 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.特殊作业 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.产线作业 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.包装作业_lsv = new System.Windows.Forms.ListView();
+            this.包装作业 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.SuspendLayout();
             // 
             // SMT作业_lsv
@@ -156,7 +158,7 @@
             this.人员管理_lsv.Name = "人员管理_lsv";
             this.人员管理_lsv.Size = new System.Drawing.Size(160, 309);
             this.人员管理_lsv.TabIndex = 13;
-            this.人员管理_lsv.Tag = "OQC作业_lsv";
+            this.人员管理_lsv.Tag = "人员管理_lsv";
             this.人员管理_lsv.UseCompatibleStateImageBehavior = false;
             this.人员管理_lsv.View = System.Windows.Forms.View.SmallIcon;
             this.人员管理_lsv.Visible = false;
@@ -350,10 +352,46 @@
             this.产线作业.UseVisualStyleBackColor = true;
             this.产线作业.Visible = false;
             // 
+            // 包装作业_lsv
+            // 
+            this.包装作业_lsv.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.包装作业_lsv.Location = new System.Drawing.Point(1555, 108);
+            this.包装作业_lsv.Margin = new System.Windows.Forms.Padding(4);
+            this.包装作业_lsv.Name = "包装作业_lsv";
+            this.包装作业_lsv.Size = new System.Drawing.Size(160, 309);
+            this.包装作业_lsv.TabIndex = 17;
+            this.包装作业_lsv.Tag = "包装作业_lsv";
+            this.包装作业_lsv.UseCompatibleStateImageBehavior = false;
+            this.包装作业_lsv.View = System.Windows.Forms.View.SmallIcon;
+            this.包装作业_lsv.Visible = false;
+            // 
+            // 包装作业
+            // 
+            this.包装作业.AllPower = null;
+            this.包装作业.BackColor = System.Drawing.Color.Transparent;
+            this.包装作业.DownImage = ((System.Drawing.Image)(resources.GetObject("包装作业.DownImage")));
+            this.包装作业.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.包装作业.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.包装作业.Image = global::UAS_MES.Properties.Resources._2_0btn_36;
+            this.包装作业.IsShowBorder = true;
+            this.包装作业.Location = new System.Drawing.Point(1555, 30);
+            this.包装作业.Margin = new System.Windows.Forms.Padding(4);
+            this.包装作业.MoveImage = ((System.Drawing.Image)(resources.GetObject("包装作业.MoveImage")));
+            this.包装作业.Name = "包装作业";
+            this.包装作业.NormalImage = ((System.Drawing.Image)(resources.GetObject("包装作业.NormalImage")));
+            this.包装作业.Power = null;
+            this.包装作业.Size = new System.Drawing.Size(161, 50);
+            this.包装作业.TabIndex = 16;
+            this.包装作业.Text = "包装作业";
+            this.包装作业.UseVisualStyleBackColor = true;
+            this.包装作业.Visible = false;
+            // 
             // AccordionMenu
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.包装作业_lsv);
+            this.Controls.Add(this.包装作业);
             this.Controls.Add(this.库存管理);
             this.Controls.Add(this.SMT作业);
             this.Controls.Add(this.人员管理_lsv);
@@ -374,7 +412,7 @@
             this.Controls.Add(this.SMT作业_lsv);
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "AccordionMenu";
-            this.Size = new System.Drawing.Size(1560, 452);
+            this.Size = new System.Drawing.Size(1741, 452);
             this.Load += new System.EventHandler(this.AccordionMenu_Load);
             this.ResumeLayout(false);
 
@@ -400,5 +438,7 @@
         private ButtonUtil.NormalButton 查询分析;
         private ButtonUtil.NormalButton OQC作业;
         private ButtonUtil.NormalButton 人员管理;
+        private System.Windows.Forms.ListView 包装作业_lsv;
+        private ButtonUtil.NormalButton 包装作业;
     }
 }

UAS-MES/CustomControl/AccordionMenu/AccordionMenu.resx

@@ -740,6 +740,44 @@
         2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
         zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="包装作业.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="包装作业.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="包装作业.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
 </root>

UAS-MES/Login.cs

@@ -39,6 +39,7 @@ namespace UAS_MES
 
         private void Login_Load(object sender, EventArgs e)
         {
+            BaseUtil.FormStepInOrOut(this, true);
             //设置默认数据库
             SystemInf.DefaultDB = Properties.Settings.Default.Properties["MES"].DefaultValue.ToString();
             SystemInf.ProcessesID = System.Diagnostics.Process.GetCurrentProcess().Id;
@@ -214,6 +215,7 @@ namespace UAS_MES
 
         private void Login_FormClosing(object sender, FormClosingEventArgs e)
         {
+            BaseUtil.FormStepInOrOut(this, false);
             try
             {
                 dh.Dispose();

UAS-MES/Main.Designer.cs

@@ -59,9 +59,10 @@
             this.ProductName.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.ProductName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ProductName.ForeColor = System.Drawing.SystemColors.ButtonFace;
-            this.ProductName.Location = new System.Drawing.Point(81, 3);
+            this.ProductName.Location = new System.Drawing.Point(108, 4);
+            this.ProductName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ProductName.Name = "ProductName";
-            this.ProductName.Size = new System.Drawing.Size(170, 21);
+            this.ProductName.Size = new System.Drawing.Size(212, 27);
             this.ProductName.TabIndex = 3;
             this.ProductName.Text = "优软科技制造执行系统";
             // 
@@ -72,10 +73,11 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.MainTabControl.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.MainTabControl.ItemSize = new System.Drawing.Size(96, 25);
-            this.MainTabControl.Location = new System.Drawing.Point(140, 32);
+            this.MainTabControl.Location = new System.Drawing.Point(187, 40);
+            this.MainTabControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.MainTabControl.Name = "MainTabControl";
             this.MainTabControl.SelectedIndex = 0;
-            this.MainTabControl.Size = new System.Drawing.Size(838, 560);
+            this.MainTabControl.Size = new System.Drawing.Size(1117, 700);
             this.MainTabControl.TabIndex = 7;
             this.MainTabControl.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.MainTabControl_ControlRemoved);
             // 
@@ -84,9 +86,10 @@
             this.name_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.name_label.AutoSize = true;
             this.name_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.name_label.Location = new System.Drawing.Point(6, 8);
+            this.name_label.Location = new System.Drawing.Point(8, 10);
+            this.name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.name_label.Name = "name_label";
-            this.name_label.Size = new System.Drawing.Size(35, 17);
+            this.name_label.Size = new System.Drawing.Size(43, 20);
             this.name_label.TabIndex = 4;
             this.name_label.Text = "姓名:";
             // 
@@ -103,9 +106,10 @@
             this.BasicInf.Controls.Add(this.Inf_source_label);
             this.BasicInf.Controls.Add(this.name_label);
             this.BasicInf.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.BasicInf.Location = new System.Drawing.Point(0, 593);
+            this.BasicInf.Location = new System.Drawing.Point(0, 741);
+            this.BasicInf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.BasicInf.Name = "BasicInf";
-            this.BasicInf.Size = new System.Drawing.Size(978, 31);
+            this.BasicInf.Size = new System.Drawing.Size(1304, 39);
             this.BasicInf.TabIndex = 6;
             // 
             // inf_currentstep
@@ -113,9 +117,10 @@
             this.inf_currentstep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_currentstep.AutoSize = true;
             this.inf_currentstep.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_currentstep.Location = new System.Drawing.Point(228, 8);
+            this.inf_currentstep.Location = new System.Drawing.Point(304, 10);
+            this.inf_currentstep.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_currentstep.Name = "inf_currentstep";
-            this.inf_currentstep.Size = new System.Drawing.Size(0, 17);
+            this.inf_currentstep.Size = new System.Drawing.Size(0, 20);
             this.inf_currentstep.TabIndex = 15;
             // 
             // step_label
@@ -123,9 +128,10 @@
             this.step_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.step_label.AutoSize = true;
             this.step_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.step_label.Location = new System.Drawing.Point(147, 8);
+            this.step_label.Location = new System.Drawing.Point(196, 10);
+            this.step_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.step_label.Name = "step_label";
-            this.step_label.Size = new System.Drawing.Size(59, 17);
+            this.step_label.Size = new System.Drawing.Size(73, 20);
             this.step_label.TabIndex = 14;
             this.step_label.Text = "岗位工序:";
             // 
@@ -134,9 +140,10 @@
             this.inf_name.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_name.AutoSize = true;
             this.inf_name.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_name.Location = new System.Drawing.Point(64, 8);
+            this.inf_name.Location = new System.Drawing.Point(85, 10);
+            this.inf_name.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_name.Name = "inf_name";
-            this.inf_name.Size = new System.Drawing.Size(0, 17);
+            this.inf_name.Size = new System.Drawing.Size(0, 20);
             this.inf_name.TabIndex = 13;
             // 
             // Inf_linecode
@@ -144,9 +151,10 @@
             this.Inf_linecode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode.AutoSize = true;
             this.Inf_linecode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode.Location = new System.Drawing.Point(406, 8);
+            this.Inf_linecode.Location = new System.Drawing.Point(541, 10);
+            this.Inf_linecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_linecode.Name = "Inf_linecode";
-            this.Inf_linecode.Size = new System.Drawing.Size(0, 17);
+            this.Inf_linecode.Size = new System.Drawing.Size(0, 20);
             this.Inf_linecode.TabIndex = 11;
             // 
             // inf_source
@@ -154,9 +162,10 @@
             this.inf_source.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_source.AutoSize = true;
             this.inf_source.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_source.Location = new System.Drawing.Point(565, 8);
+            this.inf_source.Location = new System.Drawing.Point(753, 10);
+            this.inf_source.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_source.Name = "inf_source";
-            this.inf_source.Size = new System.Drawing.Size(0, 17);
+            this.inf_source.Size = new System.Drawing.Size(0, 20);
             this.inf_source.TabIndex = 10;
             // 
             // inf_db
@@ -164,9 +173,10 @@
             this.inf_db.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_db.AutoSize = true;
             this.inf_db.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_db.Location = new System.Drawing.Point(772, 8);
+            this.inf_db.Location = new System.Drawing.Point(1029, 10);
+            this.inf_db.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_db.Name = "inf_db";
-            this.inf_db.Size = new System.Drawing.Size(0, 17);
+            this.inf_db.Size = new System.Drawing.Size(0, 20);
             this.inf_db.TabIndex = 9;
             // 
             // Inf_linecode_label
@@ -174,9 +184,10 @@
             this.Inf_linecode_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode_label.AutoSize = true;
             this.Inf_linecode_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode_label.Location = new System.Drawing.Point(346, 8);
+            this.Inf_linecode_label.Location = new System.Drawing.Point(461, 10);
+            this.Inf_linecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_linecode_label.Name = "Inf_linecode_label";
-            this.Inf_linecode_label.Size = new System.Drawing.Size(35, 17);
+            this.Inf_linecode_label.Size = new System.Drawing.Size(43, 20);
             this.Inf_linecode_label.TabIndex = 8;
             this.Inf_linecode_label.Text = "线别:";
             // 
@@ -185,9 +196,10 @@
             this.db_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.db_label.AutoSize = true;
             this.db_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.db_label.Location = new System.Drawing.Point(701, 8);
+            this.db_label.Location = new System.Drawing.Point(935, 10);
+            this.db_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.db_label.Name = "db_label";
-            this.db_label.Size = new System.Drawing.Size(47, 17);
+            this.db_label.Size = new System.Drawing.Size(58, 20);
             this.db_label.TabIndex = 7;
             this.db_label.Text = "数据库:";
             // 
@@ -196,9 +208,10 @@
             this.Inf_source_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_source_label.AutoSize = true;
             this.Inf_source_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_source_label.Location = new System.Drawing.Point(505, 8);
+            this.Inf_source_label.Location = new System.Drawing.Point(673, 10);
+            this.Inf_source_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_source_label.Name = "Inf_source_label";
-            this.Inf_source_label.Size = new System.Drawing.Size(35, 17);
+            this.Inf_source_label.Size = new System.Drawing.Size(43, 20);
             this.Inf_source_label.TabIndex = 6;
             this.Inf_source_label.Text = "资源:";
             // 
@@ -208,18 +221,19 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel1.Controls.Add(this.Menu);
-            this.panel1.Location = new System.Drawing.Point(0, 32);
+            this.panel1.Location = new System.Drawing.Point(0, 40);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(139, 562);
+            this.panel1.Size = new System.Drawing.Size(185, 702);
             this.panel1.TabIndex = 1;
             // 
             // Menu
             // 
             this.Menu.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Menu.Location = new System.Drawing.Point(0, 0);
-            this.Menu.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Menu.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.Menu.Name = "Menu";
-            this.Menu.Size = new System.Drawing.Size(137, 560);
+            this.Menu.Size = new System.Drawing.Size(183, 700);
             this.Menu.TabIndex = 3;
             // 
             // notifyIcon1
@@ -231,8 +245,9 @@
             // 
             this.pictureBox1.Image = global::UAS_MES.Properties.Resources.uas_blue;
             this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(75, 33);
+            this.pictureBox1.Size = new System.Drawing.Size(100, 41);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureBox1.TabIndex = 4;
             this.pictureBox1.TabStop = false;
@@ -242,17 +257,17 @@
             this.headBar1.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.headBar1.Dock = System.Windows.Forms.DockStyle.Top;
             this.headBar1.Location = new System.Drawing.Point(0, 0);
-            this.headBar1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.headBar1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.headBar1.Name = "headBar1";
-            this.headBar1.Size = new System.Drawing.Size(978, 32);
+            this.headBar1.Size = new System.Drawing.Size(1304, 40);
             this.headBar1.TabIndex = 0;
             this.headBar1.Title = null;
             // 
             // Main
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(978, 624);
+            this.ClientSize = new System.Drawing.Size(1304, 780);
             this.Controls.Add(this.BasicInf);
             this.Controls.Add(this.MainTabControl);
             this.Controls.Add(this.pictureBox1);
@@ -261,8 +276,10 @@
             this.Controls.Add(this.headBar1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Main";
             this.Text = "优软科技MES系统";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
             this.Load += new System.EventHandler(this.Main_Load);
             this.BasicInf.ResumeLayout(false);
             this.BasicInf.PerformLayout();

UAS-MES/Main.cs

@@ -310,5 +310,10 @@ namespace UAS_MES
                 this.Close();
             }
         }
+
+        private void Main_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            BaseUtil.FormStepInOrOut(this, false);
+        }
     }
 }

UAS-MES/PublicMethod/BaseUtil.cs

@@ -1194,6 +1194,34 @@ namespace UAS_MES.PublicMethod
             outFileStream.Close();
 
         }
-    }
-}
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="form"></param>
+        /// <param name="InOrOut">True表示打开窗体，False表示关闭窗体</param>
+        public static void FormStepInOrOut(Form form, bool InOrOut)
+        {
+            if (InOrOut)
+            {
+                for (int iNum = 0; iNum <= 10; iNum++)
+                {
+                    //变更窗体的不透明度
+                    form.Opacity = 0.1 * iNum;
+                    //暂停
+                    System.Threading.Thread.Sleep(20);
+                }
+            }
+            else
+            {
+                for (int iNum = 10; iNum >= 0; iNum--)
+                {
+                    //变更窗体的不透明度
+                    form.Opacity = 0.1 * iNum;
+                    //暂停
+                    System.Threading.Thread.Sleep(20);
+                }
+            }
+        }
+    }
+}