ruoxing.wang
/
SjMes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

页面优化

master
wrx 5 months ago
parent
fcfad02240
commit
4154fc2379
2 changed files with 47 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.cs
  2. 63
      SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3_Condition.Designer.cs

14
SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.cs
View File

@ -406,12 +406,14 @@ namespace PunchAndWeld
SendToPLC(config.ToString(), produceModel.ToString(), 1); SendToPLC(config.ToString(), produceModel.ToString(), 1);
txtLastScanL.Text = "";
//if (model == "左右") txtLastScanR.Text = "";
//{
// LeftAndRightFocus(); //if (model == "左右")
//} //{
Action searchAction = GetScanRecords; // LeftAndRightFocus();
//}
Action searchAction = GetScanRecords;
searchAction.BeginInvoke(null, null); searchAction.BeginInvoke(null, null);
} }

63
SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3_Condition.Designer.cs
View File

@ -47,6 +47,7 @@
// //
// tableLayoutPanel1 // tableLayoutPanel1
// //
this.tableLayoutPanel1.BackColor = System.Drawing.Color.Black;
this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1); this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1);
@ -54,12 +55,13 @@
this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 2); this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 2);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 3; this.tableLayoutPanel1.RowCount = 3;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 48F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(934, 535); this.tableLayoutPanel1.Size = new System.Drawing.Size(700, 428);
this.tableLayoutPanel1.TabIndex = 0; this.tableLayoutPanel1.TabIndex = 0;
// //
// groupBox2 // groupBox2
@ -70,9 +72,11 @@
this.groupBox2.Controls.Add(this.checkBox3); this.groupBox2.Controls.Add(this.checkBox3);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox2.ForeColor = System.Drawing.Color.Yellow; this.groupBox2.ForeColor = System.Drawing.Color.Yellow;
this.groupBox2.Location = new System.Drawing.Point(3, 240); this.groupBox2.Location = new System.Drawing.Point(2, 192);
this.groupBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(928, 231); this.groupBox2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox2.Size = new System.Drawing.Size(696, 186);
this.groupBox2.TabIndex = 1; this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "生产模式设置"; this.groupBox2.Text = "生产模式设置";
@ -82,9 +86,10 @@
this.checkBox5.AutoSize = true; this.checkBox5.AutoSize = true;
this.checkBox5.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox5.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox5.ForeColor = System.Drawing.Color.White; this.checkBox5.ForeColor = System.Drawing.Color.White;
this.checkBox5.Location = new System.Drawing.Point(245, 163); this.checkBox5.Location = new System.Drawing.Point(184, 130);
this.checkBox5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.checkBox5.Name = "checkBox5"; this.checkBox5.Name = "checkBox5";
this.checkBox5.Size = new System.Drawing.Size(129, 47); this.checkBox5.Size = new System.Drawing.Size(106, 39);
this.checkBox5.TabIndex = 3; this.checkBox5.TabIndex = 3;
this.checkBox5.Text = "左右"; this.checkBox5.Text = "左右";
this.checkBox5.UseVisualStyleBackColor = true; this.checkBox5.UseVisualStyleBackColor = true;
@ -95,9 +100,10 @@
this.checkBox4.AutoSize = true; this.checkBox4.AutoSize = true;
this.checkBox4.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox4.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox4.ForeColor = System.Drawing.Color.White; this.checkBox4.ForeColor = System.Drawing.Color.White;
this.checkBox4.Location = new System.Drawing.Point(245, 98); this.checkBox4.Location = new System.Drawing.Point(184, 78);
this.checkBox4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.checkBox4.Name = "checkBox4"; this.checkBox4.Name = "checkBox4";
this.checkBox4.Size = new System.Drawing.Size(85, 47); this.checkBox4.Size = new System.Drawing.Size(70, 39);
this.checkBox4.TabIndex = 2; this.checkBox4.TabIndex = 2;
this.checkBox4.Text = "右"; this.checkBox4.Text = "右";
this.checkBox4.UseVisualStyleBackColor = true; this.checkBox4.UseVisualStyleBackColor = true;
@ -108,9 +114,10 @@
this.checkBox3.AutoSize = true; this.checkBox3.AutoSize = true;
this.checkBox3.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox3.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox3.ForeColor = System.Drawing.Color.White; this.checkBox3.ForeColor = System.Drawing.Color.White;
this.checkBox3.Location = new System.Drawing.Point(245, 24); this.checkBox3.Location = new System.Drawing.Point(184, 19);
this.checkBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.checkBox3.Name = "checkBox3"; this.checkBox3.Name = "checkBox3";
this.checkBox3.Size = new System.Drawing.Size(85, 47); this.checkBox3.Size = new System.Drawing.Size(70, 39);
this.checkBox3.TabIndex = 1; this.checkBox3.TabIndex = 1;
this.checkBox3.Text = "左"; this.checkBox3.Text = "左";
this.checkBox3.UseVisualStyleBackColor = true; this.checkBox3.UseVisualStyleBackColor = true;
@ -123,9 +130,11 @@
this.groupBox1.Controls.Add(this.cboxH); this.groupBox1.Controls.Add(this.cboxH);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.ForeColor = System.Drawing.Color.Yellow; this.groupBox1.ForeColor = System.Drawing.Color.Yellow;
this.groupBox1.Location = new System.Drawing.Point(3, 3); this.groupBox1.Location = new System.Drawing.Point(2, 2);
this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(928, 231); this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox1.Size = new System.Drawing.Size(696, 186);
this.groupBox1.TabIndex = 0; this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "配置设置"; this.groupBox1.Text = "配置设置";
@ -135,9 +144,10 @@
this.cboxL.AutoSize = true; this.cboxL.AutoSize = true;
this.cboxL.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cboxL.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cboxL.ForeColor = System.Drawing.Color.White; this.cboxL.ForeColor = System.Drawing.Color.White;
this.cboxL.Location = new System.Drawing.Point(245, 136); this.cboxL.Location = new System.Drawing.Point(184, 109);
this.cboxL.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cboxL.Name = "cboxL"; this.cboxL.Name = "cboxL";
this.cboxL.Size = new System.Drawing.Size(129, 47); this.cboxL.Size = new System.Drawing.Size(106, 39);
this.cboxL.TabIndex = 1; this.cboxL.TabIndex = 1;
this.cboxL.Text = "低配"; this.cboxL.Text = "低配";
this.cboxL.UseVisualStyleBackColor = true; this.cboxL.UseVisualStyleBackColor = true;
@ -148,9 +158,10 @@
this.cboxH.AutoSize = true; this.cboxH.AutoSize = true;
this.cboxH.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cboxH.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cboxH.ForeColor = System.Drawing.Color.White; this.cboxH.ForeColor = System.Drawing.Color.White;
this.cboxH.Location = new System.Drawing.Point(245, 45); this.cboxH.Location = new System.Drawing.Point(184, 36);
this.cboxH.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cboxH.Name = "cboxH"; this.cboxH.Name = "cboxH";
this.cboxH.Size = new System.Drawing.Size(129, 47); this.cboxH.Size = new System.Drawing.Size(106, 39);
this.cboxH.TabIndex = 0; this.cboxH.TabIndex = 0;
this.cboxH.Text = "高配"; this.cboxH.Text = "高配";
this.cboxH.UseVisualStyleBackColor = true; this.cboxH.UseVisualStyleBackColor = true;
@ -162,18 +173,20 @@
this.panel1.Controls.Add(this.btnCancel); this.panel1.Controls.Add(this.btnCancel);
this.panel1.Controls.Add(this.btnOK); this.panel1.Controls.Add(this.btnOK);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(3, 477); this.panel1.Location = new System.Drawing.Point(2, 382);
this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(928, 55); this.panel1.Size = new System.Drawing.Size(696, 44);
this.panel1.TabIndex = 2; this.panel1.TabIndex = 2;
// //
// btnCancel // btnCancel
// //
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
this.btnCancel.Font = new System.Drawing.Font("宋体", 22.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancel.Font = new System.Drawing.Font("宋体", 22.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCancel.Location = new System.Drawing.Point(537, 0); this.btnCancel.Location = new System.Drawing.Point(403, 0);
this.btnCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnCancel.Name = "btnCancel"; this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(154, 55); this.btnCancel.Size = new System.Drawing.Size(116, 44);
this.btnCancel.TabIndex = 1; this.btnCancel.TabIndex = 1;
this.btnCancel.Text = "取消"; this.btnCancel.Text = "取消";
this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.UseVisualStyleBackColor = true;
@ -183,9 +196,10 @@
// //
this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
this.btnOK.Font = new System.Drawing.Font("宋体", 22.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOK.Font = new System.Drawing.Font("宋体", 22.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOK.Location = new System.Drawing.Point(147, 3); this.btnOK.Location = new System.Drawing.Point(110, 2);
this.btnOK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnOK.Name = "btnOK"; this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(154, 55); this.btnOK.Size = new System.Drawing.Size(116, 44);
this.btnOK.TabIndex = 0; this.btnOK.TabIndex = 0;
this.btnOK.Text = "确定"; this.btnOK.Text = "确定";
this.btnOK.UseVisualStyleBackColor = true; this.btnOK.UseVisualStyleBackColor = true;
@ -193,10 +207,11 @@
// //
// FrmDoorSill_214_3_Condition // FrmDoorSill_214_3_Condition
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(934, 535); this.ClientSize = new System.Drawing.Size(700, 428);
this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.tableLayoutPanel1);
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "FrmDoorSill_214_3_Condition"; this.Name = "FrmDoorSill_214_3_Condition";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "214生产参数配置"; this.Text = "214生产参数配置";

Write Preview
Loading…
Cancel
Save