Skip to content

李娜 / SO664-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4f4fa737 由 LN
选项

界面调整

1 个父辈 d75e1381
内嵌 并排
正在显示 8 个修改的文件 包含 621 行增加 和 431 行删除
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -52,10 +52,44 @@ ...@@ -52,10 +52,44 @@
this.logBox = new System.Windows.Forms.RichTextBox(); this.logBox = new System.Windows.Forms.RichTextBox();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panMove = new System.Windows.Forms.TableLayoutPanel();
this.panel17 = new System.Windows.Forms.Panel();
this.label23 = new System.Windows.Forms.Label();
this.panel16 = new System.Windows.Forms.Panel();
this.label21 = new System.Windows.Forms.Label();
this.panel15 = new System.Windows.Forms.Panel();
this.label19 = new System.Windows.Forms.Label();
this.panel14 = new System.Windows.Forms.Panel();
this.label17 = new System.Windows.Forms.Label();
this.panel11 = new System.Windows.Forms.Panel();
this.label24 = new System.Windows.Forms.Label();
this.panel6 = new System.Windows.Forms.Panel();
this.label8 = new System.Windows.Forms.Label();
this.panel7 = new System.Windows.Forms.Panel();
this.label16 = new System.Windows.Forms.Label();
this.panel8 = new System.Windows.Forms.Panel();
this.label18 = new System.Windows.Forms.Label();
this.panel9 = new System.Windows.Forms.Panel();
this.label20 = new System.Windows.Forms.Label();
this.panel10 = new System.Windows.Forms.Panel();
this.label22 = new System.Windows.Forms.Label();
this.panel12 = new System.Windows.Forms.Panel();
this.label9 = new System.Windows.Forms.Label();
this.panel13 = new System.Windows.Forms.Panel();
this.label15 = new System.Windows.Forms.Label();
this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage();
this.panel3 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.panHY = new System.Windows.Forms.TableLayoutPanel();
this.panel1 = new System.Windows.Forms.Panel();
this.label3 = new System.Windows.Forms.Label();
this.lblOpText = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.lblCID = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.panSL = new System.Windows.Forms.TableLayoutPanel();
this.panel4 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.lblOpText2 = new System.Windows.Forms.Label(); this.lblOpText2 = new System.Windows.Forms.Label();
...@@ -64,17 +98,10 @@ ...@@ -64,17 +98,10 @@
this.label12 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label();
this.label33 = new System.Windows.Forms.Label();
this.tabPage5 = new System.Windows.Forms.TabPage(); this.tabPage5 = new System.Windows.Forms.TabPage();
this.panel5 = new System.Windows.Forms.Panel(); this.panel5 = new System.Windows.Forms.Panel();
this.picLine = new System.Windows.Forms.PictureBox(); this.picLine = new System.Windows.Forms.PictureBox();
this.panel1 = new System.Windows.Forms.Panel();
this.label3 = new System.Windows.Forms.Label();
this.lblOpText = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.lblCID = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.lblStatus = new System.Windows.Forms.Label(); this.lblStatus = new System.Windows.Forms.Label();
this.lblWarnMsg = new System.Windows.Forms.Label(); this.lblWarnMsg = new System.Windows.Forms.Label();
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
...@@ -134,48 +161,38 @@ ...@@ -134,48 +161,38 @@
this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
this.control_Debug = new System.Windows.Forms.ToolStripMenuItem(); this.control_Debug = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
this.label8 = new System.Windows.Forms.Label();
this.panel6 = new System.Windows.Forms.Panel();
this.label9 = new System.Windows.Forms.Label();
this.panel7 = new System.Windows.Forms.Panel();
this.label15 = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
this.panel8 = new System.Windows.Forms.Panel();
this.label17 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
this.panel9 = new System.Windows.Forms.Panel();
this.label19 = new System.Windows.Forms.Label();
this.label20 = new System.Windows.Forms.Label();
this.panel10 = new System.Windows.Forms.Panel();
this.label21 = new System.Windows.Forms.Label();
this.label22 = new System.Windows.Forms.Label();
this.panel11 = new System.Windows.Forms.Panel();
this.label23 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout(); this.panMove.SuspendLayout();
this.panel17.SuspendLayout();
this.panel16.SuspendLayout();
this.panel15.SuspendLayout();
this.panel14.SuspendLayout();
this.panel11.SuspendLayout();
this.panel6.SuspendLayout();
this.panel7.SuspendLayout();
this.panel8.SuspendLayout();
this.panel9.SuspendLayout();
this.panel10.SuspendLayout();
this.panel12.SuspendLayout();
this.panel13.SuspendLayout();
this.tabPage3.SuspendLayout(); this.tabPage3.SuspendLayout();
this.panel3.SuspendLayout(); this.panel3.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout();
this.panHY.SuspendLayout();
this.panel1.SuspendLayout();
this.panSL.SuspendLayout();
this.panel4.SuspendLayout(); this.panel4.SuspendLayout();
this.tabPage5.SuspendLayout(); this.tabPage5.SuspendLayout();
this.panel5.SuspendLayout(); this.panel5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picLine)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picLine)).BeginInit();
this.panel1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.contextMenuStrip_control.SuspendLayout(); this.contextMenuStrip_control.SuspendLayout();
this.panel6.SuspendLayout();
this.panel7.SuspendLayout();
this.panel8.SuspendLayout();
this.panel9.SuspendLayout();
this.panel10.SuspendLayout();
this.panel11.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// tabControl1 // tabControl1
...@@ -427,39 +444,321 @@ ...@@ -427,39 +444,321 @@
// //
// panel2 // panel2
// //
this.panel2.Controls.Add(this.tableLayoutPanel1); this.panel2.Controls.Add(this.panMove);
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2"; this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1328, 641); this.panel2.Size = new System.Drawing.Size(1328, 641);
this.panel2.TabIndex = 98; this.panel2.TabIndex = 98;
// //
// tableLayoutPanel1 // panMove
// //
this.tableLayoutPanel1.ColumnCount = 6; this.panMove.ColumnCount = 6;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.panMove.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.panMove.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.panMove.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.panMove.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.panMove.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.panMove.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel1.Controls.Add(this.panel11, 4, 2); this.panMove.Controls.Add(this.panel17, 5, 5);
this.tableLayoutPanel1.Controls.Add(this.panel6, 1, 2); this.panMove.Controls.Add(this.panel16, 4, 5);
this.tableLayoutPanel1.Controls.Add(this.panel7, 0, 2); this.panMove.Controls.Add(this.panel15, 3, 5);
this.tableLayoutPanel1.Controls.Add(this.panel8, 2, 2); this.panMove.Controls.Add(this.panel14, 1, 5);
this.tableLayoutPanel1.Controls.Add(this.panel9, 3, 2); this.panMove.Controls.Add(this.panel11, 4, 2);
this.tableLayoutPanel1.Controls.Add(this.panel10, 5, 2); this.panMove.Controls.Add(this.panel6, 1, 2);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panMove.Controls.Add(this.panel7, 0, 2);
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.panMove.Controls.Add(this.panel8, 2, 2);
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.panMove.Controls.Add(this.panel9, 3, 2);
this.tableLayoutPanel1.RowCount = 5; this.panMove.Controls.Add(this.panel10, 5, 2);
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F)); this.panMove.Controls.Add(this.panel12, 0, 5);
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F)); this.panMove.Controls.Add(this.panel13, 2, 5);
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8F)); this.panMove.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F)); this.panMove.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F)); this.panMove.Name = "panMove";
this.tableLayoutPanel1.Size = new System.Drawing.Size(1328, 641); this.panMove.RowCount = 6;
this.tableLayoutPanel1.TabIndex = 10; this.panMove.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F));
this.panMove.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F));
this.panMove.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4F));
this.panMove.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F));
this.panMove.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F));
this.panMove.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4F));
this.panMove.Size = new System.Drawing.Size(1328, 641);
this.panMove.TabIndex = 10;
//
// panel17
//
this.panel17.BackColor = System.Drawing.Color.Transparent;
this.panel17.Controls.Add(this.label23);
this.panel17.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel17.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel17.Location = new System.Drawing.Point(1108, 616);
this.panel17.Name = "panel17";
this.panel17.Size = new System.Drawing.Size(217, 22);
this.panel17.TabIndex = 3;
//
// label23
//
this.label23.BackColor = System.Drawing.Color.Transparent;
this.label23.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label23.Location = new System.Drawing.Point(64, 0);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(70, 26);
this.label23.TabIndex = 0;
this.label23.Text = "D12 ";
this.label23.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label23.Visible = false;
//
// panel16
//
this.panel16.BackColor = System.Drawing.Color.Transparent;
this.panel16.Controls.Add(this.label21);
this.panel16.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel16.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel16.Location = new System.Drawing.Point(887, 616);
this.panel16.Name = "panel16";
this.panel16.Size = new System.Drawing.Size(215, 22);
this.panel16.TabIndex = 3;
//
// label21
//
this.label21.BackColor = System.Drawing.Color.Transparent;
this.label21.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label21.Location = new System.Drawing.Point(64, 0);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(70, 26);
this.label21.TabIndex = 0;
this.label21.Text = "D11 ";
this.label21.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label21.Visible = false;
//
// panel15
//
this.panel15.BackColor = System.Drawing.Color.Transparent;
this.panel15.Controls.Add(this.label19);
this.panel15.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel15.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel15.Location = new System.Drawing.Point(666, 616);
this.panel15.Name = "panel15";
this.panel15.Size = new System.Drawing.Size(215, 22);
this.panel15.TabIndex = 3;
//
// label19
//
this.label19.BackColor = System.Drawing.Color.Transparent;
this.label19.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label19.Location = new System.Drawing.Point(64, 0);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(70, 26);
this.label19.TabIndex = 0;
this.label19.Text = "D10 ";
this.label19.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label19.Visible = false;
//
// panel14
//
this.panel14.BackColor = System.Drawing.Color.Transparent;
this.panel14.Controls.Add(this.label17);
this.panel14.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel14.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel14.Location = new System.Drawing.Point(224, 616);
this.panel14.Name = "panel14";
this.panel14.Size = new System.Drawing.Size(215, 22);
this.panel14.TabIndex = 3;
//
// label17
//
this.label17.BackColor = System.Drawing.Color.Transparent;
this.label17.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.Location = new System.Drawing.Point(64, 0);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(70, 26);
this.label17.TabIndex = 0;
this.label17.Text = "D8 ";
this.label17.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label17.Visible = false;
//
// panel11
//
this.panel11.BackColor = System.Drawing.Color.Transparent;
this.panel11.Controls.Add(this.label24);
this.panel11.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel11.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel11.Location = new System.Drawing.Point(887, 297);
this.panel11.Name = "panel11";
this.panel11.Size = new System.Drawing.Size(215, 19);
this.panel11.TabIndex = 2;
//
// label24
//
this.label24.BackColor = System.Drawing.Color.Transparent;
this.label24.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label24.Location = new System.Drawing.Point(64, 0);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(70, 26);
this.label24.TabIndex = 0;
this.label24.Text = "D5 ";
this.label24.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label24.Visible = false;
//
// panel6
//
this.panel6.BackColor = System.Drawing.Color.Transparent;
this.panel6.Controls.Add(this.label8);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel6.Location = new System.Drawing.Point(224, 297);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(215, 19);
this.panel6.TabIndex = 1;
//
// label8
//
this.label8.BackColor = System.Drawing.Color.Transparent;
this.label8.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(64, 0);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(70, 26);
this.label8.TabIndex = 0;
this.label8.Text = "D2 ";
this.label8.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label8.Visible = false;
//
// panel7
//
this.panel7.BackColor = System.Drawing.Color.Transparent;
this.panel7.Controls.Add(this.label16);
this.panel7.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel7.Location = new System.Drawing.Point(3, 297);
this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(215, 19);
this.panel7.TabIndex = 2;
//
// label16
//
this.label16.BackColor = System.Drawing.Color.Transparent;
this.label16.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label16.Location = new System.Drawing.Point(64, 0);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(70, 26);
this.label16.TabIndex = 0;
this.label16.Text = "D1 ";
this.label16.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label16.Visible = false;
//
// panel8
//
this.panel8.BackColor = System.Drawing.Color.Transparent;
this.panel8.Controls.Add(this.label18);
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel8.Location = new System.Drawing.Point(445, 297);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(215, 19);
this.panel8.TabIndex = 3;
//
// label18
//
this.label18.BackColor = System.Drawing.Color.Transparent;
this.label18.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label18.Location = new System.Drawing.Point(64, 0);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(70, 26);
this.label18.TabIndex = 0;
this.label18.Text = "D3 ";
this.label18.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label18.Visible = false;
//
// panel9
//
this.panel9.BackColor = System.Drawing.Color.Transparent;
this.panel9.Controls.Add(this.label20);
this.panel9.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel9.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel9.Location = new System.Drawing.Point(666, 297);
this.panel9.Name = "panel9";
this.panel9.Size = new System.Drawing.Size(215, 19);
this.panel9.TabIndex = 4;
//
// label20
//
this.label20.BackColor = System.Drawing.Color.Transparent;
this.label20.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label20.Location = new System.Drawing.Point(64, 0);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(70, 26);
this.label20.TabIndex = 0;
this.label20.Text = "D4 ";
this.label20.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label20.Visible = false;
//
// panel10
//
this.panel10.BackColor = System.Drawing.Color.Transparent;
this.panel10.Controls.Add(this.label22);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel10.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel10.Location = new System.Drawing.Point(1108, 297);
this.panel10.Name = "panel10";
this.panel10.Size = new System.Drawing.Size(217, 19);
this.panel10.TabIndex = 5;
//
// label22
//
this.label22.BackColor = System.Drawing.Color.Transparent;
this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label22.Location = new System.Drawing.Point(64, 0);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(70, 26);
this.label22.TabIndex = 0;
this.label22.Text = "D6 ";
this.label22.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label22.Visible = false;
//
// panel12
//
this.panel12.BackColor = System.Drawing.Color.Transparent;
this.panel12.Controls.Add(this.label9);
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel12.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel12.Location = new System.Drawing.Point(3, 616);
this.panel12.Name = "panel12";
this.panel12.Size = new System.Drawing.Size(215, 22);
this.panel12.TabIndex = 6;
//
// label9
//
this.label9.BackColor = System.Drawing.Color.Transparent;
this.label9.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(64, 0);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(70, 26);
this.label9.TabIndex = 0;
this.label9.Text = "D7 ";
this.label9.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label9.Visible = false;
//
// panel13
//
this.panel13.BackColor = System.Drawing.Color.Transparent;
this.panel13.Controls.Add(this.label15);
this.panel13.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel13.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel13.Location = new System.Drawing.Point(445, 616);
this.panel13.Name = "panel13";
this.panel13.Size = new System.Drawing.Size(215, 22);
this.panel13.TabIndex = 7;
//
// label15
//
this.label15.BackColor = System.Drawing.Color.Transparent;
this.label15.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label15.Location = new System.Drawing.Point(64, 0);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(70, 26);
this.label15.TabIndex = 0;
this.label15.Text = "D9 ";
this.label15.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label15.Visible = false;
// //
// tabPage3 // tabPage3
// //
...@@ -471,36 +770,168 @@ ...@@ -471,36 +770,168 @@
this.tabPage3.Text = " 入料/横移 "; this.tabPage3.Text = " 入料/横移 ";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
// //
// panel3 // panel3
//
this.panel3.Controls.Add(this.tableLayoutPanel3);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(0, 0);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(1328, 641);
this.panel3.TabIndex = 0;
//
// tableLayoutPanel3
//
this.tableLayoutPanel3.ColumnCount = 1;
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel3.Controls.Add(this.panHY, 0, 2);
this.tableLayoutPanel3.Controls.Add(this.panSL, 0, 0);
this.tableLayoutPanel3.Controls.Add(this.label33, 0, 1);
this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 4;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 79F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(1328, 641);
this.tableLayoutPanel3.TabIndex = 12;
//
// panHY
//
this.panHY.ColumnCount = 9;
this.panHY.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
this.panHY.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
this.panHY.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
this.panHY.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
this.panHY.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
this.panHY.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
this.panHY.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
this.panHY.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
this.panHY.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F));
this.panHY.Controls.Add(this.panel1, 8, 2);
this.panHY.Dock = System.Windows.Forms.DockStyle.Fill;
this.panHY.Location = new System.Drawing.Point(3, 130);
this.panHY.Name = "panHY";
this.panHY.RowCount = 3;
this.panHY.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
this.panHY.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33445F));
this.panHY.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33112F));
this.panHY.Size = new System.Drawing.Size(1322, 500);
this.panHY.TabIndex = 12;
//
// panel1
//
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.lblOpText);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.label7);
this.panel1.Controls.Add(this.lblCID);
this.panel1.Controls.Add(this.label6);
this.panel1.Controls.Add(this.label5);
this.panel1.Location = new System.Drawing.Point(1171, 335);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(128, 146);
this.panel1.TabIndex = 202;
//
// label3
//
this.label3.BackColor = System.Drawing.Color.LightGray;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label3.Location = new System.Drawing.Point(7, 98);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(109, 18);
this.label3.TabIndex = 202;
this.label3.Text = "灰色：暂未启用";
//
// lblOpText
//
this.lblOpText.BackColor = System.Drawing.Color.White;
this.lblOpText.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblOpText.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblOpText.Location = new System.Drawing.Point(7, 120);
this.lblOpText.Name = "lblOpText";
this.lblOpText.Size = new System.Drawing.Size(109, 18);
this.lblOpText.TabIndex = 201;
this.lblOpText.Text = "双击进入详情界面";
//
// label1
//
this.label1.BackColor = System.Drawing.Color.LightBlue;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label1.Location = new System.Drawing.Point(7, 3);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(109, 18);
this.label1.TabIndex = 197;
this.label1.Text = "蓝色：正常待机中";
//
// label7
//
this.label7.BackColor = System.Drawing.Color.Red;
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label7.Location = new System.Drawing.Point(7, 79);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(109, 18);
this.label7.TabIndex = 200;
this.label7.Text = "红色：严重报警";
//
// lblCID
//
this.lblCID.BackColor = System.Drawing.Color.Orange;
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblCID.Location = new System.Drawing.Point(7, 41);
this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(109, 18);
this.lblCID.TabIndex = 95;
this.lblCID.Text = "橘色：复位中";
//
// label6
//
this.label6.BackColor = System.Drawing.Color.LightCoral;
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label6.Location = new System.Drawing.Point(7, 60);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(109, 18);
this.label6.TabIndex = 199;
this.label6.Text = "珊瑚色：信号超时报警";
//
// label5
// //
this.panel3.Controls.Add(this.tableLayoutPanel2); this.label5.BackColor = System.Drawing.Color.LightGreen;
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel3.Location = new System.Drawing.Point(0, 0); this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.panel3.Name = "panel3"; this.label5.Location = new System.Drawing.Point(7, 22);
this.panel3.Size = new System.Drawing.Size(1328, 641); this.label5.Name = "label5";
this.panel3.TabIndex = 0; this.label5.Size = new System.Drawing.Size(109, 18);
this.label5.TabIndex = 198;
this.label5.Text = "绿色：忙碌中";
// //
// tableLayoutPanel2 // panSL
// //
this.tableLayoutPanel2.ColumnCount = 5; this.panSL.ColumnCount = 5;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.panSL.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.panSL.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.panSL.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.panSL.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.panSL.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel2.Controls.Add(this.panel4, 4, 5); this.panSL.Controls.Add(this.panel4, 4, 5);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panSL.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0); this.panSL.Location = new System.Drawing.Point(3, 3);
this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.panSL.Name = "panSL";
this.tableLayoutPanel2.RowCount = 6; this.panSL.RowCount = 6;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 0F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 0F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 0F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 0F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 0F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(1328, 641); this.panSL.Size = new System.Drawing.Size(1322, 115);
this.tableLayoutPanel2.TabIndex = 11; this.panSL.TabIndex = 11;
// //
// panel4 // panel4
// //
...@@ -511,9 +942,9 @@ ...@@ -511,9 +942,9 @@
this.panel4.Controls.Add(this.label12); this.panel4.Controls.Add(this.label12);
this.panel4.Controls.Add(this.label13); this.panel4.Controls.Add(this.label13);
this.panel4.Controls.Add(this.label14); this.panel4.Controls.Add(this.label14);
this.panel4.Location = new System.Drawing.Point(1063, 533); this.panel4.Location = new System.Drawing.Point(1059, 118);
this.panel4.Name = "panel4"; this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(262, 104); this.panel4.Size = new System.Drawing.Size(260, 1);
this.panel4.TabIndex = 203; this.panel4.TabIndex = 203;
// //
// label4 // label4
...@@ -593,6 +1024,17 @@ ...@@ -593,6 +1024,17 @@
this.label14.TabIndex = 198; this.label14.TabIndex = 198;
this.label14.Text = "绿色：忙碌中"; this.label14.Text = "绿色：忙碌中";
// //
// label33
//
this.label33.BackColor = System.Drawing.Color.Transparent;
this.tableLayoutPanel3.SetColumnSpan(this.label33, 5);
this.label33.Dock = System.Windows.Forms.DockStyle.Fill;
this.label33.Location = new System.Drawing.Point(3, 121);
this.label33.Name = "label33";
this.label33.Size = new System.Drawing.Size(1322, 6);
this.label33.TabIndex = 13;
this.label33.Text = "label33";
//
// tabPage5 // tabPage5
// //
this.tabPage5.Controls.Add(this.panel5); this.tabPage5.Controls.Add(this.panel5);
...@@ -616,7 +1058,7 @@ ...@@ -616,7 +1058,7 @@
// //
// picLine // picLine
// //
this.picLine.Dock = System.Windows.Forms.DockStyle.Fill; this.picLine.Dock = System.Windows.Forms.DockStyle.Fill;
this.picLine.Location = new System.Drawing.Point(0, 0); this.picLine.Location = new System.Drawing.Point(0, 0);
this.picLine.Name = "picLine"; this.picLine.Name = "picLine";
this.picLine.Size = new System.Drawing.Size(1328, 641); this.picLine.Size = new System.Drawing.Size(1328, 641);
...@@ -624,98 +1066,6 @@ ...@@ -624,98 +1066,6 @@
this.picLine.TabIndex = 107; this.picLine.TabIndex = 107;
this.picLine.TabStop = false; this.picLine.TabStop = false;
// //
// panel1
//
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.lblOpText);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.label7);
this.panel1.Controls.Add(this.lblCID);
this.panel1.Controls.Add(this.label6);
this.panel1.Controls.Add(this.label5);
this.panel1.Location = new System.Drawing.Point(1007, 32);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(215, 119);
this.panel1.TabIndex = 202;
this.panel1.Visible = false;
//
// label3
//
this.label3.BackColor = System.Drawing.Color.LightGray;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label3.Location = new System.Drawing.Point(7, 98);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(109, 18);
this.label3.TabIndex = 202;
this.label3.Text = "灰色：暂未启用";
//
// lblOpText
//
this.lblOpText.BackColor = System.Drawing.Color.White;
this.lblOpText.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblOpText.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblOpText.Location = new System.Drawing.Point(122, 98);
this.lblOpText.Name = "lblOpText";
this.lblOpText.Size = new System.Drawing.Size(109, 18);
this.lblOpText.TabIndex = 201;
this.lblOpText.Text = "双击进入详情界面";
//
// label1
//
this.label1.BackColor = System.Drawing.Color.LightBlue;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label1.Location = new System.Drawing.Point(7, 3);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(109, 18);
this.label1.TabIndex = 197;
this.label1.Text = "蓝色：正常待机中";
//
// label7
//
this.label7.BackColor = System.Drawing.Color.Red;
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label7.Location = new System.Drawing.Point(7, 79);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(109, 18);
this.label7.TabIndex = 200;
this.label7.Text = "红色：严重报警";
//
// lblCID
//
this.lblCID.BackColor = System.Drawing.Color.Orange;
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblCID.Location = new System.Drawing.Point(7, 41);
this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(109, 18);
this.lblCID.TabIndex = 95;
this.lblCID.Text = "橘色：复位中";
//
// label6
//
this.label6.BackColor = System.Drawing.Color.LightCoral;
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label6.Location = new System.Drawing.Point(7, 60);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(109, 18);
this.label6.TabIndex = 199;
this.label6.Text = "珊瑚色：信号超时报警";
//
// label5
//
this.label5.BackColor = System.Drawing.Color.LightGreen;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label5.Location = new System.Drawing.Point(7, 22);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(109, 18);
this.label5.TabIndex = 198;
this.label5.Text = "绿色：忙碌中";
//
// lblStatus // lblStatus
// //
this.lblStatus.AutoSize = true; this.lblStatus.AutoSize = true;
...@@ -1151,222 +1501,11 @@ ...@@ -1151,222 +1501,11 @@
this.toolStripSeparator22.Name = "toolStripSeparator22"; this.toolStripSeparator22.Name = "toolStripSeparator22";
this.toolStripSeparator22.Size = new System.Drawing.Size(159, 6); this.toolStripSeparator22.Size = new System.Drawing.Size(159, 6);
// //
// label8
//
this.label8.BackColor = System.Drawing.Color.Transparent;
this.label8.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(28, 5);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(70, 35);
this.label8.TabIndex = 0;
this.label8.Text = "D2 ↑";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel6
//
this.panel6.BackColor = System.Drawing.Color.Transparent;
this.panel6.Controls.Add(this.label9);
this.panel6.Controls.Add(this.label8);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel6.Location = new System.Drawing.Point(224, 297);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(215, 45);
this.panel6.TabIndex = 1;
//
// label9
//
this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label9.BackColor = System.Drawing.Color.Transparent;
this.label9.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(103, 5);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(70, 35);
this.label9.TabIndex = 1;
this.label9.Text = "D8 ↓";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel7
//
this.panel7.BackColor = System.Drawing.Color.Transparent;
this.panel7.Controls.Add(this.label15);
this.panel7.Controls.Add(this.label16);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel7.Location = new System.Drawing.Point(3, 297);
this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(215, 45);
this.panel7.TabIndex = 2;
//
// label15
//
this.label15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label15.BackColor = System.Drawing.Color.Transparent;
this.label15.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label15.Location = new System.Drawing.Point(103, 5);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(70, 35);
this.label15.TabIndex = 1;
this.label15.Text = "D7 ↓";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label16
//
this.label16.BackColor = System.Drawing.Color.Transparent;
this.label16.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label16.Location = new System.Drawing.Point(28, 5);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(70, 35);
this.label16.TabIndex = 0;
this.label16.Text = "D1 ↑";
this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel8
//
this.panel8.BackColor = System.Drawing.Color.Transparent;
this.panel8.Controls.Add(this.label17);
this.panel8.Controls.Add(this.label18);
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel8.Location = new System.Drawing.Point(445, 297);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(215, 45);
this.panel8.TabIndex = 3;
//
// label17
//
this.label17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label17.BackColor = System.Drawing.Color.Transparent;
this.label17.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.Location = new System.Drawing.Point(103, 5);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(70, 35);
this.label17.TabIndex = 1;
this.label17.Text = "D9 ↓";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label18
//
this.label18.BackColor = System.Drawing.Color.Transparent;
this.label18.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label18.Location = new System.Drawing.Point(28, 5);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(70, 35);
this.label18.TabIndex = 0;
this.label18.Text = "D3 ↑";
this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel9
//
this.panel9.BackColor = System.Drawing.Color.Transparent;
this.panel9.Controls.Add(this.label19);
this.panel9.Controls.Add(this.label20);
this.panel9.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel9.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel9.Location = new System.Drawing.Point(666, 297);
this.panel9.Name = "panel9";
this.panel9.Size = new System.Drawing.Size(215, 45);
this.panel9.TabIndex = 4;
//
// label19
//
this.label19.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label19.BackColor = System.Drawing.Color.Transparent;
this.label19.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label19.Location = new System.Drawing.Point(103, 5);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(76, 35);
this.label19.TabIndex = 1;
this.label19.Text = "D10 ↓";
this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label20
//
this.label20.BackColor = System.Drawing.Color.Transparent;
this.label20.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label20.Location = new System.Drawing.Point(28, 5);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(70, 35);
this.label20.TabIndex = 0;
this.label20.Text = "D4 ↑";
this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel10
//
this.panel10.BackColor = System.Drawing.Color.Transparent;
this.panel10.Controls.Add(this.label21);
this.panel10.Controls.Add(this.label22);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel10.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel10.Location = new System.Drawing.Point(1108, 297);
this.panel10.Name = "panel10";
this.panel10.Size = new System.Drawing.Size(217, 45);
this.panel10.TabIndex = 5;
//
// label21
//
this.label21.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label21.BackColor = System.Drawing.Color.Transparent;
this.label21.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label21.Location = new System.Drawing.Point(105, 5);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(76, 35);
this.label21.TabIndex = 1;
this.label21.Text = "D12 ↓";
this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label22
//
this.label22.BackColor = System.Drawing.Color.Transparent;
this.label22.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label22.Location = new System.Drawing.Point(28, 5);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(70, 35);
this.label22.TabIndex = 0;
this.label22.Text = "D6 ↑";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel11
//
this.panel11.BackColor = System.Drawing.Color.Transparent;
this.panel11.Controls.Add(this.label23);
this.panel11.Controls.Add(this.label24);
this.panel11.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel11.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel11.Location = new System.Drawing.Point(887, 297);
this.panel11.Name = "panel11";
this.panel11.Size = new System.Drawing.Size(215, 45);
this.panel11.TabIndex = 2;
//
// label23
//
this.label23.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label23.BackColor = System.Drawing.Color.Transparent;
this.label23.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label23.Location = new System.Drawing.Point(103, 5);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(76, 35);
this.label23.TabIndex = 1;
this.label23.Text = "D11 ↓";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label24
//
this.label24.BackColor = System.Drawing.Color.Transparent;
this.label24.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label24.Location = new System.Drawing.Point(28, 5);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(70, 35);
this.label24.TabIndex = 0;
this.label24.Text = "D5 ↑";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// FrmLineStore // FrmLineStore
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1350, 761); this.ClientSize = new System.Drawing.Size(1350, 761);
this.Controls.Add(this.panel1);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Controls.Add(this.lblStatus); this.Controls.Add(this.lblStatus);
this.Controls.Add(this.lblWarnMsg); this.Controls.Add(this.lblWarnMsg);
...@@ -1390,26 +1529,34 @@ ...@@ -1390,26 +1529,34 @@
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
this.tabPage2.ResumeLayout(false); this.tabPage2.ResumeLayout(false);
this.panel2.ResumeLayout(false); this.panel2.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false); this.panMove.ResumeLayout(false);
this.panel17.ResumeLayout(false);
this.panel16.ResumeLayout(false);
this.panel15.ResumeLayout(false);
this.panel14.ResumeLayout(false);
this.panel11.ResumeLayout(false);
this.panel6.ResumeLayout(false);
this.panel7.ResumeLayout(false);
this.panel8.ResumeLayout(false);
this.panel9.ResumeLayout(false);
this.panel10.ResumeLayout(false);
this.panel12.ResumeLayout(false);
this.panel13.ResumeLayout(false);
this.tabPage3.ResumeLayout(false); this.tabPage3.ResumeLayout(false);
this.panel3.ResumeLayout(false); this.panel3.ResumeLayout(false);
this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel3.ResumeLayout(false);
this.panHY.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panSL.ResumeLayout(false);
this.panel4.ResumeLayout(false); this.panel4.ResumeLayout(false);
this.tabPage5.ResumeLayout(false); this.tabPage5.ResumeLayout(false);
this.tabPage5.PerformLayout(); this.tabPage5.PerformLayout();
this.panel5.ResumeLayout(false); this.panel5.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picLine)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picLine)).EndInit();
this.panel1.ResumeLayout(false);
this.contextMenuStrip1.ResumeLayout(false); this.contextMenuStrip1.ResumeLayout(false);
this.menuStrip1.ResumeLayout(false); this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout(); this.menuStrip1.PerformLayout();
this.contextMenuStrip_control.ResumeLayout(false); this.contextMenuStrip_control.ResumeLayout(false);
this.panel6.ResumeLayout(false);
this.panel7.ResumeLayout(false);
this.panel8.ResumeLayout(false);
this.panel9.ResumeLayout(false);
this.panel10.ResumeLayout(false);
this.panel11.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
...@@ -1474,10 +1621,10 @@ ...@@ -1474,10 +1621,10 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator17; private System.Windows.Forms.ToolStripSeparator toolStripSeparator17;
private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.TableLayoutPanel panMove;
private System.Windows.Forms.TabPage tabPage3; private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.Panel panel3; private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; private System.Windows.Forms.TableLayoutPanel panSL;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip_control; private System.Windows.Forms.ContextMenuStrip contextMenuStrip_control;
private System.Windows.Forms.ToolStripMenuItem control_InDetial; private System.Windows.Forms.ToolStripMenuItem control_InDetial;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator18; private System.Windows.Forms.ToolStripSeparator toolStripSeparator18;
...@@ -1523,22 +1670,31 @@ ...@@ -1523,22 +1670,31 @@
private System.Windows.Forms.CheckBox chbTrayTest; private System.Windows.Forms.CheckBox chbTrayTest;
private System.Windows.Forms.Panel panel6; private System.Windows.Forms.Panel panel6;
private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.Panel panel11; private System.Windows.Forms.Panel panel11;
private System.Windows.Forms.Label label23;
private System.Windows.Forms.Label label24; private System.Windows.Forms.Label label24;
private System.Windows.Forms.Panel panel7; private System.Windows.Forms.Panel panel7;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.Label label16; private System.Windows.Forms.Label label16;
private System.Windows.Forms.Panel panel8; private System.Windows.Forms.Panel panel8;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label label18; private System.Windows.Forms.Label label18;
private System.Windows.Forms.Panel panel9; private System.Windows.Forms.Panel panel9;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.Label label20; private System.Windows.Forms.Label label20;
private System.Windows.Forms.Panel panel10; private System.Windows.Forms.Panel panel10;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.Label label22; private System.Windows.Forms.Label label22;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
private System.Windows.Forms.TableLayoutPanel panHY;
private System.Windows.Forms.Label label33;
private System.Windows.Forms.Panel panel17;
private System.Windows.Forms.Label label23;
private System.Windows.Forms.Panel panel16;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.Panel panel15;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.Panel panel14;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Panel panel12;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.Panel panel13;
private System.Windows.Forms.Label label15;
} }
} }
source/AssemblyLineClient/FrmLineStore.cs
...@@ -758,7 +758,7 @@ namespace OnlineStore.AssemblyLine ...@@ -758,7 +758,7 @@ namespace OnlineStore.AssemblyLine
private void UpdateControl() private void UpdateControl()
{ {
if (tableLayoutPanel1.Visible) if (panMove.Visible)
{ {
foreach (int key in equipControls1.Keys) foreach (int key in equipControls1.Keys)
{ {
...@@ -766,7 +766,7 @@ namespace OnlineStore.AssemblyLine ...@@ -766,7 +766,7 @@ namespace OnlineStore.AssemblyLine
con.ShowData(lineBean.MoveEquipMap[key]); con.ShowData(lineBean.MoveEquipMap[key]);
} }
} }
if (tableLayoutPanel2.Visible) if (panSL.Visible)
{ {
foreach (int key in equipControls2.Keys) foreach (int key in equipControls2.Keys)
{ {
...@@ -812,7 +812,7 @@ namespace OnlineStore.AssemblyLine ...@@ -812,7 +812,7 @@ namespace OnlineStore.AssemblyLine
{ {
row = row + 1; row = row + 1;
} }
this.tableLayoutPanel1.Controls.Add(control, col, row); this.panMove.Controls.Add(control, col, row);
equipControls1.Add(equip.DeviceID, control); equipControls1.Add(equip.DeviceID, control);
num++; num++;
...@@ -829,25 +829,34 @@ namespace OnlineStore.AssemblyLine ...@@ -829,25 +829,34 @@ namespace OnlineStore.AssemblyLine
int row = num / 5; int row = num / 5;
int col = num % 5; int col = num % 5;
this.tableLayoutPanel2.Controls.Add(control, col, row); this.panSL.Controls.Add(control, col, row);
equipControls2.Add(equip.DeviceID, control); equipControls2.Add(equip.DeviceID, control);
num++; num++;
} }
List<int> hyIDList = new List<int>() { 201,203,0,208, 0,0,215,218,220,
202,204,206,209, 211,213,216,219,221,
0,205,207,210, 212,214,217,0,0 };
for (int i = 0; i < hyList.Count; i++) //for (int i = 0; i < hyList.Count; i++)
{ num = 0;
HYEquipBase equip = hyList[i]; foreach (int i in hyIDList)
{
if (i > 0)
{
int index = i - 200-1;
HYEquipBase equip = hyList[index];
EquipControl control = EquipControl.NewControl(equip); EquipControl control = EquipControl.NewControl(equip);
control.DoubleClick += Control_DoubleClick; control.DoubleClick += Control_DoubleClick;
control.ContextMenuStrip = contextMenuStrip_control; control.ContextMenuStrip = contextMenuStrip_control;
control.MouseEnter += Control_Click; control.MouseEnter += Control_Click;
int row = num / 5; int row = num / 9;
int col = num % 5; int col = num % 9;
this.tableLayoutPanel2.Controls.Add(control, col, row); this.panHY.Controls.Add(control, col, row);
equipControls2.Add(equip.DeviceID, control); equipControls2.Add(equip.DeviceID, control);
}
num++; num++;
} }
} }
......
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png

61.4 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png

66.3 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
source/AssemblyLineClient/useControl/EquipControl.Designer.cs
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
this.lblBox = new System.Windows.Forms.Label(); this.lblBox = new System.Windows.Forms.Label();
this.panName = new System.Windows.Forms.Panel(); this.panName = new System.Windows.Forms.Panel();
this.lblWarn = new System.Windows.Forms.Label(); this.lblWarn = new System.Windows.Forms.Label();
this.lblUseServo = new System.Windows.Forms.Label();
this.panName.SuspendLayout(); this.panName.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -143,6 +144,7 @@ ...@@ -143,6 +144,7 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.panName.BackColor = System.Drawing.Color.Transparent; this.panName.BackColor = System.Drawing.Color.Transparent;
this.panName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panName.Controls.Add(this.lblUseServo);
this.panName.Controls.Add(this.lblDebug); this.panName.Controls.Add(this.lblDebug);
this.panName.Controls.Add(this.lblName); this.panName.Controls.Add(this.lblName);
this.panName.Location = new System.Drawing.Point(1, 1); this.panName.Location = new System.Drawing.Point(1, 1);
...@@ -168,6 +170,19 @@ ...@@ -168,6 +170,19 @@
this.lblWarn.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick); this.lblWarn.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick);
this.lblWarn.MouseEnter += new System.EventHandler(this.lblStatus_MouseEnter); this.lblWarn.MouseEnter += new System.EventHandler(this.lblStatus_MouseEnter);
// //
// lblUseServo
//
this.lblUseServo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblUseServo.AutoSize = true;
this.lblUseServo.BackColor = System.Drawing.Color.Transparent;
this.lblUseServo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblUseServo.Location = new System.Drawing.Point(127, 3);
this.lblUseServo.Name = "lblUseServo";
this.lblUseServo.Size = new System.Drawing.Size(56, 20);
this.lblUseServo.TabIndex = 6;
this.lblUseServo.Text = "伺服✔";
this.lblUseServo.Visible = false;
//
// EquipControl // EquipControl
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
...@@ -201,5 +216,6 @@ ...@@ -201,5 +216,6 @@
private System.Windows.Forms.Label lblBox; private System.Windows.Forms.Label lblBox;
private System.Windows.Forms.Panel panName; private System.Windows.Forms.Panel panName;
private System.Windows.Forms.Label lblWarn; private System.Windows.Forms.Label lblWarn;
private System.Windows.Forms.Label lblUseServo;
} }
} }
source/AssemblyLineClient/useControl/EquipControl.cs
...@@ -83,6 +83,15 @@ namespace OnlineStore.AssemblyLine ...@@ -83,6 +83,15 @@ namespace OnlineStore.AssemblyLine
toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入"; toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入";
lblDebug.Text = "启用：" + (equip.IsDebug ? "✘" : "✔"); lblDebug.Text = "启用：" + (equip.IsDebug ? "✘" : "✔");
lblWarn.Text = equip.WarnMsg; lblWarn.Text = equip.WarnMsg;
lblUseServo.Visible = equip.UseAxis;
if (String.IsNullOrEmpty(equip.RFIDIP))
{
lblTrayNum.Visible = false;
}
else
{
lblTrayNum.Visible = true;
}
if (equip.DeviceID < 100) if (equip.DeviceID < 100)
{ {
if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore)) if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore))
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -18,6 +18,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -18,6 +18,7 @@ namespace OnlineStore.DeviceLibrary
public string CurrShelfId = "";//当前的料架ID public string CurrShelfId = "";//当前的料架ID
public string LastOutShelfId = "";//最后一个出口 public string LastOutShelfId = "";//最后一个出口
public string RFIDIP = "";
public LineMoveInfo SecondMoveInfo = null; public LineMoveInfo SecondMoveInfo = null;
public bool IsDebug = false; public bool IsDebug = false;
public bool UseAxis = false; public bool UseAxis = false;
...@@ -611,7 +612,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -611,7 +612,6 @@ namespace OnlineStore.DeviceLibrary
} }
} }
protected string RFIDIP="";
public virtual string GetMoveStr() public virtual string GetMoveStr()
{ {
string msg = ""; string msg = "";
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!