Skip to content

李娜 / Line-Smart-Workstation

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

bug修改

1 个父辈 4e6b1b61
内嵌 并排
正在显示 4 个修改的文件 包含 142 行增加 和 183 行删除
DeviceLibrary/deviceLibrary/ledLabel/LabelInfo.cs
......@@ -25,7 +25,7 @@ namespace TSA_V.DeviceLibrary
this.des = des;
this.notes = notes;
this.ip = ip;
this.mac = mac;
this.mac = mac.Trim();
this.openLed = led;
}
public string ip="";
......@@ -40,6 +40,9 @@ namespace TSA_V.DeviceLibrary
public Dictionary<string,object> toMap()
{
//[{ "mac":"99.96.19.64","mappingtype":868,"styleid":47,"lblPos":"位置：","pos":"1_8","lblNum":"库位数量：","lblPn":"物料编码：","lblDes":"描述：","lblNotes":"注意事项：","num":"234","pn":"R218","des":"描述内容","notes":"注意事项内容","边框":"","边框1":"","边框2":"","边框3":"","边框4":"","边框5":"","边框6":"","边框7":"","边框8":"","边框9":"","ledrgb":"ff00","ledstate":"0","outtime":"0"}]
Dictionary<string, object> map = new Dictionary<string, object>();
map.Add("lblPos", ResourceControl.GetString("Label_lblPos", "位置："));
map.Add("lblNum", ResourceControl.GetString("Label_lblNum", "库存数量："));
......@@ -52,9 +55,18 @@ namespace TSA_V.DeviceLibrary
map.Add("des", des);
map.Add("notes", notes);
map.Add("styleid", 47);
string ledrgb = openLed ? "ff00" : "0";
map.Add("ledrgb", ledrgb);
map.Add(mac, mac);
//string ledrgb = openLed ? "ff00" : "0";
map.Add("边框", "");
map.Add("边框1", "");
map.Add("边框2", "");
map.Add("边框3", "");
map.Add("边框4", "");
map.Add("边框5", "");
map.Add("边框6", "");
map.Add("边框7", "");
map.Add("边框8", "");
map.Add("边框9", "");
map.Add("mac", mac);
return map;
}
// {
......
DeviceLibrary/deviceLibrary/ledLabel/LedLabelController.cs
......@@ -53,7 +53,7 @@ namespace TSA_V.DeviceLibrary
{
return new LabelInfo();
}
LabelInfo label = new LabelInfo(position.PositionName, com.ComCount, com.PN, com.ComponentDes, com.Notes, position.DeviceIP, position.Leds, opendLed);
LabelInfo label = new LabelInfo(position.PositionNum, com.ComCount, com.PN, com.ComponentDes, com.Notes, position.DeviceIP, position.Leds, opendLed);
return label;
......@@ -85,7 +85,7 @@ namespace TSA_V.DeviceLibrary
private static Dictionary<string, object> getLedMap(string mac, string ledrgb)
{
Dictionary<string, object> keyValuePairss = new Dictionary<string, object>{
{ "mac", mac },//标签地址
{ "mac", mac .Trim()},//标签地址
{ "lednum", 255 },
{ "timeout", 0 },
{ "ledrgb", ledrgb },
......@@ -120,10 +120,10 @@ namespace TSA_V.DeviceLibrary
Dictionary<string, object> dic = new Dictionary<string, object>();
dic.Add("mac", label.mac);
dic.Add("mac", label.mac.Trim());
dic.Add("mappingtype", "868");
dic.Add("styleid", 47);
dic.Add("ledrgb", "0");
dic.Add("ledrgb", "ff00");
dic.Add("ledstate", "0");
dic.Add("outtime", "0");
......@@ -158,12 +158,12 @@ namespace TSA_V.DeviceLibrary
if (response.IsSuccessStatusCode)
{
string jsonResponse = response.Content.ReadAsStringAsync().Result;
LogUtil.info($"电子屏 {url} 发送{json} 结果 {response.IsSuccessStatusCode}： " + jsonResponse);
LogUtil.info($"电子屏 发送{json} 结果 {response.IsSuccessStatusCode}： " + jsonResponse);
}
else
{
string jsonResponse = response.Content.ReadAsStringAsync().Result;
LogUtil.info($"电子屏{url} 发送{json} 结果 {response.IsSuccessStatusCode}： " + jsonResponse);
LogUtil.info($"电子屏 发送{json} 结果 {response.IsSuccessStatusCode}： " + jsonResponse);
}
......
DeviceLibrary/manager/TSAVBean.cs
......@@ -994,13 +994,13 @@ namespace TSA_V.DeviceLibrary
if (TSAVBean.IsInSuddenDown)
{
ShowMsg = ResourceControl.GetString(ResourceControl.DeviceInSuddenStop, "设备急停中");
}else if (TSAVBean.NoAirAlarm)
} else if (TSAVBean.NoAirAlarm)
{
ShowMsg = ResourceControl.GetString(ResourceControl.NoAirAlarm, "未检测到气压信号");
}
else if (TSAVBean.Status.Equals(TSAVStatus.Wait))
{
ShowMsg = ResourceControl.GetString(ResourceControl.DeviceNotStart, "设备未启动")+" "+startRunMsg;
ShowMsg = ResourceControl.GetString(ResourceControl.DeviceNotStart, "设备未启动") + " " + startRunMsg;
}
else if (TSAVBean.Status.Equals(TSAVStatus.Reset))
{
......@@ -1009,7 +1009,7 @@ namespace TSA_V.DeviceLibrary
else if (TSAVBean.Status.Equals(TSAVStatus.Runing))
{
string msg = ResourceControl.GetString(ResourceControl.DeviceInWork, "设备工作中");
string lineMsg = ResourceControl.GetString(ResourceControl.LineTurn, "流水线转动中");
string lineMsg = ResourceControl.GetString(ResourceControl.LineTurn, "流水线转动中");
if (TSAVBean.Work.IsWorking)
{
TimeSpan span = DateTime.Now - TSAVBean.Work.beginWorkTime;
......@@ -1024,7 +1024,7 @@ namespace TSA_V.DeviceLibrary
else
{
ShowMsg = msg + "\r\n" + TSAVBean.WarnMsg;
}
}
}
return ShowMsg;
}
......
TSA-V/workForm/FrmTSAV.Designer.cs
......@@ -124,10 +124,9 @@
this.btnIo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.btnIo.FlatAppearance.BorderSize = 0;
this.btnIo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnIo.Location = new System.Drawing.Point(1560, 685);
this.btnIo.Margin = new System.Windows.Forms.Padding(4);
this.btnIo.Location = new System.Drawing.Point(1170, 548);
this.btnIo.Name = "btnIo";
this.btnIo.Size = new System.Drawing.Size(68, 38);
this.btnIo.Size = new System.Drawing.Size(51, 30);
this.btnIo.TabIndex = 280;
this.btnIo.UseVisualStyleBackColor = false;
this.btnIo.Click += new System.EventHandler(this.btnIo_Click);
......@@ -138,10 +137,9 @@
this.btnCodeTest.BackColor = System.Drawing.SystemColors.Control;
this.btnCodeTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCodeTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCodeTest.Location = new System.Drawing.Point(311, 609);
this.btnCodeTest.Margin = new System.Windows.Forms.Padding(4);
this.btnCodeTest.Location = new System.Drawing.Point(233, 487);
this.btnCodeTest.Name = "btnCodeTest";
this.btnCodeTest.Size = new System.Drawing.Size(160, 75);
this.btnCodeTest.Size = new System.Drawing.Size(120, 60);
this.btnCodeTest.TabIndex = 279;
this.btnCodeTest.Text = "条码测试";
this.btnCodeTest.UseVisualStyleBackColor = false;
......@@ -154,10 +152,9 @@
this.btnWorkInfo.BackColor = System.Drawing.SystemColors.Control;
this.btnWorkInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWorkInfo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWorkInfo.Location = new System.Drawing.Point(636, 609);
this.btnWorkInfo.Margin = new System.Windows.Forms.Padding(4);
this.btnWorkInfo.Location = new System.Drawing.Point(477, 487);
this.btnWorkInfo.Name = "btnWorkInfo";
this.btnWorkInfo.Size = new System.Drawing.Size(160, 75);
this.btnWorkInfo.Size = new System.Drawing.Size(120, 60);
this.btnWorkInfo.TabIndex = 278;
this.btnWorkInfo.Text = "工作统计";
this.btnWorkInfo.UseVisualStyleBackColor = false;
......@@ -174,11 +171,9 @@
this.groupBox3.Controls.Add(this.radioButton2);
this.groupBox3.Controls.Add(this.radioButton1);
this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox3.Location = new System.Drawing.Point(16, 4);
this.groupBox3.Margin = new System.Windows.Forms.Padding(4);
this.groupBox3.Location = new System.Drawing.Point(12, 3);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Padding = new System.Windows.Forms.Padding(4);
this.groupBox3.Size = new System.Drawing.Size(855, 120);
this.groupBox3.Size = new System.Drawing.Size(641, 96);
this.groupBox3.TabIndex = 277;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "工作方式";
......@@ -189,10 +184,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblGuoBan.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblGuoBan.Location = new System.Drawing.Point(15, 21);
this.lblGuoBan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblGuoBan.Location = new System.Drawing.Point(11, 17);
this.lblGuoBan.Name = "lblGuoBan";
this.lblGuoBan.Size = new System.Drawing.Size(824, 89);
this.lblGuoBan.Size = new System.Drawing.Size(618, 71);
this.lblGuoBan.TabIndex = 285;
this.lblGuoBan.Text = "过板模式";
this.lblGuoBan.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -201,10 +195,9 @@
//
this.lblPause.AutoSize = true;
this.lblPause.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPause.Location = new System.Drawing.Point(239, 76);
this.lblPause.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblPause.Location = new System.Drawing.Point(179, 61);
this.lblPause.Name = "lblPause";
this.lblPause.Size = new System.Drawing.Size(92, 27);
this.lblPause.Size = new System.Drawing.Size(74, 21);
this.lblPause.TabIndex = 284;
this.lblPause.Text = "暂停工作";
this.lblPause.Visible = false;
......@@ -213,20 +206,18 @@
//
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(779, 26);
this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Location = new System.Drawing.Point(584, 21);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(28, 24);
this.label8.Size = new System.Drawing.Size(23, 20);
this.label8.TabIndex = 283;
this.label8.Text = "秒";
//
// label7
//
this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(403, 26);
this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Location = new System.Drawing.Point(302, 21);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(296, 26);
this.label7.Size = new System.Drawing.Size(222, 21);
this.label7.TabIndex = 282;
this.label7.Text = "间隔时间:";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -235,10 +226,9 @@
//
this.btnUpdateAutoTime.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateAutoTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdateAutoTime.Location = new System.Drawing.Point(663, 65);
this.btnUpdateAutoTime.Margin = new System.Windows.Forms.Padding(4);
this.btnUpdateAutoTime.Location = new System.Drawing.Point(497, 52);
this.btnUpdateAutoTime.Name = "btnUpdateAutoTime";
this.btnUpdateAutoTime.Size = new System.Drawing.Size(95, 40);
this.btnUpdateAutoTime.Size = new System.Drawing.Size(71, 32);
this.btnUpdateAutoTime.TabIndex = 281;
this.btnUpdateAutoTime.Text = "更新";
this.btnUpdateAutoTime.UseVisualStyleBackColor = false;
......@@ -248,21 +238,19 @@
// txtAuToTime
//
this.txtAuToTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAuToTime.Location = new System.Drawing.Point(705, 21);
this.txtAuToTime.Margin = new System.Windows.Forms.Padding(4);
this.txtAuToTime.Location = new System.Drawing.Point(529, 17);
this.txtAuToTime.MaxLength = 5;
this.txtAuToTime.Name = "txtAuToTime";
this.txtAuToTime.Size = new System.Drawing.Size(61, 34);
this.txtAuToTime.Size = new System.Drawing.Size(47, 29);
this.txtAuToTime.TabIndex = 2;
//
// radioButton2
//
this.radioButton2.AutoSize = true;
this.radioButton2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.radioButton2.Location = new System.Drawing.Point(59, 74);
this.radioButton2.Margin = new System.Windows.Forms.Padding(4);
this.radioButton2.Location = new System.Drawing.Point(44, 59);
this.radioButton2.Name = "radioButton2";
this.radioButton2.Size = new System.Drawing.Size(113, 31);
this.radioButton2.Size = new System.Drawing.Size(92, 25);
this.radioButton2.TabIndex = 1;
this.radioButton2.TabStop = true;
this.radioButton2.Text = "自动工作";
......@@ -273,10 +261,9 @@
//
this.radioButton1.AutoSize = true;
this.radioButton1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.radioButton1.Location = new System.Drawing.Point(59, 26);
this.radioButton1.Margin = new System.Windows.Forms.Padding(4);
this.radioButton1.Location = new System.Drawing.Point(44, 21);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(113, 31);
this.radioButton1.Size = new System.Drawing.Size(92, 25);
this.radioButton1.TabIndex = 0;
this.radioButton1.TabStop = true;
this.radioButton1.Text = "脚踏工作";
......@@ -289,10 +276,9 @@
this.btnTest.BackColor = System.Drawing.SystemColors.Control;
this.btnTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTest.Location = new System.Drawing.Point(636, 609);
this.btnTest.Margin = new System.Windows.Forms.Padding(4);
this.btnTest.Location = new System.Drawing.Point(477, 487);
this.btnTest.Name = "btnTest";
this.btnTest.Size = new System.Drawing.Size(160, 75);
this.btnTest.Size = new System.Drawing.Size(120, 60);
this.btnTest.TabIndex = 272;
this.btnTest.Text = "测试";
this.btnTest.UseVisualStyleBackColor = false;
......@@ -305,10 +291,9 @@
this.btnStart.BackColor = System.Drawing.SystemColors.Control;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(799, 609);
this.btnStart.Margin = new System.Windows.Forms.Padding(4);
this.btnStart.Location = new System.Drawing.Point(599, 487);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(160, 75);
this.btnStart.Size = new System.Drawing.Size(120, 60);
this.btnStart.TabIndex = 266;
this.btnStart.Text = "启动";
this.btnStart.UseVisualStyleBackColor = false;
......@@ -336,11 +321,9 @@
this.groupBox1.Controls.Add(this.lblComName);
this.groupBox1.Controls.Add(this.lblPointName);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(16, 129);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
this.groupBox1.Location = new System.Drawing.Point(12, 103);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
this.groupBox1.Size = new System.Drawing.Size(855, 296);
this.groupBox1.Size = new System.Drawing.Size(641, 237);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "组装信息：";
......@@ -350,10 +333,9 @@
this.lblStart.AutoSize = true;
this.lblStart.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStart.ForeColor = System.Drawing.Color.Olive;
this.lblStart.Location = new System.Drawing.Point(95, 266);
this.lblStart.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblStart.Location = new System.Drawing.Point(71, 213);
this.lblStart.Name = "lblStart";
this.lblStart.Size = new System.Drawing.Size(392, 27);
this.lblStart.Size = new System.Drawing.Size(314, 22);
this.lblStart.TabIndex = 283;
this.lblStart.Text = "注意：新程序已开始，已到达第一个组装点";
this.lblStart.Visible = false;
......@@ -363,10 +345,9 @@
this.lblLast.AutoSize = true;
this.lblLast.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblLast.ForeColor = System.Drawing.Color.Olive;
this.lblLast.Location = new System.Drawing.Point(95, 266);
this.lblLast.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblLast.Location = new System.Drawing.Point(71, 213);
this.lblLast.Name = "lblLast";
this.lblLast.Size = new System.Drawing.Size(352, 27);
this.lblLast.Size = new System.Drawing.Size(282, 22);
this.lblLast.TabIndex = 282;
this.lblLast.Text = "注意：当前最后一步，即将开始新程序";
this.lblLast.Visible = false;
......@@ -375,10 +356,9 @@
//
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCancel.Location = new System.Drawing.Point(604, 92);
this.btnCancel.Margin = new System.Windows.Forms.Padding(4);
this.btnCancel.Location = new System.Drawing.Point(453, 74);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(91, 54);
this.btnCancel.Size = new System.Drawing.Size(68, 43);
this.btnCancel.TabIndex = 281;
this.btnCancel.Text = "取消";
this.btnCancel.UseVisualStyleBackColor = false;
......@@ -389,10 +369,9 @@
//
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(505, 92);
this.btnSave.Margin = new System.Windows.Forms.Padding(4);
this.btnSave.Location = new System.Drawing.Point(379, 74);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(91, 54);
this.btnSave.Size = new System.Drawing.Size(68, 43);
this.btnSave.TabIndex = 280;
this.btnSave.Text = "保存";
this.btnSave.UseVisualStyleBackColor = false;
......@@ -404,21 +383,19 @@
this.lblComNotices.AutoSize = true;
this.lblComNotices.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComNotices.ForeColor = System.Drawing.Color.Red;
this.lblComNotices.Location = new System.Drawing.Point(257, 206);
this.lblComNotices.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblComNotices.Location = new System.Drawing.Point(193, 165);
this.lblComNotices.Name = "lblComNotices";
this.lblComNotices.Size = new System.Drawing.Size(48, 25);
this.lblComNotices.Size = new System.Drawing.Size(37, 19);
this.lblComNotices.TabIndex = 279;
this.lblComNotices.Text = "暂无";
//
// txtCount
//
this.txtCount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCount.Location = new System.Drawing.Point(539, 38);
this.txtCount.Margin = new System.Windows.Forms.Padding(4);
this.txtCount.Location = new System.Drawing.Point(404, 30);
this.txtCount.MaxLength = 6;
this.txtCount.Name = "txtCount";
this.txtCount.Size = new System.Drawing.Size(116, 34);
this.txtCount.Size = new System.Drawing.Size(88, 29);
this.txtCount.TabIndex = 278;
this.txtCount.Visible = false;
//
......@@ -427,10 +404,9 @@
this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label6.Location = new System.Drawing.Point(57, 25);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Location = new System.Drawing.Point(43, 20);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(171, 24);
this.label6.Size = new System.Drawing.Size(128, 19);
this.label6.TabIndex = 277;
this.label6.Text = "编号：";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -440,10 +416,9 @@
this.lblPartNum.AutoSize = true;
this.lblPartNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPartNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPartNum.Location = new System.Drawing.Point(257, 25);
this.lblPartNum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblPartNum.Location = new System.Drawing.Point(193, 20);
this.lblPartNum.Name = "lblPartNum";
this.lblPartNum.Size = new System.Drawing.Size(48, 25);
this.lblPartNum.Size = new System.Drawing.Size(37, 19);
this.lblPartNum.TabIndex = 276;
this.lblPartNum.Text = "暂无";
//
......@@ -451,10 +426,9 @@
//
this.btnUpateCount.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpateCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpateCount.Location = new System.Drawing.Point(524, 92);
this.btnUpateCount.Margin = new System.Windows.Forms.Padding(4);
this.btnUpateCount.Location = new System.Drawing.Point(393, 74);
this.btnUpateCount.Name = "btnUpateCount";
this.btnUpateCount.Size = new System.Drawing.Size(156, 54);
this.btnUpateCount.Size = new System.Drawing.Size(117, 43);
this.btnUpateCount.TabIndex = 275;
this.btnUpateCount.Text = "编辑数量";
this.btnUpateCount.UseVisualStyleBackColor = false;
......@@ -465,10 +439,9 @@
this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(57, 98);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Location = new System.Drawing.Point(43, 78);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(171, 24);
this.label5.Size = new System.Drawing.Size(128, 19);
this.label5.TabIndex = 274;
this.label5.Text = "剩余数量：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -478,10 +451,9 @@
this.lblCount.AutoSize = true;
this.lblCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCount.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblCount.Location = new System.Drawing.Point(257, 98);
this.lblCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCount.Location = new System.Drawing.Point(193, 78);
this.lblCount.Name = "lblCount";
this.lblCount.Size = new System.Drawing.Size(48, 25);
this.lblCount.Size = new System.Drawing.Size(37, 19);
this.lblCount.TabIndex = 273;
this.lblCount.Text = "暂无";
//
......@@ -490,10 +462,9 @@
this.lblPositionNum.AutoSize = true;
this.lblPositionNum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPositionNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPositionNum.Location = new System.Drawing.Point(257, 134);
this.lblPositionNum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblPositionNum.Location = new System.Drawing.Point(193, 107);
this.lblPositionNum.Name = "lblPositionNum";
this.lblPositionNum.Size = new System.Drawing.Size(52, 27);
this.lblPositionNum.Size = new System.Drawing.Size(42, 22);
this.lblPositionNum.TabIndex = 8;
this.lblPositionNum.Text = "暂无";
//
......@@ -502,10 +473,9 @@
this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(57, 134);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Location = new System.Drawing.Point(43, 107);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(171, 24);
this.label4.Size = new System.Drawing.Size(128, 19);
this.label4.TabIndex = 7;
this.label4.Text = "位置：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -515,10 +485,9 @@
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(57, 170);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Location = new System.Drawing.Point(43, 136);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(171, 24);
this.label1.Size = new System.Drawing.Size(128, 19);
this.label1.TabIndex = 6;
this.label1.Text = "描述：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -528,10 +497,9 @@
this.lblComDes.AutoSize = true;
this.lblComDes.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComDes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblComDes.Location = new System.Drawing.Point(257, 170);
this.lblComDes.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblComDes.Location = new System.Drawing.Point(193, 136);
this.lblComDes.Name = "lblComDes";
this.lblComDes.Size = new System.Drawing.Size(48, 25);
this.lblComDes.Size = new System.Drawing.Size(37, 19);
this.lblComDes.TabIndex = 3;
this.lblComDes.Text = "暂无";
//
......@@ -540,10 +508,9 @@
this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Red;
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(57, 206);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Location = new System.Drawing.Point(43, 165);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(171, 24);
this.label2.Size = new System.Drawing.Size(128, 19);
this.label2.TabIndex = 5;
this.label2.Text = "注意事项：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -553,10 +520,9 @@
this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(57, 61);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Location = new System.Drawing.Point(43, 49);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(171, 24);
this.label3.Size = new System.Drawing.Size(128, 19);
this.label3.TabIndex = 4;
this.label3.Text = "名称：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -566,10 +532,9 @@
this.lblComName.AutoSize = true;
this.lblComName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblComName.Location = new System.Drawing.Point(547, 206);
this.lblComName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblComName.Location = new System.Drawing.Point(410, 165);
this.lblComName.Name = "lblComName";
this.lblComName.Size = new System.Drawing.Size(48, 25);
this.lblComName.Size = new System.Drawing.Size(37, 19);
this.lblComName.TabIndex = 2;
this.lblComName.Text = "暂无";
this.lblComName.Visible = false;
......@@ -579,10 +544,9 @@
this.lblPointName.AutoSize = true;
this.lblPointName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPointName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPointName.Location = new System.Drawing.Point(257, 61);
this.lblPointName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblPointName.Location = new System.Drawing.Point(193, 49);
this.lblPointName.Name = "lblPointName";
this.lblPointName.Size = new System.Drawing.Size(52, 27);
this.lblPointName.Size = new System.Drawing.Size(42, 22);
this.lblPointName.TabIndex = 1;
this.lblPointName.Text = "暂无";
//
......@@ -592,11 +556,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.panPoint);
this.groupBox2.Location = new System.Drawing.Point(879, 4);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
this.groupBox2.Location = new System.Drawing.Point(659, 3);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
this.groupBox2.Size = new System.Drawing.Size(736, 599);
this.groupBox2.Size = new System.Drawing.Size(552, 479);
this.groupBox2.TabIndex = 3;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "局部图";
......@@ -607,10 +569,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panPoint.Controls.Add(this.picPoint);
this.panPoint.Location = new System.Drawing.Point(8, 21);
this.panPoint.Margin = new System.Windows.Forms.Padding(4);
this.panPoint.Location = new System.Drawing.Point(6, 17);
this.panPoint.Name = "panPoint";
this.panPoint.Size = new System.Drawing.Size(721, 569);
this.panPoint.Size = new System.Drawing.Size(541, 455);
this.panPoint.TabIndex = 3;
//
// picPoint
......@@ -619,9 +580,8 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.picPoint.Location = new System.Drawing.Point(0, 0);
this.picPoint.Margin = new System.Windows.Forms.Padding(4);
this.picPoint.Name = "picPoint";
this.picPoint.Size = new System.Drawing.Size(673, 512);
this.picPoint.Size = new System.Drawing.Size(505, 410);
this.picPoint.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picPoint.TabIndex = 2;
this.picPoint.TabStop = false;
......@@ -632,11 +592,9 @@
| System.Windows.Forms.AnchorStyles.Left)));
this.gbBoardInfo.Controls.Add(this.panBoard);
this.gbBoardInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.gbBoardInfo.Location = new System.Drawing.Point(16, 433);
this.gbBoardInfo.Margin = new System.Windows.Forms.Padding(4);
this.gbBoardInfo.Location = new System.Drawing.Point(12, 346);
this.gbBoardInfo.Name = "gbBoardInfo";
this.gbBoardInfo.Padding = new System.Windows.Forms.Padding(4);
this.gbBoardInfo.Size = new System.Drawing.Size(855, 170);
this.gbBoardInfo.Size = new System.Drawing.Size(641, 136);
this.gbBoardInfo.TabIndex = 0;
this.gbBoardInfo.TabStop = false;
this.gbBoardInfo.Text = "全局图(粉色表示已完成；橘色表示未开始；红色表示实时位置)";
......@@ -647,10 +605,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panBoard.Controls.Add(this.picBoard);
this.panBoard.Location = new System.Drawing.Point(8, 22);
this.panBoard.Margin = new System.Windows.Forms.Padding(4);
this.panBoard.Location = new System.Drawing.Point(6, 18);
this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(840, 139);
this.panBoard.Size = new System.Drawing.Size(630, 111);
this.panBoard.TabIndex = 3;
//
// picBoard
......@@ -658,10 +615,9 @@
this.picBoard.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.picBoard.Location = new System.Drawing.Point(1, 4);
this.picBoard.Margin = new System.Windows.Forms.Padding(4);
this.picBoard.Location = new System.Drawing.Point(1, 3);
this.picBoard.Name = "picBoard";
this.picBoard.Size = new System.Drawing.Size(836, 54);
this.picBoard.Size = new System.Drawing.Size(627, 43);
this.picBoard.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picBoard.TabIndex = 1;
this.picBoard.TabStop = false;
......@@ -672,10 +628,9 @@
this.btnCamera.BackColor = System.Drawing.SystemColors.Control;
this.btnCamera.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCamera.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCamera.Location = new System.Drawing.Point(473, 609);
this.btnCamera.Margin = new System.Windows.Forms.Padding(4);
this.btnCamera.Location = new System.Drawing.Point(355, 487);
this.btnCamera.Name = "btnCamera";
this.btnCamera.Size = new System.Drawing.Size(160, 75);
this.btnCamera.Size = new System.Drawing.Size(120, 60);
this.btnCamera.TabIndex = 274;
this.btnCamera.Text = "AOI检测";
this.btnCamera.UseVisualStyleBackColor = false;
......@@ -687,10 +642,9 @@
this.btnStartWorking.BackColor = System.Drawing.SystemColors.Control;
this.btnStartWorking.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStartWorking.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.btnStartWorking.Location = new System.Drawing.Point(961, 609);
this.btnStartWorking.Margin = new System.Windows.Forms.Padding(4);
this.btnStartWorking.Location = new System.Drawing.Point(721, 487);
this.btnStartWorking.Name = "btnStartWorking";
this.btnStartWorking.Size = new System.Drawing.Size(160, 75);
this.btnStartWorking.Size = new System.Drawing.Size(120, 60);
this.btnStartWorking.TabIndex = 263;
this.btnStartWorking.Text = "开始工作";
this.btnStartWorking.UseVisualStyleBackColor = false;
......@@ -702,10 +656,9 @@
this.btnGoHome.BackColor = System.Drawing.SystemColors.Control;
this.btnGoHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnGoHome.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGoHome.Location = new System.Drawing.Point(799, 609);
this.btnGoHome.Margin = new System.Windows.Forms.Padding(4);
this.btnGoHome.Location = new System.Drawing.Point(599, 487);
this.btnGoHome.Name = "btnGoHome";
this.btnGoHome.Size = new System.Drawing.Size(160, 75);
this.btnGoHome.Size = new System.Drawing.Size(120, 60);
this.btnGoHome.TabIndex = 273;
this.btnGoHome.Text = "复位";
this.btnGoHome.UseVisualStyleBackColor = false;
......@@ -717,10 +670,9 @@
this.btnPrePoint.BackColor = System.Drawing.SystemColors.Control;
this.btnPrePoint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPrePoint.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPrePoint.Location = new System.Drawing.Point(1124, 609);
this.btnPrePoint.Margin = new System.Windows.Forms.Padding(4);
this.btnPrePoint.Location = new System.Drawing.Point(843, 487);
this.btnPrePoint.Name = "btnPrePoint";
this.btnPrePoint.Size = new System.Drawing.Size(160, 75);
this.btnPrePoint.Size = new System.Drawing.Size(120, 60);
this.btnPrePoint.TabIndex = 272;
this.btnPrePoint.Text = "上一步";
this.btnPrePoint.UseVisualStyleBackColor = false;
......@@ -732,10 +684,9 @@
this.btnNextPoint.BackColor = System.Drawing.SystemColors.Control;
this.btnNextPoint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNextPoint.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNextPoint.Location = new System.Drawing.Point(1287, 609);
this.btnNextPoint.Margin = new System.Windows.Forms.Padding(4);
this.btnNextPoint.Location = new System.Drawing.Point(965, 487);
this.btnNextPoint.Name = "btnNextPoint";
this.btnNextPoint.Size = new System.Drawing.Size(160, 75);
this.btnNextPoint.Size = new System.Drawing.Size(120, 60);
this.btnNextPoint.TabIndex = 271;
this.btnNextPoint.Text = "下一步";
this.btnNextPoint.UseVisualStyleBackColor = false;
......@@ -747,10 +698,9 @@
this.btnStop.BackColor = System.Drawing.SystemColors.Control;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(1449, 609);
this.btnStop.Margin = new System.Windows.Forms.Padding(4);
this.btnStop.Location = new System.Drawing.Point(1087, 487);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(160, 75);
this.btnStop.Size = new System.Drawing.Size(120, 60);
this.btnStop.TabIndex = 270;
this.btnStop.Text = "结束";
this.btnStop.UseVisualStyleBackColor = false;
......@@ -767,7 +717,8 @@
this.系统ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1473, 31);
this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 2, 0, 2);
this.menuStrip1.Size = new System.Drawing.Size(1105, 25);
this.menuStrip1.TabIndex = 3;
this.menuStrip1.Text = "menuStrip1";
this.menuStrip1.Visible = false;
......@@ -779,25 +730,25 @@
this.停止ToolStripMenuItem,
this.复位ToolStripMenuItem});
this.插件机ToolStripMenuItem.Name = "插件机ToolStripMenuItem";
this.插件机ToolStripMenuItem.Size = new System.Drawing.Size(68, 27);
this.插件机ToolStripMenuItem.Size = new System.Drawing.Size(56, 21);
this.插件机ToolStripMenuItem.Text = "插件机";
//
// 启动ToolStripMenuItem
//
this.启动ToolStripMenuItem.Name = "启动ToolStripMenuItem";
this.启动ToolStripMenuItem.Size = new System.Drawing.Size(122, 26);
this.启动ToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
this.启动ToolStripMenuItem.Text = "启动";
//
// 停止ToolStripMenuItem
//
this.停止ToolStripMenuItem.Name = "停止ToolStripMenuItem";
this.停止ToolStripMenuItem.Size = new System.Drawing.Size(122, 26);
this.停止ToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
this.停止ToolStripMenuItem.Text = "停止";
//
// 复位ToolStripMenuItem
//
this.复位ToolStripMenuItem.Name = "复位ToolStripMenuItem";
this.复位ToolStripMenuItem.Size = new System.Drawing.Size(122, 26);
this.复位ToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
this.复位ToolStripMenuItem.Text = "复位";
//
// 样品配置ToolStripMenuItem
......@@ -805,13 +756,13 @@
this.样品配置ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.样品编辑ToolStripMenuItem});
this.样品配置ToolStripMenuItem.Name = "样品配置ToolStripMenuItem";
this.样品配置ToolStripMenuItem.Size = new System.Drawing.Size(83, 27);
this.样品配置ToolStripMenuItem.Size = new System.Drawing.Size(68, 21);
this.样品配置ToolStripMenuItem.Text = "样品配置";
//
// 样品编辑ToolStripMenuItem
//
this.样品编辑ToolStripMenuItem.Name = "样品编辑ToolStripMenuItem";
this.样品编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 26);
this.样品编辑ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.样品编辑ToolStripMenuItem.Text = "样品编辑";
//
// 元器件配置ToolStripMenuItem
......@@ -819,13 +770,13 @@
this.元器件配置ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.元器件编辑ToolStripMenuItem});
this.元器件配置ToolStripMenuItem.Name = "元器件配置ToolStripMenuItem";
this.元器件配置ToolStripMenuItem.Size = new System.Drawing.Size(98, 27);
this.元器件配置ToolStripMenuItem.Size = new System.Drawing.Size(80, 21);
this.元器件配置ToolStripMenuItem.Text = "元器件配置";
//
// 元器件编辑ToolStripMenuItem
//
this.元器件编辑ToolStripMenuItem.Name = "元器件编辑ToolStripMenuItem";
this.元器件编辑ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.元器件编辑ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.元器件编辑ToolStripMenuItem.Text = "元器件编辑";
//
// 料格配置ToolStripMenuItem
......@@ -833,13 +784,13 @@
this.料格配置ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.料格编辑ToolStripMenuItem});
this.料格配置ToolStripMenuItem.Name = "料格配置ToolStripMenuItem";
this.料格配置ToolStripMenuItem.Size = new System.Drawing.Size(83, 27);
this.料格配置ToolStripMenuItem.Size = new System.Drawing.Size(68, 21);
this.料格配置ToolStripMenuItem.Text = "料格配置";
//
// 料格编辑ToolStripMenuItem
//
this.料格编辑ToolStripMenuItem.Name = "料格编辑ToolStripMenuItem";
this.料格编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 26);
this.料格编辑ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.料格编辑ToolStripMenuItem.Text = "料格编辑";
//
// 系统ToolStripMenuItem
......@@ -847,13 +798,13 @@
this.系统ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.退出ToolStripMenuItem});
this.系统ToolStripMenuItem.Name = "系统ToolStripMenuItem";
this.系统ToolStripMenuItem.Size = new System.Drawing.Size(53, 27);
this.系统ToolStripMenuItem.Size = new System.Drawing.Size(44, 21);
this.系统ToolStripMenuItem.Text = "系统";
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(122, 26);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
this.退出ToolStripMenuItem.Text = "退出";
//
// lblNotices
......@@ -861,10 +812,9 @@
this.lblNotices.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblNotices.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblNotices.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblNotices.Location = new System.Drawing.Point(20, 684);
this.lblNotices.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblNotices.Location = new System.Drawing.Point(15, 547);
this.lblNotices.Name = "lblNotices";
this.lblNotices.Size = new System.Drawing.Size(757, 29);
this.lblNotices.Size = new System.Drawing.Size(568, 23);
this.lblNotices.TabIndex = 276;
//
// lblBoardPoint
......@@ -872,20 +822,18 @@
this.lblBoardPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblBoardPoint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblBoardPoint.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblBoardPoint.Location = new System.Drawing.Point(20, 650);
this.lblBoardPoint.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblBoardPoint.Location = new System.Drawing.Point(15, 520);
this.lblBoardPoint.Name = "lblBoardPoint";
this.lblBoardPoint.Size = new System.Drawing.Size(757, 29);
this.lblBoardPoint.Size = new System.Drawing.Size(568, 23);
this.lblBoardPoint.TabIndex = 272;
//
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.panel1.Controls.Add(this.lblMsg);
this.panel1.Location = new System.Drawing.Point(16, 611);
this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Location = new System.Drawing.Point(12, 484);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(757, 58);
this.panel1.Size = new System.Drawing.Size(568, 63);
this.panel1.TabIndex = 269;
//
// lblMsg
......@@ -893,18 +841,17 @@
this.lblMsg.AutoSize = true;
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Red;
this.lblMsg.Location = new System.Drawing.Point(5, 6);
this.lblMsg.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblMsg.Location = new System.Drawing.Point(4, 5);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(84, 20);
this.lblMsg.Size = new System.Drawing.Size(68, 17);
this.lblMsg.TabIndex = 3;
this.lblMsg.Text = "未开始工作";
//
// FrmWork
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1631, 724);
this.ClientSize = new System.Drawing.Size(1223, 579);
this.Controls.Add(this.btnIo);
this.Controls.Add(this.btnCodeTest);
this.Controls.Add(this.btnWorkInfo);
......@@ -927,7 +874,7 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
this.Margin = new System.Windows.Forms.Padding(5);
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "FrmWork";
this.Text = "TSA_V工作";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!