From 78584911d0457ad9fc26d9dfc6f374b7ef531c0f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期日, 22 十一月 2020 13:45:09 +0800
Subject: [PATCH] 1. 添加操作员输入和界面显示 2. 添加通过输入窗体 3. 添加webservice调用帮助类 4. M071添加MES数据检查和数据上传功能，添加相关界面显示和流程控制
---
src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.Designer.cs | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.Designer.cs
index ce4360e..54154ad 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.Designer.cs
@@ -63,7 +63,7 @@
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(484, 681);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(574, 681);
this.tableLayoutPanel1.TabIndex = 0;
//
// tabControl1
@@ -74,7 +74,7 @@
this.tabControl1.Location = new System.Drawing.Point(3, 3);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(478, 675);
+ this.tabControl1.Size = new System.Drawing.Size(568, 675);
this.tabControl1.TabIndex = 12;
//
// tabPage1
@@ -83,7 +83,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(470, 649);
+ this.tabPage1.Size = new System.Drawing.Size(560, 649);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "蹇嵎鎿嶄綔";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -93,7 +93,7 @@
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 3);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
- this.flowLayoutPanel1.Size = new System.Drawing.Size(464, 643);
+ this.flowLayoutPanel1.Size = new System.Drawing.Size(554, 643);
this.flowLayoutPanel1.TabIndex = 0;
//
// tabPage2
@@ -102,7 +102,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(470, 649);
+ this.tabPage2.Size = new System.Drawing.Size(560, 649);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "閫氱敤鎿嶄綔";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -119,7 +119,7 @@
this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 120F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel3.Size = new System.Drawing.Size(464, 643);
+ this.tableLayoutPanel3.Size = new System.Drawing.Size(554, 643);
this.tableLayoutPanel3.TabIndex = 0;
//
// groupBoxPara
@@ -128,7 +128,7 @@
this.groupBoxPara.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBoxPara.Location = new System.Drawing.Point(3, 123);
this.groupBoxPara.Name = "groupBoxPara";
- this.groupBoxPara.Size = new System.Drawing.Size(458, 517);
+ this.groupBoxPara.Size = new System.Drawing.Size(548, 517);
this.groupBoxPara.TabIndex = 13;
this.groupBoxPara.TabStop = false;
this.groupBoxPara.Text = "鍙傛暟";
@@ -139,7 +139,7 @@
this.propGrid.Location = new System.Drawing.Point(3, 17);
this.propGrid.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.propGrid.Name = "propGrid";
- this.propGrid.Size = new System.Drawing.Size(452, 497);
+ this.propGrid.Size = new System.Drawing.Size(542, 497);
this.propGrid.TabIndex = 1;
//
// groupBoxCommBtn
@@ -153,7 +153,7 @@
this.groupBoxCommBtn.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBoxCommBtn.Location = new System.Drawing.Point(3, 3);
this.groupBoxCommBtn.Name = "groupBoxCommBtn";
- this.groupBoxCommBtn.Size = new System.Drawing.Size(458, 114);
+ this.groupBoxCommBtn.Size = new System.Drawing.Size(548, 114);
this.groupBoxCommBtn.TabIndex = 1;
this.groupBoxCommBtn.TabStop = false;
this.groupBoxCommBtn.Text = "鍏叡鎿嶄綔";
@@ -167,9 +167,9 @@
this.btnStart.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Image = ((System.Drawing.Image)(resources.GetObject("btnStart.Image")));
this.btnStart.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.btnStart.Location = new System.Drawing.Point(309, 23);
+ this.btnStart.Location = new System.Drawing.Point(374, 23);
this.btnStart.Name = "btnStart";
- this.btnStart.Size = new System.Drawing.Size(143, 54);
+ this.btnStart.Size = new System.Drawing.Size(168, 54);
this.btnStart.TabIndex = 5;
this.btnStart.Text = " 鍚� 鍔�";
this.btnStart.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
@@ -188,7 +188,7 @@
//
// buttonEmergencyStop
//
- this.buttonEmergencyStop.Location = new System.Drawing.Point(86, 56);
+ this.buttonEmergencyStop.Location = new System.Drawing.Point(108, 56);
this.buttonEmergencyStop.Name = "buttonEmergencyStop";
this.buttonEmergencyStop.Size = new System.Drawing.Size(70, 25);
this.buttonEmergencyStop.TabIndex = 4;
@@ -198,7 +198,7 @@
//
// buttonServoEnable
//
- this.buttonServoEnable.Location = new System.Drawing.Point(86, 21);
+ this.buttonServoEnable.Location = new System.Drawing.Point(108, 21);
this.buttonServoEnable.Name = "buttonServoEnable";
this.buttonServoEnable.Size = new System.Drawing.Size(70, 25);
this.buttonServoEnable.TabIndex = 4;
@@ -218,7 +218,7 @@
//
// buttonPositionReset
//
- this.buttonPositionReset.Location = new System.Drawing.Point(168, 21);
+ this.buttonPositionReset.Location = new System.Drawing.Point(213, 21);
this.buttonPositionReset.Name = "buttonPositionReset";
this.buttonPositionReset.Size = new System.Drawing.Size(70, 25);
this.buttonPositionReset.TabIndex = 4;
@@ -230,9 +230,10 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(484, 681);
+ this.ClientSize = new System.Drawing.Size(574, 681);
this.Controls.Add(this.tableLayoutPanel1);
this.Name = "FrmMotionCardOperationBase";
+ this.Text = "鏉垮崱鎿嶄綔";
this.tableLayoutPanel1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
--
Gitblit v1.8.0