diff --git a/DHSoftware/MainWindow.Designer.cs b/DHSoftware/MainWindow.Designer.cs index c2695b5..040fb0b 100644 --- a/DHSoftware/MainWindow.Designer.cs +++ b/DHSoftware/MainWindow.Designer.cs @@ -70,6 +70,9 @@ btnLoadProject = new AntdUI.Button(); sltProjects = new AntdUI.Select(); segmented1 = new AntdUI.Segmented(); + pageHeader1 = new AntdUI.PageHeader(); + lbInBackend = new AntdUI.Label(); + divider2 = new AntdUI.Divider(); titlebar.SuspendLayout(); tabsStas.SuspendLayout(); tabPage3.SuspendLayout(); @@ -91,6 +94,7 @@ tableLayoutPanel3.SuspendLayout(); panel1.SuspendLayout(); panel3.SuspendLayout(); + pageHeader1.SuspendLayout(); SuspendLayout(); // // titlebar @@ -168,7 +172,7 @@ panelmain.Location = new Point(0, 40); panelmain.Margin = new Padding(0); panelmain.Name = "panelmain"; - panelmain.Size = new Size(1024, 631); + panelmain.Size = new Size(1024, 591); panelmain.TabIndex = 8; // // splitter2 @@ -185,8 +189,8 @@ // splitter2.Panel2 // splitter2.Panel2.Controls.Add(splitter1); - splitter2.Size = new Size(1024, 563); - splitter2.SplitterDistance = 442; + splitter2.Size = new Size(1024, 523); + splitter2.SplitterDistance = 410; splitter2.TabIndex = 4; // // tabImgDisplay @@ -194,7 +198,7 @@ tabImgDisplay.Dock = DockStyle.Fill; tabImgDisplay.Location = new Point(0, 0); tabImgDisplay.Name = "tabImgDisplay"; - tabImgDisplay.Size = new Size(1024, 442); + tabImgDisplay.Size = new Size(1024, 410); tabImgDisplay.Style = styleCard1; tabImgDisplay.TabIndex = 3; tabImgDisplay.Text = "tabs1"; @@ -212,7 +216,7 @@ // splitter1.Panel2 // splitter1.Panel2.Controls.Add(panel6); - splitter1.Size = new Size(1024, 117); + splitter1.Size = new Size(1024, 109); splitter1.SplitterDistance = 332; splitter1.TabIndex = 3; // @@ -221,7 +225,7 @@ pnlLog.Dock = DockStyle.Fill; pnlLog.Location = new Point(0, 0); pnlLog.Name = "pnlLog"; - pnlLog.Size = new Size(332, 117); + pnlLog.Size = new Size(332, 109); pnlLog.TabIndex = 2; pnlLog.Text = "panel8"; // @@ -231,7 +235,7 @@ panel6.Dock = DockStyle.Fill; panel6.Location = new Point(0, 0); panel6.Name = "panel6"; - panel6.Size = new Size(688, 117); + panel6.Size = new Size(688, 109); panel6.TabIndex = 0; panel6.Text = "panel6"; // @@ -247,7 +251,7 @@ tableLayoutstatistics.Name = "tableLayoutstatistics"; tableLayoutstatistics.RowCount = 1; tableLayoutstatistics.RowStyles.Add(new RowStyle(SizeType.Percent, 50F)); - tableLayoutstatistics.Size = new Size(688, 117); + tableLayoutstatistics.Size = new Size(688, 109); tableLayoutstatistics.TabIndex = 9; // // dgvCamreaNums @@ -271,7 +275,7 @@ dgvCamreaNums.ReadOnly = true; dgvCamreaNums.RowHeadersVisible = false; dgvCamreaNums.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dgvCamreaNums.Size = new Size(338, 102); + dgvCamreaNums.Size = new Size(338, 94); dgvCamreaNums.TabIndex = 9; // // panelNums @@ -280,7 +284,7 @@ panelNums.Dock = DockStyle.Fill; panelNums.Location = new Point(347, 3); panelNums.Name = "panelNums"; - panelNums.Size = new Size(338, 111); + panelNums.Size = new Size(338, 103); panelNums.TabIndex = 8; panelNums.Text = "panel4"; // @@ -297,7 +301,7 @@ tableLayoutNums.RowStyles.Add(new RowStyle(SizeType.Percent, 50F)); tableLayoutNums.RowStyles.Add(new RowStyle(SizeType.Percent, 50F)); tableLayoutNums.RowStyles.Add(new RowStyle(SizeType.Absolute, 20F)); - tableLayoutNums.Size = new Size(338, 111); + tableLayoutNums.Size = new Size(338, 103); tableLayoutNums.TabIndex = 8; // // dgvProductNums @@ -322,7 +326,7 @@ dgvProductNums.RowHeadersBorderStyle = DataGridViewHeaderBorderStyle.None; dgvProductNums.RowHeadersVisible = false; dgvProductNums.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dgvProductNums.Size = new Size(332, 45); + dgvProductNums.Size = new Size(332, 41); dgvProductNums.TabIndex = 10; // // tableLayoutPanel3 @@ -341,21 +345,21 @@ tableLayoutPanel3.Controls.Add(label10, 0, 0); tableLayoutPanel3.Controls.Add(label7, 2, 0); tableLayoutPanel3.Dock = DockStyle.Fill; - tableLayoutPanel3.Location = new Point(3, 58); + tableLayoutPanel3.Location = new Point(3, 54); tableLayoutPanel3.Name = "tableLayoutPanel3"; tableLayoutPanel3.RowCount = 2; tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Percent, 50F)); tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Percent, 50F)); - tableLayoutPanel3.Size = new Size(332, 50); + tableLayoutPanel3.Size = new Size(332, 46); tableLayoutPanel3.TabIndex = 11; // // lblTotalTime // lblTotalTime.AutoSize = true; lblTotalTime.Dock = DockStyle.Fill; - lblTotalTime.Location = new Point(86, 25); + lblTotalTime.Location = new Point(86, 23); lblTotalTime.Name = "lblTotalTime"; - lblTotalTime.Size = new Size(77, 25); + lblTotalTime.Size = new Size(77, 23); lblTotalTime.TabIndex = 15; lblTotalTime.Text = "0"; lblTotalTime.TextAlign = ContentAlignment.MiddleCenter; @@ -364,9 +368,9 @@ // label1.AutoSize = true; label1.Dock = DockStyle.Fill; - label1.Location = new Point(169, 25); + label1.Location = new Point(169, 23); label1.Name = "label1"; - label1.Size = new Size(77, 25); + label1.Size = new Size(77, 23); label1.TabIndex = 8; label1.Text = "UPH"; label1.TextAlign = ContentAlignment.MiddleCenter; @@ -375,9 +379,9 @@ // label12.AutoSize = true; label12.Dock = DockStyle.Fill; - label12.Location = new Point(3, 25); + label12.Location = new Point(3, 23); label12.Name = "label12"; - label12.Size = new Size(77, 25); + label12.Size = new Size(77, 23); label12.TabIndex = 14; label12.Text = "运行时间"; label12.TextAlign = ContentAlignment.MiddleCenter; @@ -386,9 +390,9 @@ // lblUPH.AutoSize = true; lblUPH.Dock = DockStyle.Fill; - lblUPH.Location = new Point(252, 25); + lblUPH.Location = new Point(252, 23); lblUPH.Name = "lblUPH"; - lblUPH.Size = new Size(77, 25); + lblUPH.Size = new Size(77, 23); lblUPH.TabIndex = 9; lblUPH.Text = "0"; lblUPH.TextAlign = ContentAlignment.MiddleCenter; @@ -399,7 +403,7 @@ lblStartTime.Dock = DockStyle.Fill; lblStartTime.Location = new Point(86, 0); lblStartTime.Name = "lblStartTime"; - lblStartTime.Size = new Size(77, 25); + lblStartTime.Size = new Size(77, 23); lblStartTime.TabIndex = 11; lblStartTime.Text = "0"; lblStartTime.TextAlign = ContentAlignment.MiddleCenter; @@ -410,7 +414,7 @@ lblOEE_Total.Dock = DockStyle.Fill; lblOEE_Total.Location = new Point(252, 0); lblOEE_Total.Name = "lblOEE_Total"; - lblOEE_Total.Size = new Size(77, 25); + lblOEE_Total.Size = new Size(77, 23); lblOEE_Total.TabIndex = 13; lblOEE_Total.Text = "0"; lblOEE_Total.TextAlign = ContentAlignment.MiddleCenter; @@ -421,7 +425,7 @@ label10.Dock = DockStyle.Fill; label10.Location = new Point(3, 0); label10.Name = "label10"; - label10.Size = new Size(77, 25); + label10.Size = new Size(77, 23); label10.TabIndex = 12; label10.Text = "开始时间"; label10.TextAlign = ContentAlignment.MiddleCenter; @@ -432,7 +436,7 @@ label7.Dock = DockStyle.Fill; label7.Location = new Point(169, 0); label7.Name = "label7"; - label7.Size = new Size(77, 25); + label7.Size = new Size(77, 23); label7.TabIndex = 10; label7.Text = "总计数"; label7.TextAlign = ContentAlignment.MiddleCenter; @@ -594,11 +598,48 @@ segmented1.Text = "segmented1"; segmented1.SelectIndexChanged += segmented1_SelectIndexChanged; // + // pageHeader1 + // + pageHeader1.Controls.Add(lbInBackend); + pageHeader1.Controls.Add(divider2); + pageHeader1.DividerShow = true; + pageHeader1.Dock = DockStyle.Bottom; + pageHeader1.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); + pageHeader1.Location = new Point(0, 631); + pageHeader1.Name = "pageHeader1"; + pageHeader1.Size = new Size(1024, 40); + pageHeader1.TabIndex = 7; + pageHeader1.Text = ""; + // + // lbInBackend + // + lbInBackend.BackColor = Color.Transparent; + lbInBackend.Dock = DockStyle.Right; + lbInBackend.ForeColor = Color.FromArgb(46, 108, 227); + lbInBackend.Location = new Point(949, 10); + lbInBackend.Name = "lbInBackend"; + lbInBackend.Size = new Size(75, 30); + lbInBackend.TabIndex = 3; + lbInBackend.Tag = "sys-back"; + lbInBackend.Text = "系统后台"; + lbInBackend.Visible = false; + // + // divider2 + // + divider2.Dock = DockStyle.Top; + divider2.Location = new Point(0, 0); + divider2.Name = "divider2"; + divider2.OrientationMargin = 0F; + divider2.Size = new Size(1024, 10); + divider2.TabIndex = 0; + divider2.Text = ""; + // // MainWindow // ClientSize = new Size(1024, 671); ControlBox = false; Controls.Add(panelmain); + Controls.Add(pageHeader1); Controls.Add(titlebar); Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); Icon = (Icon)resources.GetObject("$this.Icon"); @@ -630,12 +671,15 @@ tableLayoutPanel3.PerformLayout(); panel1.ResumeLayout(false); panel3.ResumeLayout(false); + pageHeader1.ResumeLayout(false); ResumeLayout(false); } #endregion private AntdUI.PageHeader titlebar; + private AntdUI.PageHeader pageHeader1; + private AntdUI.Divider divider2; private AntdUI.Panel panelmain; private AntdUI.Panel panel1; private AntdUI.Segmented segmented1; @@ -678,8 +722,8 @@ private Label lblStartTime; private Label label10; private Label lblstarttime2; - private Label label7; - private AntdUI.Panel pnlLog; + // private Label label7; + // private AntdUI.Panel pnlLog; private AntdUI.Label lbInBackend; private DataGridView dgvProductNums; private TableLayoutPanel tableLayoutPanel3;