Skip to content

李娜 / SO664-AssemblyLine

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

界面调整

1 个父辈 4f4fa737
内嵌 并排
正在显示 4 个修改的文件 包含 36 行增加 和 149 行删除
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -90,14 +90,6 @@
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.label4 = new System.Windows.Forms.Label();
this.lblOpText2 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.label13 = 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.panel5 = new System.Windows.Forms.Panel();
......@@ -185,8 +177,6 @@
this.tableLayoutPanel3.SuspendLayout();
this.panHY.SuspendLayout();
this.panel1.SuspendLayout();
this.panSL.SuspendLayout();
this.panel4.SuspendLayout();
this.tabPage5.SuspendLayout();
this.panel5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picLine)).BeginInit();
......@@ -919,111 +909,19 @@
this.panSL.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.panSL.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.panSL.Controls.Add(this.panel4, 4, 5);
this.panSL.Dock = System.Windows.Forms.DockStyle.Fill;
this.panSL.Location = new System.Drawing.Point(3, 3);
this.panSL.Name = "panSL";
this.panSL.RowCount = 6;
this.panSL.RowCount = 1;
this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 0F));
this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 0F));
this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 0F));
this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 0F));
this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 0F));
this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.panSL.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.panSL.Size = new System.Drawing.Size(1322, 115);
this.panSL.TabIndex = 11;
//
// panel4
//
this.panel4.Controls.Add(this.label4);
this.panel4.Controls.Add(this.lblOpText2);
this.panel4.Controls.Add(this.label10);
this.panel4.Controls.Add(this.label11);
this.panel4.Controls.Add(this.label12);
this.panel4.Controls.Add(this.label13);
this.panel4.Controls.Add(this.label14);
this.panel4.Location = new System.Drawing.Point(1059, 118);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(260, 1);
this.panel4.TabIndex = 203;
//
// label4
//
this.label4.BackColor = System.Drawing.Color.LightGray;
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label4.Location = new System.Drawing.Point(7, 89);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(109, 17);
this.label4.TabIndex = 203;
this.label4.Text = "灰色：暂未启用";
//
// lblOpText2
//
this.lblOpText2.BackColor = System.Drawing.Color.White;
this.lblOpText2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblOpText2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblOpText2.Location = new System.Drawing.Point(122, 86);
this.lblOpText2.Name = "lblOpText2";
this.lblOpText2.Size = new System.Drawing.Size(109, 18);
this.lblOpText2.TabIndex = 201;
this.lblOpText2.Text = "双击进入详情界面";
//
// label10
//
this.label10.BackColor = System.Drawing.Color.LightBlue;
this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label10.Location = new System.Drawing.Point(7, 4);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(109, 16);
this.label10.TabIndex = 197;
this.label10.Text = "蓝色：正常待机中";
//
// label11
//
this.label11.BackColor = System.Drawing.Color.Red;
this.label11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label11.Location = new System.Drawing.Point(7, 72);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(109, 16);
this.label11.TabIndex = 200;
this.label11.Text = "红色：严重报警";
//
// label12
//
this.label12.BackColor = System.Drawing.Color.Orange;
this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label12.Location = new System.Drawing.Point(7, 38);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(109, 16);
this.label12.TabIndex = 95;
this.label12.Text = "橘色：复位中";
//
// label13
//
this.label13.BackColor = System.Drawing.Color.LightCoral;
this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label13.Location = new System.Drawing.Point(7, 55);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(109, 16);
this.label13.TabIndex = 199;
this.label13.Text = "珊瑚色：信号超时报警";
//
// label14
//
this.label14.BackColor = System.Drawing.Color.LightGreen;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label14.Location = new System.Drawing.Point(7, 21);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(109, 16);
this.label14.TabIndex = 198;
this.label14.Text = "绿色：忙碌中";
//
// label33
//
this.label33.BackColor = System.Drawing.Color.Transparent;
......@@ -1033,7 +931,6 @@
this.label33.Name = "label33";
this.label33.Size = new System.Drawing.Size(1322, 6);
this.label33.TabIndex = 13;
this.label33.Text = "label33";
//
// tabPage5
//
......@@ -1547,8 +1444,6 @@
this.tableLayoutPanel3.ResumeLayout(false);
this.panHY.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panSL.ResumeLayout(false);
this.panel4.ResumeLayout(false);
this.tabPage5.ResumeLayout(false);
this.tabPage5.PerformLayout();
this.panel5.ResumeLayout(false);
......@@ -1644,13 +1539,6 @@
private System.Windows.Forms.Label lblOpText;
private System.Windows.Forms.ToolStripMenuItem toolName;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator23;
private System.Windows.Forms.Panel panel4;
private System.Windows.Forms.Label lblOpText2;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TabPage tabPage5;
private System.Windows.Forms.PictureBox picLine;
private System.Windows.Forms.Panel panel5;
......@@ -1666,7 +1554,6 @@
private System.Windows.Forms.CheckBox chbDisMove;
private System.Windows.Forms.CheckBox chbDisHy;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.CheckBox chbTrayTest;
private System.Windows.Forms.Panel panel6;
private System.Windows.Forms.Label label8;
......
source/AssemblyLineClient/FrmLineStore.cs
......@@ -121,7 +121,6 @@ namespace OnlineStore.AssemblyLine
string opStr = "双击进入详情界面";
lblOpText.Text = opStr;
lblOpText2.Text = opStr;
LogUtil.logBox = this.logBox;
lastLogTime = DateTime.Now.AddMinutes(-10);
......
source/AssemblyLineClient/useControl/EquipControl.Designer.cs
......@@ -37,8 +37,8 @@
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.lblBox = new System.Windows.Forms.Label();
this.panName = new System.Windows.Forms.Panel();
this.lblWarn = new System.Windows.Forms.Label();
this.lblUseServo = new System.Windows.Forms.Label();
this.lblWarn = new System.Windows.Forms.Label();
this.panName.SuspendLayout();
this.SuspendLayout();
//
......@@ -49,7 +49,7 @@
this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTrayNum.ForeColor = System.Drawing.Color.Black;
this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblTrayNum.Location = new System.Drawing.Point(185, 35);
this.lblTrayNum.Location = new System.Drawing.Point(180, 29);
this.lblTrayNum.Name = "lblTrayNum";
this.lblTrayNum.Size = new System.Drawing.Size(56, 17);
this.lblTrayNum.TabIndex = 0;
......@@ -65,7 +65,7 @@
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblName.Location = new System.Drawing.Point(3, 2);
this.lblName.Location = new System.Drawing.Point(-2, 2);
this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(99, 22);
this.lblName.TabIndex = 1;
......@@ -99,7 +99,7 @@
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ForeColor = System.Drawing.Color.Black;
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblMoveInfo.Location = new System.Drawing.Point(3, 50);
this.lblMoveInfo.Location = new System.Drawing.Point(3, 53);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 3;
......@@ -113,12 +113,12 @@
this.lblDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblDebug.AutoSize = true;
this.lblDebug.BackColor = System.Drawing.Color.Transparent;
this.lblDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblDebug.Location = new System.Drawing.Point(183, 3);
this.lblDebug.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblDebug.Location = new System.Drawing.Point(198, 4);
this.lblDebug.Name = "lblDebug";
this.lblDebug.Size = new System.Drawing.Size(51, 20);
this.lblDebug.Size = new System.Drawing.Size(48, 17);
this.lblDebug.TabIndex = 5;
this.lblDebug.Text = "启用：";
this.lblDebug.Text = "启用✔";
this.lblDebug.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick);
this.lblDebug.MouseEnter += new System.EventHandler(this.lblStatus_MouseEnter);
//
......@@ -130,9 +130,9 @@
this.lblBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblBox.ForeColor = System.Drawing.Color.Black;
this.lblBox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblBox.Location = new System.Drawing.Point(2, 94);
this.lblBox.Location = new System.Drawing.Point(1, 94);
this.lblBox.Name = "lblBox";
this.lblBox.Size = new System.Drawing.Size(245, 24);
this.lblBox.Size = new System.Drawing.Size(248, 24);
this.lblBox.TabIndex = 6;
this.lblBox.Text = "BOX状态：";
this.lblBox.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -144,16 +144,29 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.panName.BackColor = System.Drawing.Color.Transparent;
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.lblUseServo);
this.panName.Controls.Add(this.lblName);
this.panName.Location = new System.Drawing.Point(1, 1);
this.panName.Name = "panName";
this.panName.Size = new System.Drawing.Size(246, 28);
this.panName.Size = new System.Drawing.Size(248, 28);
this.panName.TabIndex = 7;
this.panName.DoubleClick += new System.EventHandler(this.panName_DoubleClick);
this.panName.MouseEnter += new System.EventHandler(this.panName_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("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblUseServo.Location = new System.Drawing.Point(153, 4);
this.lblUseServo.Name = "lblUseServo";
this.lblUseServo.Size = new System.Drawing.Size(48, 17);
this.lblUseServo.TabIndex = 6;
this.lblUseServo.Text = "伺服✔";
this.lblUseServo.Visible = false;
//
// lblWarn
//
this.lblWarn.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
......@@ -162,27 +175,14 @@
this.lblWarn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarn.ForeColor = System.Drawing.Color.White;
this.lblWarn.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.lblWarn.Location = new System.Drawing.Point(3, 72);
this.lblWarn.Location = new System.Drawing.Point(3, 77);
this.lblWarn.Name = "lblWarn";
this.lblWarn.Size = new System.Drawing.Size(242, 45);
this.lblWarn.Size = new System.Drawing.Size(242, 42);
this.lblWarn.TabIndex = 8;
this.lblWarn.Text = "暂无报警";
this.lblWarn.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick);
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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
source/AssemblyLineClient/useControl/EquipControl.cs
......@@ -81,9 +81,9 @@ namespace OnlineStore.AssemblyLine
lblTrayNum.Text ="托盘："+equip.currTrayNum;
lblStatus.Text = equip.GetRunStr();
toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入";
lblDebug.Text = "启用：" + (equip.IsDebug ? "✘" : "✔");
lblDebug.Text = "启用" + (equip.IsDebug ? "✘" : "✔");
lblWarn.Text = equip.WarnMsg;
lblUseServo.Visible = equip.UseAxis;
lblUseServo.Visible = false;
if (String.IsNullOrEmpty(equip.RFIDIP))
{
lblTrayNum.Visible = false;
......@@ -94,6 +94,7 @@ namespace OnlineStore.AssemblyLine
}
if (equip.DeviceID < 100)
{
lblUseServo.Visible = equip.UseAxis;
if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore))
{
lblMoveInfo.Text = "入库中：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!