diff --git a/.vs/LL28在线/FileContentIndex/5a78faf8-5b11-4c6e-988b-e79d9aea7615.vsidx b/.vs/LL28在线/FileContentIndex/5a78faf8-5b11-4c6e-988b-e79d9aea7615.vsidx deleted file mode 100644 index 6c2eceb..0000000 Binary files a/.vs/LL28在线/FileContentIndex/5a78faf8-5b11-4c6e-988b-e79d9aea7615.vsidx and /dev/null differ diff --git a/.vs/LL28在线/FileContentIndex/5cf2ed47-847e-41a9-8167-ebbfc2cee17d.vsidx b/.vs/LL28在线/FileContentIndex/5cf2ed47-847e-41a9-8167-ebbfc2cee17d.vsidx new file mode 100644 index 0000000..4921fa1 Binary files /dev/null and b/.vs/LL28在线/FileContentIndex/5cf2ed47-847e-41a9-8167-ebbfc2cee17d.vsidx differ diff --git a/.vs/LL28在线/v16/.suo b/.vs/LL28在线/v16/.suo index 02a77b4..7f39d89 100644 Binary files a/.vs/LL28在线/v16/.suo and b/.vs/LL28在线/v16/.suo differ diff --git a/.vs/LL28在线/v17/.suo b/.vs/LL28在线/v17/.suo index 9ae4442..45c4653 100644 Binary files a/.vs/LL28在线/v17/.suo and b/.vs/LL28在线/v17/.suo differ diff --git a/.vs/LL28在线/v17/DocumentLayout.json b/.vs/LL28在线/v17/DocumentLayout.json index 7c2f501..fb52c3e 100644 --- a/.vs/LL28在线/v17/DocumentLayout.json +++ b/.vs/LL28在线/v17/DocumentLayout.json @@ -3,11 +3,11 @@ "WorkspaceRootPath": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|d:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" }, { - "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|d:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { @@ -200,9 +200,6 @@ { "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\configini.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\configini.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|d:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\||{B270807C-D8C6-49EB-8EBE-8E8D566637A1}|5e9a8ac2-4f34-4521-858f-4c248ba31532" } ], "DocumentGroupContainers": [ @@ -214,6 +211,10 @@ "DockedWidth": 396, "SelectedChildIndex": 14, "Children": [ + { + "$type": "Bookmark", + "Name": "ST:0:0:{5a4e9529-b6a0-46b5-be4f-0f0b239bc0eb}" + }, { "$type": "Document", "DocumentIndex": 1, @@ -256,18 +257,6 @@ "$type": "Bookmark", "Name": "ST:254354193:0:{71f361cc-493f-47c0-923f-f2570b6f8618}" }, - { - "$type": "Document", - "DocumentIndex": 5, - "Title": "yiqiParam.cs", - "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\yiqiParam.cs", - "RelativeDocumentMoniker": "SLC1-N\\yiqiParam.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\yiqiParam.cs", - "RelativeToolTip": "SLC1-N\\yiqiParam.cs", - "ViewState": "AQIAAJEAAAAAAAAAAAAUwKIAAAAoAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-11-13T10:34:02.056Z" - }, { "$type": "Document", "DocumentIndex": 16, @@ -299,8 +288,7 @@ "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\SLC1-N.csproj", "RelativeToolTip": "SLC1-N\\SLC1-N.csproj", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|", - "WhenOpened": "2025-11-11T02:49:54.535Z", - "EditorCaption": "" + "WhenOpened": "2025-11-11T02:49:54.535Z" }, { "$type": "Document", @@ -311,8 +299,7 @@ "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\Electricity.cs [\u8BBE\u8BA1]", "RelativeToolTip": "SLC1-N\\Electricity.cs [\u8BBE\u8BA1]", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-18T01:03:21.678Z", - "EditorCaption": " [\u8BBE\u8BA1]" + "WhenOpened": "2025-08-18T01:03:21.678Z" }, { "$type": "Document", @@ -324,8 +311,7 @@ "RelativeToolTip": "SLC1-N\\Electricity.cs", "ViewState": "AQIAAGIBAAAAAAAAAAAuwI8BAABdAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-10-30T02:55:49.085Z", - "EditorCaption": "" + "WhenOpened": "2025-10-30T02:55:49.085Z" }, { "$type": "Document", @@ -340,8 +326,16 @@ "EditorCaption": " [\u8BBE\u8BA1]" }, { - "$type": "Bookmark", - "Name": "ST:0:0:{5a4e9529-b6a0-46b5-be4f-0f0b239bc0eb}" + "$type": "Document", + "DocumentIndex": 5, + "Title": "yiqiParam.cs", + "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\yiqiParam.cs", + "RelativeDocumentMoniker": "SLC1-N\\yiqiParam.cs", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\yiqiParam.cs", + "RelativeToolTip": "SLC1-N\\yiqiParam.cs", + "ViewState": "AQIAAJEAAAAAAAAAAAAUwKIAAAAoAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-11-13T10:34:02.056Z" }, { "$type": "Document", @@ -353,8 +347,7 @@ "RelativeToolTip": "SLC1-N\\Electricity.Designer.cs", "ViewState": "AQIAANMCAAAAAAAAAAA1wOoCAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-10-28T09:46:39.581Z", - "EditorCaption": "" + "WhenOpened": "2025-10-28T09:46:39.581Z" }, { "$type": "Document", diff --git a/SLC1-N/Form1.Designer.cs b/SLC1-N/Form1.Designer.cs index 7407c34..c6de339 100644 --- a/SLC1-N/Form1.Designer.cs +++ b/SLC1-N/Form1.Designer.cs @@ -109,6 +109,18 @@ this.label75 = new System.Windows.Forms.Label(); this.label103 = new System.Windows.Forms.Label(); this.uiGroupBox5 = new Sunny.UI.UIGroupBox(); + this.lb_CH2TestPressureDown = new System.Windows.Forms.Label(); + this.label60 = new System.Windows.Forms.Label(); + this.lb_CH2TestPressureUp = new System.Windows.Forms.Label(); + this.label63 = new System.Windows.Forms.Label(); + this.lb_CH2ProcessTime4 = new System.Windows.Forms.Label(); + this.label67 = new System.Windows.Forms.Label(); + this.lb_CH2ProcessTime3 = new System.Windows.Forms.Label(); + this.label72 = new System.Windows.Forms.Label(); + this.lb_CH2ProcessTime2 = new System.Windows.Forms.Label(); + this.label74 = new System.Windows.Forms.Label(); + this.lb_CH2ProcessTime1 = new System.Windows.Forms.Label(); + this.label77 = new System.Windows.Forms.Label(); this.tb_CH2Code = new Sunny.UI.UITextBox(); this.bt_code2clear = new System.Windows.Forms.Button(); this.lb_CH2MES_INstatus = new System.Windows.Forms.Label(); @@ -141,6 +153,18 @@ this.lb_NowTime = new System.Windows.Forms.Label(); this.PLCControl = new Sunny.UI.UIHeaderButton(); this.uiGroupBox1 = new Sunny.UI.UIGroupBox(); + this.lb_CH1TestPressureDown = new System.Windows.Forms.Label(); + this.label43 = new System.Windows.Forms.Label(); + this.lb_CH1TestPressureUp = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.lb_CH1ProcessTime4 = new System.Windows.Forms.Label(); + this.label42 = new System.Windows.Forms.Label(); + this.lb_CH1ProcessTime3 = new System.Windows.Forms.Label(); + this.label46 = new System.Windows.Forms.Label(); + this.lb_CH1ProcessTime2 = new System.Windows.Forms.Label(); + this.label37 = new System.Windows.Forms.Label(); + this.lb_CH1ProcessTime1 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); this.tb_CH1Code = new Sunny.UI.UITextBox(); this.bt_code1clear = new System.Windows.Forms.Button(); this.label34 = new System.Windows.Forms.Label(); @@ -175,6 +199,18 @@ this.timer_SaomaStart = new System.Windows.Forms.Timer(this.components); this.timer_nowTime = new System.Windows.Forms.Timer(this.components); this.uiGroupBox2 = new Sunny.UI.UIGroupBox(); + this.lb_CH3TestPressureDown = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.lb_CH3TestPressureUp = new System.Windows.Forms.Label(); + this.label36 = new System.Windows.Forms.Label(); + this.lb_CH3ProcessTime4 = new System.Windows.Forms.Label(); + this.label44 = new System.Windows.Forms.Label(); + this.lb_CH3ProcessTime3 = new System.Windows.Forms.Label(); + this.label48 = new System.Windows.Forms.Label(); + this.lb_CH3ProcessTime2 = new System.Windows.Forms.Label(); + this.label53 = new System.Windows.Forms.Label(); + this.lb_CH3ProcessTime1 = new System.Windows.Forms.Label(); + this.label57 = new System.Windows.Forms.Label(); this.tb_CH3Code = new Sunny.UI.UITextBox(); this.bt_code3clear = new System.Windows.Forms.Button(); this.label5 = new System.Windows.Forms.Label(); @@ -205,6 +241,18 @@ this.lb_CH3_SmallLeak = new System.Windows.Forms.Label(); this.lb_CH3_TestPressure = new System.Windows.Forms.Label(); this.uiGroupBox3 = new Sunny.UI.UIGroupBox(); + this.lb_CH4TestPressureDown = new System.Windows.Forms.Label(); + this.label79 = new System.Windows.Forms.Label(); + this.lb_CH4TestPressureUp = new System.Windows.Forms.Label(); + this.label81 = new System.Windows.Forms.Label(); + this.lb_CH4ProcessTime4 = new System.Windows.Forms.Label(); + this.label83 = new System.Windows.Forms.Label(); + this.lb_CH4ProcessTime3 = new System.Windows.Forms.Label(); + this.label85 = new System.Windows.Forms.Label(); + this.lb_CH4ProcessTime2 = new System.Windows.Forms.Label(); + this.label87 = new System.Windows.Forms.Label(); + this.lb_CH4ProcessTime1 = new System.Windows.Forms.Label(); + this.label89 = new System.Windows.Forms.Label(); this.tb_CH4Code = new Sunny.UI.UITextBox(); this.bt_code4clear = new System.Windows.Forms.Button(); this.lb_CH4MES_INstatus = new System.Windows.Forms.Label(); @@ -253,54 +301,14 @@ this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.DataGridView2 = new Sunny.UI.UIDataGridView(); this.timer2 = new System.Windows.Forms.Timer(this.components); - this.lb_CH1TestPressureDown = new System.Windows.Forms.Label(); - this.label43 = new System.Windows.Forms.Label(); - this.lb_CH1TestPressureUp = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.lb_CH1ProcessTime4 = new System.Windows.Forms.Label(); - this.label42 = new System.Windows.Forms.Label(); - this.lb_CH1ProcessTime3 = new System.Windows.Forms.Label(); - this.label46 = new System.Windows.Forms.Label(); - this.lb_CH1ProcessTime2 = new System.Windows.Forms.Label(); - this.label37 = new System.Windows.Forms.Label(); - this.lb_CH1ProcessTime1 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.lb_CH3TestPressureDown = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.lb_CH3TestPressureUp = new System.Windows.Forms.Label(); - this.label36 = new System.Windows.Forms.Label(); - this.lb_CH3ProcessTime4 = new System.Windows.Forms.Label(); - this.label44 = new System.Windows.Forms.Label(); - this.lb_CH3ProcessTime3 = new System.Windows.Forms.Label(); - this.label48 = new System.Windows.Forms.Label(); - this.lb_CH3ProcessTime2 = new System.Windows.Forms.Label(); - this.label53 = new System.Windows.Forms.Label(); - this.lb_CH3ProcessTime1 = new System.Windows.Forms.Label(); - this.label57 = new System.Windows.Forms.Label(); - this.lb_CH2TestPressureDown = new System.Windows.Forms.Label(); - this.label60 = new System.Windows.Forms.Label(); - this.lb_CH2TestPressureUp = new System.Windows.Forms.Label(); - this.label63 = new System.Windows.Forms.Label(); - this.lb_CH2ProcessTime4 = new System.Windows.Forms.Label(); - this.label67 = new System.Windows.Forms.Label(); - this.lb_CH2ProcessTime3 = new System.Windows.Forms.Label(); - this.label72 = new System.Windows.Forms.Label(); - this.lb_CH2ProcessTime2 = new System.Windows.Forms.Label(); - this.label74 = new System.Windows.Forms.Label(); - this.lb_CH2ProcessTime1 = new System.Windows.Forms.Label(); - this.label77 = new System.Windows.Forms.Label(); - this.lb_CH4TestPressureDown = new System.Windows.Forms.Label(); - this.label79 = new System.Windows.Forms.Label(); - this.lb_CH4TestPressureUp = new System.Windows.Forms.Label(); - this.label81 = new System.Windows.Forms.Label(); - this.lb_CH4ProcessTime4 = new System.Windows.Forms.Label(); - this.label83 = new System.Windows.Forms.Label(); - this.lb_CH4ProcessTime3 = new System.Windows.Forms.Label(); - this.label85 = new System.Windows.Forms.Label(); - this.lb_CH4ProcessTime2 = new System.Windows.Forms.Label(); - this.label87 = new System.Windows.Forms.Label(); - this.lb_CH4ProcessTime1 = new System.Windows.Forms.Label(); - this.label89 = new System.Windows.Forms.Label(); + this.lb_CH1testTime = new System.Windows.Forms.Label(); + this.label29 = new System.Windows.Forms.Label(); + this.lb_CH2testTime = new System.Windows.Forms.Label(); + this.label59 = new System.Windows.Forms.Label(); + this.lb_CH3testTime = new System.Windows.Forms.Label(); + this.label39 = new System.Windows.Forms.Label(); + this.lb_CH4testTime = new System.Windows.Forms.Label(); + this.label52 = new System.Windows.Forms.Label(); this.uiGroupBox5.SuspendLayout(); this.nb_MainMenu.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pb_MESswitch)).BeginInit(); @@ -336,7 +344,7 @@ this.lb_CH2_SmallLeakUnit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.lb_CH2_SmallLeakUnit.Location = new System.Drawing.Point(354, 151); this.lb_CH2_SmallLeakUnit.Name = "lb_CH2_SmallLeakUnit"; - this.lb_CH2_SmallLeakUnit.Size = new System.Drawing.Size(25, 16); + this.lb_CH2_SmallLeakUnit.Size = new System.Drawing.Size(26, 16); this.lb_CH2_SmallLeakUnit.TabIndex = 423; this.lb_CH2_SmallLeakUnit.Text = "Pa"; // @@ -347,7 +355,7 @@ this.lb_CH2_PressureUnit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.lb_CH2_PressureUnit.Location = new System.Drawing.Point(202, 151); this.lb_CH2_PressureUnit.Name = "lb_CH2_PressureUnit"; - this.lb_CH2_PressureUnit.Size = new System.Drawing.Size(34, 16); + this.lb_CH2_PressureUnit.Size = new System.Drawing.Size(35, 16); this.lb_CH2_PressureUnit.TabIndex = 419; this.lb_CH2_PressureUnit.Text = "Kpa"; // @@ -380,7 +388,7 @@ this.pb_CH2progressBar.Location = new System.Drawing.Point(94, 212); this.pb_CH2progressBar.MinimumSize = new System.Drawing.Size(70, 3); this.pb_CH2progressBar.Name = "pb_CH2progressBar"; - this.pb_CH2progressBar.Size = new System.Drawing.Size(292, 29); + this.pb_CH2progressBar.Size = new System.Drawing.Size(70, 29); this.pb_CH2progressBar.Style = Sunny.UI.UIStyle.Custom; this.pb_CH2progressBar.TabIndex = 28; this.pb_CH2progressBar.Text = "uiProcessBar1"; @@ -404,7 +412,7 @@ this.lb_CH2Communication_status.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.lb_CH2Communication_status.Location = new System.Drawing.Point(29, 178); this.lb_CH2Communication_status.Name = "lb_CH2Communication_status"; - this.lb_CH2Communication_status.Size = new System.Drawing.Size(25, 16); + this.lb_CH2Communication_status.Size = new System.Drawing.Size(26, 16); this.lb_CH2Communication_status.TabIndex = 29; this.lb_CH2Communication_status.Text = "NG"; // @@ -426,7 +434,7 @@ this.lb_CH1_SmallLeakUnit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.lb_CH1_SmallLeakUnit.Location = new System.Drawing.Point(379, 155); this.lb_CH1_SmallLeakUnit.Name = "lb_CH1_SmallLeakUnit"; - this.lb_CH1_SmallLeakUnit.Size = new System.Drawing.Size(25, 16); + this.lb_CH1_SmallLeakUnit.Size = new System.Drawing.Size(26, 16); this.lb_CH1_SmallLeakUnit.TabIndex = 423; this.lb_CH1_SmallLeakUnit.Text = "Pa"; // @@ -437,7 +445,7 @@ this.lb_CH1_PressureUnit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.lb_CH1_PressureUnit.Location = new System.Drawing.Point(230, 155); this.lb_CH1_PressureUnit.Name = "lb_CH1_PressureUnit"; - this.lb_CH1_PressureUnit.Size = new System.Drawing.Size(34, 16); + this.lb_CH1_PressureUnit.Size = new System.Drawing.Size(35, 16); this.lb_CH1_PressureUnit.TabIndex = 419; this.lb_CH1_PressureUnit.Text = "Kpa"; // @@ -460,7 +468,7 @@ this.label69.Location = new System.Drawing.Point(6, 151); this.label69.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label69.Name = "label69"; - this.label69.Size = new System.Drawing.Size(71, 16); + this.label69.Size = new System.Drawing.Size(72, 16); this.label69.TabIndex = 407; this.label69.Text = "通讯状态"; // @@ -472,7 +480,7 @@ this.CH1_2presstext.Location = new System.Drawing.Point(102, 151); this.CH1_2presstext.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.CH1_2presstext.Name = "CH1_2presstext"; - this.CH1_2presstext.Size = new System.Drawing.Size(71, 16); + this.CH1_2presstext.Size = new System.Drawing.Size(72, 16); this.CH1_2presstext.TabIndex = 400; this.CH1_2presstext.Text = "测试压力"; // @@ -484,7 +492,7 @@ this.label75.Location = new System.Drawing.Point(275, 152); this.label75.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label75.Name = "label75"; - this.label75.Size = new System.Drawing.Size(55, 16); + this.label75.Size = new System.Drawing.Size(56, 16); this.label75.TabIndex = 401; this.label75.Text = "泄漏量"; // @@ -501,6 +509,8 @@ // // uiGroupBox5 // + this.uiGroupBox5.Controls.Add(this.lb_CH2testTime); + this.uiGroupBox5.Controls.Add(this.label59); this.uiGroupBox5.Controls.Add(this.lb_CH2TestPressureDown); this.uiGroupBox5.Controls.Add(this.label60); this.uiGroupBox5.Controls.Add(this.lb_CH2TestPressureUp); @@ -547,6 +557,144 @@ this.uiGroupBox5.Text = "CH2工位"; this.uiGroupBox5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // + // lb_CH2TestPressureDown + // + this.lb_CH2TestPressureDown.AutoSize = true; + this.lb_CH2TestPressureDown.BackColor = System.Drawing.Color.Transparent; + this.lb_CH2TestPressureDown.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH2TestPressureDown.Location = new System.Drawing.Point(612, 128); + this.lb_CH2TestPressureDown.Name = "lb_CH2TestPressureDown"; + this.lb_CH2TestPressureDown.Size = new System.Drawing.Size(29, 20); + this.lb_CH2TestPressureDown.TabIndex = 486; + this.lb_CH2TestPressureDown.Text = "##"; + // + // label60 + // + this.label60.AutoSize = true; + this.label60.BackColor = System.Drawing.Color.Transparent; + this.label60.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label60.Location = new System.Drawing.Point(456, 128); + this.label60.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label60.Name = "label60"; + this.label60.Size = new System.Drawing.Size(149, 20); + this.label60.TabIndex = 487; + this.label60.Text = "测试压力下限:"; + // + // lb_CH2TestPressureUp + // + this.lb_CH2TestPressureUp.AutoSize = true; + this.lb_CH2TestPressureUp.BackColor = System.Drawing.Color.Transparent; + this.lb_CH2TestPressureUp.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH2TestPressureUp.Location = new System.Drawing.Point(612, 97); + this.lb_CH2TestPressureUp.Name = "lb_CH2TestPressureUp"; + this.lb_CH2TestPressureUp.Size = new System.Drawing.Size(29, 20); + this.lb_CH2TestPressureUp.TabIndex = 484; + this.lb_CH2TestPressureUp.Text = "##"; + // + // label63 + // + this.label63.AutoSize = true; + this.label63.BackColor = System.Drawing.Color.Transparent; + this.label63.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label63.Location = new System.Drawing.Point(456, 97); + this.label63.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label63.Name = "label63"; + this.label63.Size = new System.Drawing.Size(149, 20); + this.label63.TabIndex = 485; + this.label63.Text = "测试压力上限:"; + // + // lb_CH2ProcessTime4 + // + this.lb_CH2ProcessTime4.AutoSize = true; + this.lb_CH2ProcessTime4.BackColor = System.Drawing.Color.Transparent; + this.lb_CH2ProcessTime4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH2ProcessTime4.Location = new System.Drawing.Point(644, 61); + this.lb_CH2ProcessTime4.Name = "lb_CH2ProcessTime4"; + this.lb_CH2ProcessTime4.Size = new System.Drawing.Size(29, 20); + this.lb_CH2ProcessTime4.TabIndex = 482; + this.lb_CH2ProcessTime4.Text = "##"; + // + // label67 + // + this.label67.AutoSize = true; + this.label67.BackColor = System.Drawing.Color.Transparent; + this.label67.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label67.Location = new System.Drawing.Point(585, 61); + this.label67.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label67.Name = "label67"; + this.label67.Size = new System.Drawing.Size(69, 20); + this.label67.TabIndex = 483; + this.label67.Text = "排气:"; + // + // lb_CH2ProcessTime3 + // + this.lb_CH2ProcessTime3.AutoSize = true; + this.lb_CH2ProcessTime3.BackColor = System.Drawing.Color.Transparent; + this.lb_CH2ProcessTime3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH2ProcessTime3.Location = new System.Drawing.Point(515, 61); + this.lb_CH2ProcessTime3.Name = "lb_CH2ProcessTime3"; + this.lb_CH2ProcessTime3.Size = new System.Drawing.Size(29, 20); + this.lb_CH2ProcessTime3.TabIndex = 480; + this.lb_CH2ProcessTime3.Text = "##"; + // + // label72 + // + this.label72.AutoSize = true; + this.label72.BackColor = System.Drawing.Color.Transparent; + this.label72.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label72.Location = new System.Drawing.Point(456, 61); + this.label72.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label72.Name = "label72"; + this.label72.Size = new System.Drawing.Size(69, 20); + this.label72.TabIndex = 481; + this.label72.Text = "检测:"; + // + // lb_CH2ProcessTime2 + // + this.lb_CH2ProcessTime2.AutoSize = true; + this.lb_CH2ProcessTime2.BackColor = System.Drawing.Color.Transparent; + this.lb_CH2ProcessTime2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH2ProcessTime2.Location = new System.Drawing.Point(644, 30); + this.lb_CH2ProcessTime2.Name = "lb_CH2ProcessTime2"; + this.lb_CH2ProcessTime2.Size = new System.Drawing.Size(29, 20); + this.lb_CH2ProcessTime2.TabIndex = 478; + this.lb_CH2ProcessTime2.Text = "##"; + // + // label74 + // + this.label74.AutoSize = true; + this.label74.BackColor = System.Drawing.Color.Transparent; + this.label74.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label74.Location = new System.Drawing.Point(585, 30); + this.label74.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label74.Name = "label74"; + this.label74.Size = new System.Drawing.Size(69, 20); + this.label74.TabIndex = 479; + this.label74.Text = "平衡:"; + // + // lb_CH2ProcessTime1 + // + this.lb_CH2ProcessTime1.AutoSize = true; + this.lb_CH2ProcessTime1.BackColor = System.Drawing.Color.Transparent; + this.lb_CH2ProcessTime1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH2ProcessTime1.Location = new System.Drawing.Point(515, 30); + this.lb_CH2ProcessTime1.Name = "lb_CH2ProcessTime1"; + this.lb_CH2ProcessTime1.Size = new System.Drawing.Size(29, 20); + this.lb_CH2ProcessTime1.TabIndex = 476; + this.lb_CH2ProcessTime1.Text = "##"; + // + // label77 + // + this.label77.AutoSize = true; + this.label77.BackColor = System.Drawing.Color.Transparent; + this.label77.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label77.Location = new System.Drawing.Point(456, 30); + this.label77.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label77.Name = "label77"; + this.label77.Size = new System.Drawing.Size(69, 20); + this.label77.TabIndex = 477; + this.label77.Text = "充气:"; + // // tb_CH2Code // this.tb_CH2Code.ButtonSymbol = 61761; @@ -618,7 +766,7 @@ this.label10.Location = new System.Drawing.Point(86, 24); this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(87, 16); + this.label10.Size = new System.Drawing.Size(88, 16); this.label10.TabIndex = 436; this.label10.Text = "条码长度:"; // @@ -663,7 +811,7 @@ this.lb_CH1Communication_status.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.lb_CH1Communication_status.Location = new System.Drawing.Point(36, 182); this.lb_CH1Communication_status.Name = "lb_CH1Communication_status"; - this.lb_CH1Communication_status.Size = new System.Drawing.Size(25, 16); + this.lb_CH1Communication_status.Size = new System.Drawing.Size(26, 16); this.lb_CH1Communication_status.TabIndex = 29; this.lb_CH1Communication_status.Text = "NG"; // @@ -696,7 +844,7 @@ this.pb_CH1progressBar.Location = new System.Drawing.Point(88, 211); this.pb_CH1progressBar.MinimumSize = new System.Drawing.Size(70, 3); this.pb_CH1progressBar.Name = "pb_CH1progressBar"; - this.pb_CH1progressBar.Size = new System.Drawing.Size(319, 29); + this.pb_CH1progressBar.Size = new System.Drawing.Size(70, 29); this.pb_CH1progressBar.TabIndex = 28; this.pb_CH1progressBar.Text = "uiProcessBar2"; // @@ -742,7 +890,7 @@ this.label49.Location = new System.Drawing.Point(13, 155); this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(71, 16); + this.label49.Size = new System.Drawing.Size(72, 16); this.label49.TabIndex = 407; this.label49.Text = "通讯状态"; // @@ -754,7 +902,7 @@ this.CH1_1presstext.Location = new System.Drawing.Point(129, 155); this.CH1_1presstext.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.CH1_1presstext.Name = "CH1_1presstext"; - this.CH1_1presstext.Size = new System.Drawing.Size(71, 16); + this.CH1_1presstext.Size = new System.Drawing.Size(72, 16); this.CH1_1presstext.TabIndex = 400; this.CH1_1presstext.Text = "测试压力"; // @@ -766,7 +914,7 @@ this.label51.Location = new System.Drawing.Point(299, 154); this.label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(55, 16); + this.label51.Size = new System.Drawing.Size(56, 16); this.label51.TabIndex = 401; this.label51.Text = "泄漏量"; // @@ -870,7 +1018,7 @@ treeNode29}); this.nb_MainMenu.SelectedForeColor = System.Drawing.Color.Black; this.nb_MainMenu.SelectedHighColor = System.Drawing.Color.FromArgb(((int)(((byte)(142)))), ((int)(((byte)(164)))), ((int)(((byte)(144))))); - this.nb_MainMenu.Size = new System.Drawing.Size(1397, 50); + this.nb_MainMenu.Size = new System.Drawing.Size(1370, 50); this.nb_MainMenu.Style = Sunny.UI.UIStyle.Custom; this.nb_MainMenu.TabIndex = 435; this.nb_MainMenu.Text = "uiNavBar1"; @@ -881,7 +1029,7 @@ this.chk_SaomaFocus.AutoSize = true; this.chk_SaomaFocus.Location = new System.Drawing.Point(642, 16); this.chk_SaomaFocus.Name = "chk_SaomaFocus"; - this.chk_SaomaFocus.Size = new System.Drawing.Size(90, 20); + this.chk_SaomaFocus.Size = new System.Drawing.Size(91, 20); this.chk_SaomaFocus.TabIndex = 474; this.chk_SaomaFocus.Text = "扫码专注"; this.chk_SaomaFocus.UseVisualStyleBackColor = true; @@ -903,7 +1051,7 @@ this.lb_User.AutoSize = true; this.lb_User.Location = new System.Drawing.Point(203, 19); this.lb_User.Name = "lb_User"; - this.lb_User.Size = new System.Drawing.Size(63, 16); + this.lb_User.Size = new System.Drawing.Size(64, 16); this.lb_User.TabIndex = 471; this.lb_User.Text = "label15"; this.lb_User.TabIndexChanged += new System.EventHandler(this.Admin_TabIndexChanged); @@ -921,7 +1069,7 @@ this.lb_MESswitch.AutoSize = true; this.lb_MESswitch.Location = new System.Drawing.Point(463, 16); this.lb_MESswitch.Name = "lb_MESswitch"; - this.lb_MESswitch.Size = new System.Drawing.Size(63, 16); + this.lb_MESswitch.Size = new System.Drawing.Size(64, 16); this.lb_MESswitch.TabIndex = 453; this.lb_MESswitch.Text = "MES离线"; // @@ -939,7 +1087,7 @@ this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(131, 18); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(55, 16); + this.label4.Size = new System.Drawing.Size(56, 16); this.label4.TabIndex = 447; this.label4.Text = "用户:"; // @@ -948,7 +1096,7 @@ this.label22.AutoSize = true; this.label22.Location = new System.Drawing.Point(343, 19); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(31, 16); + this.label22.Size = new System.Drawing.Size(32, 16); this.label22.TabIndex = 451; this.label22.Text = "PLC"; // @@ -992,6 +1140,8 @@ // // uiGroupBox1 // + this.uiGroupBox1.Controls.Add(this.lb_CH1testTime); + this.uiGroupBox1.Controls.Add(this.label29); this.uiGroupBox1.Controls.Add(this.lb_CH1TestPressureDown); this.uiGroupBox1.Controls.Add(this.label43); this.uiGroupBox1.Controls.Add(this.lb_CH1TestPressureUp); @@ -1044,6 +1194,144 @@ this.uiGroupBox1.Text = "CH1工位"; this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // + // lb_CH1TestPressureDown + // + this.lb_CH1TestPressureDown.AutoSize = true; + this.lb_CH1TestPressureDown.BackColor = System.Drawing.Color.Transparent; + this.lb_CH1TestPressureDown.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH1TestPressureDown.Location = new System.Drawing.Point(599, 128); + this.lb_CH1TestPressureDown.Name = "lb_CH1TestPressureDown"; + this.lb_CH1TestPressureDown.Size = new System.Drawing.Size(29, 20); + this.lb_CH1TestPressureDown.TabIndex = 474; + this.lb_CH1TestPressureDown.Text = "##"; + // + // label43 + // + this.label43.AutoSize = true; + this.label43.BackColor = System.Drawing.Color.Transparent; + this.label43.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label43.Location = new System.Drawing.Point(443, 128); + this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label43.Name = "label43"; + this.label43.Size = new System.Drawing.Size(149, 20); + this.label43.TabIndex = 475; + this.label43.Text = "测试压力下限:"; + // + // lb_CH1TestPressureUp + // + this.lb_CH1TestPressureUp.AutoSize = true; + this.lb_CH1TestPressureUp.BackColor = System.Drawing.Color.Transparent; + this.lb_CH1TestPressureUp.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH1TestPressureUp.Location = new System.Drawing.Point(599, 97); + this.lb_CH1TestPressureUp.Name = "lb_CH1TestPressureUp"; + this.lb_CH1TestPressureUp.Size = new System.Drawing.Size(29, 20); + this.lb_CH1TestPressureUp.TabIndex = 472; + this.lb_CH1TestPressureUp.Text = "##"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.BackColor = System.Drawing.Color.Transparent; + this.label6.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label6.Location = new System.Drawing.Point(443, 97); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(149, 20); + this.label6.TabIndex = 473; + this.label6.Text = "测试压力上限:"; + // + // lb_CH1ProcessTime4 + // + this.lb_CH1ProcessTime4.AutoSize = true; + this.lb_CH1ProcessTime4.BackColor = System.Drawing.Color.Transparent; + this.lb_CH1ProcessTime4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH1ProcessTime4.Location = new System.Drawing.Point(631, 61); + this.lb_CH1ProcessTime4.Name = "lb_CH1ProcessTime4"; + this.lb_CH1ProcessTime4.Size = new System.Drawing.Size(29, 20); + this.lb_CH1ProcessTime4.TabIndex = 470; + this.lb_CH1ProcessTime4.Text = "##"; + // + // label42 + // + this.label42.AutoSize = true; + this.label42.BackColor = System.Drawing.Color.Transparent; + this.label42.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label42.Location = new System.Drawing.Point(572, 61); + this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label42.Name = "label42"; + this.label42.Size = new System.Drawing.Size(69, 20); + this.label42.TabIndex = 471; + this.label42.Text = "排气:"; + // + // lb_CH1ProcessTime3 + // + this.lb_CH1ProcessTime3.AutoSize = true; + this.lb_CH1ProcessTime3.BackColor = System.Drawing.Color.Transparent; + this.lb_CH1ProcessTime3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH1ProcessTime3.Location = new System.Drawing.Point(502, 61); + this.lb_CH1ProcessTime3.Name = "lb_CH1ProcessTime3"; + this.lb_CH1ProcessTime3.Size = new System.Drawing.Size(29, 20); + this.lb_CH1ProcessTime3.TabIndex = 468; + this.lb_CH1ProcessTime3.Text = "##"; + // + // label46 + // + this.label46.AutoSize = true; + this.label46.BackColor = System.Drawing.Color.Transparent; + this.label46.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label46.Location = new System.Drawing.Point(443, 61); + this.label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label46.Name = "label46"; + this.label46.Size = new System.Drawing.Size(69, 20); + this.label46.TabIndex = 469; + this.label46.Text = "检测:"; + // + // lb_CH1ProcessTime2 + // + this.lb_CH1ProcessTime2.AutoSize = true; + this.lb_CH1ProcessTime2.BackColor = System.Drawing.Color.Transparent; + this.lb_CH1ProcessTime2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH1ProcessTime2.Location = new System.Drawing.Point(631, 30); + this.lb_CH1ProcessTime2.Name = "lb_CH1ProcessTime2"; + this.lb_CH1ProcessTime2.Size = new System.Drawing.Size(29, 20); + this.lb_CH1ProcessTime2.TabIndex = 466; + this.lb_CH1ProcessTime2.Text = "##"; + // + // label37 + // + this.label37.AutoSize = true; + this.label37.BackColor = System.Drawing.Color.Transparent; + this.label37.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label37.Location = new System.Drawing.Point(572, 30); + this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label37.Name = "label37"; + this.label37.Size = new System.Drawing.Size(69, 20); + this.label37.TabIndex = 467; + this.label37.Text = "平衡:"; + // + // lb_CH1ProcessTime1 + // + this.lb_CH1ProcessTime1.AutoSize = true; + this.lb_CH1ProcessTime1.BackColor = System.Drawing.Color.Transparent; + this.lb_CH1ProcessTime1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH1ProcessTime1.Location = new System.Drawing.Point(502, 30); + this.lb_CH1ProcessTime1.Name = "lb_CH1ProcessTime1"; + this.lb_CH1ProcessTime1.Size = new System.Drawing.Size(29, 20); + this.lb_CH1ProcessTime1.TabIndex = 464; + this.lb_CH1ProcessTime1.Text = "##"; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.BackColor = System.Drawing.Color.Transparent; + this.label15.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.Location = new System.Drawing.Point(443, 30); + this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(69, 20); + this.label15.TabIndex = 465; + this.label15.Text = "充气:"; + // // tb_CH1Code // this.tb_CH1Code.ButtonSymbol = 61761; @@ -1081,7 +1369,7 @@ this.label34.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.label34.Location = new System.Drawing.Point(526, 275); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(75, 16); + this.label34.Size = new System.Drawing.Size(76, 16); this.label34.TabIndex = 447; this.label34.Text = "正压模式"; this.label34.Visible = false; @@ -1102,7 +1390,7 @@ this.label31.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.label31.Location = new System.Drawing.Point(396, 275); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(75, 16); + this.label31.Size = new System.Drawing.Size(76, 16); this.label31.TabIndex = 445; this.label31.Text = "负压模式"; this.label31.Visible = false; @@ -1123,7 +1411,7 @@ this.label28.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.label28.Location = new System.Drawing.Point(201, 275); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(75, 16); + this.label28.Size = new System.Drawing.Size(76, 16); this.label28.TabIndex = 443; this.label28.Text = "扫码完成"; // @@ -1142,7 +1430,7 @@ this.label18.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.label18.Location = new System.Drawing.Point(20, 275); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(75, 16); + this.label18.Size = new System.Drawing.Size(76, 16); this.label18.TabIndex = 441; this.label18.Text = "开始扫码"; // @@ -1194,7 +1482,7 @@ this.label9.Location = new System.Drawing.Point(79, 27); this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(87, 16); + this.label9.Size = new System.Drawing.Size(88, 16); this.label9.TabIndex = 434; this.label9.Text = "条码长度:"; // @@ -1405,6 +1693,8 @@ // // uiGroupBox2 // + this.uiGroupBox2.Controls.Add(this.lb_CH3testTime); + this.uiGroupBox2.Controls.Add(this.label39); this.uiGroupBox2.Controls.Add(this.lb_CH3TestPressureDown); this.uiGroupBox2.Controls.Add(this.label3); this.uiGroupBox2.Controls.Add(this.lb_CH3TestPressureUp); @@ -1459,6 +1749,144 @@ this.uiGroupBox2.Text = "CH3工位"; this.uiGroupBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // + // lb_CH3TestPressureDown + // + this.lb_CH3TestPressureDown.AutoSize = true; + this.lb_CH3TestPressureDown.BackColor = System.Drawing.Color.Transparent; + this.lb_CH3TestPressureDown.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH3TestPressureDown.Location = new System.Drawing.Point(598, 128); + this.lb_CH3TestPressureDown.Name = "lb_CH3TestPressureDown"; + this.lb_CH3TestPressureDown.Size = new System.Drawing.Size(29, 20); + this.lb_CH3TestPressureDown.TabIndex = 486; + this.lb_CH3TestPressureDown.Text = "##"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.BackColor = System.Drawing.Color.Transparent; + this.label3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(442, 128); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(149, 20); + this.label3.TabIndex = 487; + this.label3.Text = "测试压力下限:"; + // + // lb_CH3TestPressureUp + // + this.lb_CH3TestPressureUp.AutoSize = true; + this.lb_CH3TestPressureUp.BackColor = System.Drawing.Color.Transparent; + this.lb_CH3TestPressureUp.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH3TestPressureUp.Location = new System.Drawing.Point(598, 97); + this.lb_CH3TestPressureUp.Name = "lb_CH3TestPressureUp"; + this.lb_CH3TestPressureUp.Size = new System.Drawing.Size(29, 20); + this.lb_CH3TestPressureUp.TabIndex = 484; + this.lb_CH3TestPressureUp.Text = "##"; + // + // label36 + // + this.label36.AutoSize = true; + this.label36.BackColor = System.Drawing.Color.Transparent; + this.label36.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label36.Location = new System.Drawing.Point(442, 97); + this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label36.Name = "label36"; + this.label36.Size = new System.Drawing.Size(149, 20); + this.label36.TabIndex = 485; + this.label36.Text = "测试压力上限:"; + // + // lb_CH3ProcessTime4 + // + this.lb_CH3ProcessTime4.AutoSize = true; + this.lb_CH3ProcessTime4.BackColor = System.Drawing.Color.Transparent; + this.lb_CH3ProcessTime4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH3ProcessTime4.Location = new System.Drawing.Point(630, 61); + this.lb_CH3ProcessTime4.Name = "lb_CH3ProcessTime4"; + this.lb_CH3ProcessTime4.Size = new System.Drawing.Size(29, 20); + this.lb_CH3ProcessTime4.TabIndex = 482; + this.lb_CH3ProcessTime4.Text = "##"; + // + // label44 + // + this.label44.AutoSize = true; + this.label44.BackColor = System.Drawing.Color.Transparent; + this.label44.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label44.Location = new System.Drawing.Point(571, 61); + this.label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label44.Name = "label44"; + this.label44.Size = new System.Drawing.Size(69, 20); + this.label44.TabIndex = 483; + this.label44.Text = "排气:"; + // + // lb_CH3ProcessTime3 + // + this.lb_CH3ProcessTime3.AutoSize = true; + this.lb_CH3ProcessTime3.BackColor = System.Drawing.Color.Transparent; + this.lb_CH3ProcessTime3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH3ProcessTime3.Location = new System.Drawing.Point(501, 61); + this.lb_CH3ProcessTime3.Name = "lb_CH3ProcessTime3"; + this.lb_CH3ProcessTime3.Size = new System.Drawing.Size(29, 20); + this.lb_CH3ProcessTime3.TabIndex = 480; + this.lb_CH3ProcessTime3.Text = "##"; + // + // label48 + // + this.label48.AutoSize = true; + this.label48.BackColor = System.Drawing.Color.Transparent; + this.label48.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label48.Location = new System.Drawing.Point(442, 61); + this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label48.Name = "label48"; + this.label48.Size = new System.Drawing.Size(69, 20); + this.label48.TabIndex = 481; + this.label48.Text = "检测:"; + // + // lb_CH3ProcessTime2 + // + this.lb_CH3ProcessTime2.AutoSize = true; + this.lb_CH3ProcessTime2.BackColor = System.Drawing.Color.Transparent; + this.lb_CH3ProcessTime2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH3ProcessTime2.Location = new System.Drawing.Point(630, 30); + this.lb_CH3ProcessTime2.Name = "lb_CH3ProcessTime2"; + this.lb_CH3ProcessTime2.Size = new System.Drawing.Size(29, 20); + this.lb_CH3ProcessTime2.TabIndex = 478; + this.lb_CH3ProcessTime2.Text = "##"; + // + // label53 + // + this.label53.AutoSize = true; + this.label53.BackColor = System.Drawing.Color.Transparent; + this.label53.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label53.Location = new System.Drawing.Point(571, 30); + this.label53.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label53.Name = "label53"; + this.label53.Size = new System.Drawing.Size(69, 20); + this.label53.TabIndex = 479; + this.label53.Text = "平衡:"; + // + // lb_CH3ProcessTime1 + // + this.lb_CH3ProcessTime1.AutoSize = true; + this.lb_CH3ProcessTime1.BackColor = System.Drawing.Color.Transparent; + this.lb_CH3ProcessTime1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH3ProcessTime1.Location = new System.Drawing.Point(501, 30); + this.lb_CH3ProcessTime1.Name = "lb_CH3ProcessTime1"; + this.lb_CH3ProcessTime1.Size = new System.Drawing.Size(29, 20); + this.lb_CH3ProcessTime1.TabIndex = 476; + this.lb_CH3ProcessTime1.Text = "##"; + // + // label57 + // + this.label57.AutoSize = true; + this.label57.BackColor = System.Drawing.Color.Transparent; + this.label57.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label57.Location = new System.Drawing.Point(442, 30); + this.label57.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label57.Name = "label57"; + this.label57.Size = new System.Drawing.Size(69, 20); + this.label57.TabIndex = 477; + this.label57.Text = "充气:"; + // // tb_CH3Code // this.tb_CH3Code.ButtonSymbol = 61761; @@ -1497,7 +1925,7 @@ this.label5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.label5.Location = new System.Drawing.Point(526, 275); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(75, 16); + this.label5.Size = new System.Drawing.Size(76, 16); this.label5.TabIndex = 447; this.label5.Text = "正压模式"; this.label5.Visible = false; @@ -1518,7 +1946,7 @@ this.label11.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.label11.Location = new System.Drawing.Point(396, 275); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(75, 16); + this.label11.Size = new System.Drawing.Size(76, 16); this.label11.TabIndex = 445; this.label11.Text = "负压模式"; this.label11.Visible = false; @@ -1539,7 +1967,7 @@ this.label12.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.label12.Location = new System.Drawing.Point(201, 275); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(75, 16); + this.label12.Size = new System.Drawing.Size(76, 16); this.label12.TabIndex = 443; this.label12.Text = "扫码完成"; // @@ -1558,7 +1986,7 @@ this.label13.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.label13.Location = new System.Drawing.Point(20, 275); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(75, 16); + this.label13.Size = new System.Drawing.Size(76, 16); this.label13.TabIndex = 441; this.label13.Text = "开始扫码"; // @@ -1609,7 +2037,7 @@ this.label20.Location = new System.Drawing.Point(79, 27); this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(87, 16); + this.label20.Size = new System.Drawing.Size(88, 16); this.label20.TabIndex = 434; this.label20.Text = "条码长度:"; // @@ -1643,7 +2071,7 @@ this.lb_CH3_SmallLeakUnit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.lb_CH3_SmallLeakUnit.Location = new System.Drawing.Point(379, 155); this.lb_CH3_SmallLeakUnit.Name = "lb_CH3_SmallLeakUnit"; - this.lb_CH3_SmallLeakUnit.Size = new System.Drawing.Size(25, 16); + this.lb_CH3_SmallLeakUnit.Size = new System.Drawing.Size(26, 16); this.lb_CH3_SmallLeakUnit.TabIndex = 423; this.lb_CH3_SmallLeakUnit.Text = "Pa"; // @@ -1654,7 +2082,7 @@ this.lb_CH3_PressureUnit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.lb_CH3_PressureUnit.Location = new System.Drawing.Point(230, 155); this.lb_CH3_PressureUnit.Name = "lb_CH3_PressureUnit"; - this.lb_CH3_PressureUnit.Size = new System.Drawing.Size(34, 16); + this.lb_CH3_PressureUnit.Size = new System.Drawing.Size(35, 16); this.lb_CH3_PressureUnit.TabIndex = 419; this.lb_CH3_PressureUnit.Text = "Kpa"; // @@ -1698,7 +2126,7 @@ this.pb_CH3progressBar.Location = new System.Drawing.Point(88, 211); this.pb_CH3progressBar.MinimumSize = new System.Drawing.Size(70, 3); this.pb_CH3progressBar.Name = "pb_CH3progressBar"; - this.pb_CH3progressBar.Size = new System.Drawing.Size(319, 29); + this.pb_CH3progressBar.Size = new System.Drawing.Size(70, 29); this.pb_CH3progressBar.Style = Sunny.UI.UIStyle.Custom; this.pb_CH3progressBar.TabIndex = 28; this.pb_CH3progressBar.Text = "uiProcessBar2"; @@ -1711,7 +2139,7 @@ this.label33.Location = new System.Drawing.Point(299, 154); this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(55, 16); + this.label33.Size = new System.Drawing.Size(56, 16); this.label33.TabIndex = 401; this.label33.Text = "泄漏量"; // @@ -1734,7 +2162,7 @@ this.lb_CH3Communication_status.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.lb_CH3Communication_status.Location = new System.Drawing.Point(36, 182); this.lb_CH3Communication_status.Name = "lb_CH3Communication_status"; - this.lb_CH3Communication_status.Size = new System.Drawing.Size(25, 16); + this.lb_CH3Communication_status.Size = new System.Drawing.Size(26, 16); this.lb_CH3Communication_status.TabIndex = 29; this.lb_CH3Communication_status.Text = "NG"; // @@ -1746,7 +2174,7 @@ this.label38.Location = new System.Drawing.Point(129, 155); this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(71, 16); + this.label38.Size = new System.Drawing.Size(72, 16); this.label38.TabIndex = 400; this.label38.Text = "测试压力"; // @@ -1758,7 +2186,7 @@ this.label40.Location = new System.Drawing.Point(13, 155); this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label40.Name = "label40"; - this.label40.Size = new System.Drawing.Size(71, 16); + this.label40.Size = new System.Drawing.Size(72, 16); this.label40.TabIndex = 407; this.label40.Text = "通讯状态"; // @@ -1786,6 +2214,8 @@ // // uiGroupBox3 // + this.uiGroupBox3.Controls.Add(this.lb_CH4testTime); + this.uiGroupBox3.Controls.Add(this.label52); this.uiGroupBox3.Controls.Add(this.lb_CH4TestPressureDown); this.uiGroupBox3.Controls.Add(this.label79); this.uiGroupBox3.Controls.Add(this.lb_CH4TestPressureUp); @@ -1832,6 +2262,144 @@ this.uiGroupBox3.Text = "CH4工位"; this.uiGroupBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // + // lb_CH4TestPressureDown + // + this.lb_CH4TestPressureDown.AutoSize = true; + this.lb_CH4TestPressureDown.BackColor = System.Drawing.Color.Transparent; + this.lb_CH4TestPressureDown.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH4TestPressureDown.Location = new System.Drawing.Point(612, 132); + this.lb_CH4TestPressureDown.Name = "lb_CH4TestPressureDown"; + this.lb_CH4TestPressureDown.Size = new System.Drawing.Size(29, 20); + this.lb_CH4TestPressureDown.TabIndex = 498; + this.lb_CH4TestPressureDown.Text = "##"; + // + // label79 + // + this.label79.AutoSize = true; + this.label79.BackColor = System.Drawing.Color.Transparent; + this.label79.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label79.Location = new System.Drawing.Point(456, 132); + this.label79.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label79.Name = "label79"; + this.label79.Size = new System.Drawing.Size(149, 20); + this.label79.TabIndex = 499; + this.label79.Text = "测试压力下限:"; + // + // lb_CH4TestPressureUp + // + this.lb_CH4TestPressureUp.AutoSize = true; + this.lb_CH4TestPressureUp.BackColor = System.Drawing.Color.Transparent; + this.lb_CH4TestPressureUp.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH4TestPressureUp.Location = new System.Drawing.Point(612, 101); + this.lb_CH4TestPressureUp.Name = "lb_CH4TestPressureUp"; + this.lb_CH4TestPressureUp.Size = new System.Drawing.Size(29, 20); + this.lb_CH4TestPressureUp.TabIndex = 496; + this.lb_CH4TestPressureUp.Text = "##"; + // + // label81 + // + this.label81.AutoSize = true; + this.label81.BackColor = System.Drawing.Color.Transparent; + this.label81.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label81.Location = new System.Drawing.Point(456, 101); + this.label81.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label81.Name = "label81"; + this.label81.Size = new System.Drawing.Size(149, 20); + this.label81.TabIndex = 497; + this.label81.Text = "测试压力上限:"; + // + // lb_CH4ProcessTime4 + // + this.lb_CH4ProcessTime4.AutoSize = true; + this.lb_CH4ProcessTime4.BackColor = System.Drawing.Color.Transparent; + this.lb_CH4ProcessTime4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH4ProcessTime4.Location = new System.Drawing.Point(644, 65); + this.lb_CH4ProcessTime4.Name = "lb_CH4ProcessTime4"; + this.lb_CH4ProcessTime4.Size = new System.Drawing.Size(29, 20); + this.lb_CH4ProcessTime4.TabIndex = 494; + this.lb_CH4ProcessTime4.Text = "##"; + // + // label83 + // + this.label83.AutoSize = true; + this.label83.BackColor = System.Drawing.Color.Transparent; + this.label83.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label83.Location = new System.Drawing.Point(585, 65); + this.label83.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label83.Name = "label83"; + this.label83.Size = new System.Drawing.Size(69, 20); + this.label83.TabIndex = 495; + this.label83.Text = "排气:"; + // + // lb_CH4ProcessTime3 + // + this.lb_CH4ProcessTime3.AutoSize = true; + this.lb_CH4ProcessTime3.BackColor = System.Drawing.Color.Transparent; + this.lb_CH4ProcessTime3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH4ProcessTime3.Location = new System.Drawing.Point(515, 65); + this.lb_CH4ProcessTime3.Name = "lb_CH4ProcessTime3"; + this.lb_CH4ProcessTime3.Size = new System.Drawing.Size(29, 20); + this.lb_CH4ProcessTime3.TabIndex = 492; + this.lb_CH4ProcessTime3.Text = "##"; + // + // label85 + // + this.label85.AutoSize = true; + this.label85.BackColor = System.Drawing.Color.Transparent; + this.label85.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label85.Location = new System.Drawing.Point(456, 65); + this.label85.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label85.Name = "label85"; + this.label85.Size = new System.Drawing.Size(69, 20); + this.label85.TabIndex = 493; + this.label85.Text = "检测:"; + // + // lb_CH4ProcessTime2 + // + this.lb_CH4ProcessTime2.AutoSize = true; + this.lb_CH4ProcessTime2.BackColor = System.Drawing.Color.Transparent; + this.lb_CH4ProcessTime2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH4ProcessTime2.Location = new System.Drawing.Point(644, 34); + this.lb_CH4ProcessTime2.Name = "lb_CH4ProcessTime2"; + this.lb_CH4ProcessTime2.Size = new System.Drawing.Size(29, 20); + this.lb_CH4ProcessTime2.TabIndex = 490; + this.lb_CH4ProcessTime2.Text = "##"; + // + // label87 + // + this.label87.AutoSize = true; + this.label87.BackColor = System.Drawing.Color.Transparent; + this.label87.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label87.Location = new System.Drawing.Point(585, 34); + this.label87.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label87.Name = "label87"; + this.label87.Size = new System.Drawing.Size(69, 20); + this.label87.TabIndex = 491; + this.label87.Text = "平衡:"; + // + // lb_CH4ProcessTime1 + // + this.lb_CH4ProcessTime1.AutoSize = true; + this.lb_CH4ProcessTime1.BackColor = System.Drawing.Color.Transparent; + this.lb_CH4ProcessTime1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH4ProcessTime1.Location = new System.Drawing.Point(515, 34); + this.lb_CH4ProcessTime1.Name = "lb_CH4ProcessTime1"; + this.lb_CH4ProcessTime1.Size = new System.Drawing.Size(29, 20); + this.lb_CH4ProcessTime1.TabIndex = 488; + this.lb_CH4ProcessTime1.Text = "##"; + // + // label89 + // + this.label89.AutoSize = true; + this.label89.BackColor = System.Drawing.Color.Transparent; + this.label89.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label89.Location = new System.Drawing.Point(456, 34); + this.label89.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label89.Name = "label89"; + this.label89.Size = new System.Drawing.Size(69, 20); + this.label89.TabIndex = 489; + this.label89.Text = "充气:"; + // // tb_CH4Code // this.tb_CH4Code.ButtonSymbol = 61761; @@ -1900,7 +2468,7 @@ this.pb_CH4progressBar.Location = new System.Drawing.Point(94, 212); this.pb_CH4progressBar.MinimumSize = new System.Drawing.Size(70, 3); this.pb_CH4progressBar.Name = "pb_CH4progressBar"; - this.pb_CH4progressBar.Size = new System.Drawing.Size(292, 29); + this.pb_CH4progressBar.Size = new System.Drawing.Size(70, 29); this.pb_CH4progressBar.Style = Sunny.UI.UIStyle.Custom; this.pb_CH4progressBar.TabIndex = 28; this.pb_CH4progressBar.Text = "uiProcessBar1"; @@ -1913,7 +2481,7 @@ this.label56.Location = new System.Drawing.Point(86, 24); this.label56.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(87, 16); + this.label56.Size = new System.Drawing.Size(88, 16); this.label56.TabIndex = 436; this.label56.Text = "条码长度:"; // @@ -1947,7 +2515,7 @@ this.lb_CH4_SmallLeakUnit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.lb_CH4_SmallLeakUnit.Location = new System.Drawing.Point(354, 151); this.lb_CH4_SmallLeakUnit.Name = "lb_CH4_SmallLeakUnit"; - this.lb_CH4_SmallLeakUnit.Size = new System.Drawing.Size(25, 16); + this.lb_CH4_SmallLeakUnit.Size = new System.Drawing.Size(26, 16); this.lb_CH4_SmallLeakUnit.TabIndex = 423; this.lb_CH4_SmallLeakUnit.Text = "Pa"; // @@ -1958,7 +2526,7 @@ this.lb_CH4_PressureUnit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.lb_CH4_PressureUnit.Location = new System.Drawing.Point(202, 151); this.lb_CH4_PressureUnit.Name = "lb_CH4_PressureUnit"; - this.lb_CH4_PressureUnit.Size = new System.Drawing.Size(34, 16); + this.lb_CH4_PressureUnit.Size = new System.Drawing.Size(35, 16); this.lb_CH4_PressureUnit.TabIndex = 419; this.lb_CH4_PressureUnit.Text = "Kpa"; // @@ -2004,7 +2572,7 @@ this.label65.Location = new System.Drawing.Point(275, 152); this.label65.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(55, 16); + this.label65.Size = new System.Drawing.Size(56, 16); this.label65.TabIndex = 401; this.label65.Text = "泄漏量"; // @@ -2027,7 +2595,7 @@ this.lb_CH4Communication_status.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.lb_CH4Communication_status.Location = new System.Drawing.Point(29, 178); this.lb_CH4Communication_status.Name = "lb_CH4Communication_status"; - this.lb_CH4Communication_status.Size = new System.Drawing.Size(25, 16); + this.lb_CH4Communication_status.Size = new System.Drawing.Size(26, 16); this.lb_CH4Communication_status.TabIndex = 29; this.lb_CH4Communication_status.Text = "NG"; // @@ -2039,7 +2607,7 @@ this.label70.Location = new System.Drawing.Point(102, 151); this.label70.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label70.Name = "label70"; - this.label70.Size = new System.Drawing.Size(71, 16); + this.label70.Size = new System.Drawing.Size(72, 16); this.label70.TabIndex = 400; this.label70.Text = "测试压力"; // @@ -2051,7 +2619,7 @@ this.label71.Location = new System.Drawing.Point(6, 151); this.label71.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label71.Name = "label71"; - this.label71.Size = new System.Drawing.Size(71, 16); + this.label71.Size = new System.Drawing.Size(72, 16); this.label71.TabIndex = 407; this.label71.Text = "通讯状态"; // @@ -2203,7 +2771,7 @@ this.label17.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.label17.Location = new System.Drawing.Point(526, 275); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(75, 16); + this.label17.Size = new System.Drawing.Size(76, 16); this.label17.TabIndex = 447; this.label17.Text = "正压模式"; this.label17.Visible = false; @@ -2224,7 +2792,7 @@ this.label21.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.label21.Location = new System.Drawing.Point(396, 275); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(75, 16); + this.label21.Size = new System.Drawing.Size(76, 16); this.label21.TabIndex = 445; this.label21.Text = "负压模式"; this.label21.Visible = false; @@ -2245,7 +2813,7 @@ this.label24.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.label24.Location = new System.Drawing.Point(201, 275); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(75, 16); + this.label24.Size = new System.Drawing.Size(76, 16); this.label24.TabIndex = 443; this.label24.Text = "扫码完成"; // @@ -2264,7 +2832,7 @@ this.label25.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); this.label25.Location = new System.Drawing.Point(20, 275); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(75, 16); + this.label25.Size = new System.Drawing.Size(76, 16); this.label25.TabIndex = 441; this.label25.Text = "开始扫码"; // @@ -2386,563 +2954,103 @@ // this.timer2.Tick += new System.EventHandler(this.timer2_Tick); // - // lb_CH1TestPressureDown - // - this.lb_CH1TestPressureDown.AutoSize = true; - this.lb_CH1TestPressureDown.BackColor = System.Drawing.Color.Transparent; - this.lb_CH1TestPressureDown.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH1TestPressureDown.Location = new System.Drawing.Point(599, 128); - this.lb_CH1TestPressureDown.Name = "lb_CH1TestPressureDown"; - this.lb_CH1TestPressureDown.Size = new System.Drawing.Size(29, 20); - this.lb_CH1TestPressureDown.TabIndex = 474; - this.lb_CH1TestPressureDown.Text = "##"; - // - // label43 - // - this.label43.AutoSize = true; - this.label43.BackColor = System.Drawing.Color.Transparent; - this.label43.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label43.Location = new System.Drawing.Point(443, 128); - this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(149, 20); - this.label43.TabIndex = 475; - this.label43.Text = "测试压力下限:"; - // - // lb_CH1TestPressureUp - // - this.lb_CH1TestPressureUp.AutoSize = true; - this.lb_CH1TestPressureUp.BackColor = System.Drawing.Color.Transparent; - this.lb_CH1TestPressureUp.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH1TestPressureUp.Location = new System.Drawing.Point(599, 97); - this.lb_CH1TestPressureUp.Name = "lb_CH1TestPressureUp"; - this.lb_CH1TestPressureUp.Size = new System.Drawing.Size(29, 20); - this.lb_CH1TestPressureUp.TabIndex = 472; - this.lb_CH1TestPressureUp.Text = "##"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.BackColor = System.Drawing.Color.Transparent; - this.label6.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(443, 97); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(149, 20); - this.label6.TabIndex = 473; - this.label6.Text = "测试压力上限:"; - // - // lb_CH1ProcessTime4 - // - this.lb_CH1ProcessTime4.AutoSize = true; - this.lb_CH1ProcessTime4.BackColor = System.Drawing.Color.Transparent; - this.lb_CH1ProcessTime4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH1ProcessTime4.Location = new System.Drawing.Point(631, 61); - this.lb_CH1ProcessTime4.Name = "lb_CH1ProcessTime4"; - this.lb_CH1ProcessTime4.Size = new System.Drawing.Size(29, 20); - this.lb_CH1ProcessTime4.TabIndex = 470; - this.lb_CH1ProcessTime4.Text = "##"; - // - // label42 - // - this.label42.AutoSize = true; - this.label42.BackColor = System.Drawing.Color.Transparent; - this.label42.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label42.Location = new System.Drawing.Point(572, 61); - this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(69, 20); - this.label42.TabIndex = 471; - this.label42.Text = "排气:"; - // - // lb_CH1ProcessTime3 - // - this.lb_CH1ProcessTime3.AutoSize = true; - this.lb_CH1ProcessTime3.BackColor = System.Drawing.Color.Transparent; - this.lb_CH1ProcessTime3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH1ProcessTime3.Location = new System.Drawing.Point(502, 61); - this.lb_CH1ProcessTime3.Name = "lb_CH1ProcessTime3"; - this.lb_CH1ProcessTime3.Size = new System.Drawing.Size(29, 20); - this.lb_CH1ProcessTime3.TabIndex = 468; - this.lb_CH1ProcessTime3.Text = "##"; - // - // label46 - // - this.label46.AutoSize = true; - this.label46.BackColor = System.Drawing.Color.Transparent; - this.label46.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label46.Location = new System.Drawing.Point(443, 61); - this.label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(69, 20); - this.label46.TabIndex = 469; - this.label46.Text = "检测:"; - // - // lb_CH1ProcessTime2 - // - this.lb_CH1ProcessTime2.AutoSize = true; - this.lb_CH1ProcessTime2.BackColor = System.Drawing.Color.Transparent; - this.lb_CH1ProcessTime2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH1ProcessTime2.Location = new System.Drawing.Point(631, 30); - this.lb_CH1ProcessTime2.Name = "lb_CH1ProcessTime2"; - this.lb_CH1ProcessTime2.Size = new System.Drawing.Size(29, 20); - this.lb_CH1ProcessTime2.TabIndex = 466; - this.lb_CH1ProcessTime2.Text = "##"; - // - // label37 - // - this.label37.AutoSize = true; - this.label37.BackColor = System.Drawing.Color.Transparent; - this.label37.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label37.Location = new System.Drawing.Point(572, 30); - this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(69, 20); - this.label37.TabIndex = 467; - this.label37.Text = "平衡:"; - // - // lb_CH1ProcessTime1 - // - this.lb_CH1ProcessTime1.AutoSize = true; - this.lb_CH1ProcessTime1.BackColor = System.Drawing.Color.Transparent; - this.lb_CH1ProcessTime1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH1ProcessTime1.Location = new System.Drawing.Point(502, 30); - this.lb_CH1ProcessTime1.Name = "lb_CH1ProcessTime1"; - this.lb_CH1ProcessTime1.Size = new System.Drawing.Size(29, 20); - this.lb_CH1ProcessTime1.TabIndex = 464; - this.lb_CH1ProcessTime1.Text = "##"; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.BackColor = System.Drawing.Color.Transparent; - this.label15.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(443, 30); - this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(69, 20); - this.label15.TabIndex = 465; - this.label15.Text = "充气:"; - // - // lb_CH3TestPressureDown - // - this.lb_CH3TestPressureDown.AutoSize = true; - this.lb_CH3TestPressureDown.BackColor = System.Drawing.Color.Transparent; - this.lb_CH3TestPressureDown.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH3TestPressureDown.Location = new System.Drawing.Point(598, 128); - this.lb_CH3TestPressureDown.Name = "lb_CH3TestPressureDown"; - this.lb_CH3TestPressureDown.Size = new System.Drawing.Size(29, 20); - this.lb_CH3TestPressureDown.TabIndex = 486; - this.lb_CH3TestPressureDown.Text = "##"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(442, 128); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(149, 20); - this.label3.TabIndex = 487; - this.label3.Text = "测试压力下限:"; - // - // lb_CH3TestPressureUp - // - this.lb_CH3TestPressureUp.AutoSize = true; - this.lb_CH3TestPressureUp.BackColor = System.Drawing.Color.Transparent; - this.lb_CH3TestPressureUp.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH3TestPressureUp.Location = new System.Drawing.Point(598, 97); - this.lb_CH3TestPressureUp.Name = "lb_CH3TestPressureUp"; - this.lb_CH3TestPressureUp.Size = new System.Drawing.Size(29, 20); - this.lb_CH3TestPressureUp.TabIndex = 484; - this.lb_CH3TestPressureUp.Text = "##"; - // - // label36 - // - this.label36.AutoSize = true; - this.label36.BackColor = System.Drawing.Color.Transparent; - this.label36.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label36.Location = new System.Drawing.Point(442, 97); - this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(149, 20); - this.label36.TabIndex = 485; - this.label36.Text = "测试压力上限:"; - // - // lb_CH3ProcessTime4 - // - this.lb_CH3ProcessTime4.AutoSize = true; - this.lb_CH3ProcessTime4.BackColor = System.Drawing.Color.Transparent; - this.lb_CH3ProcessTime4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH3ProcessTime4.Location = new System.Drawing.Point(630, 61); - this.lb_CH3ProcessTime4.Name = "lb_CH3ProcessTime4"; - this.lb_CH3ProcessTime4.Size = new System.Drawing.Size(29, 20); - this.lb_CH3ProcessTime4.TabIndex = 482; - this.lb_CH3ProcessTime4.Text = "##"; - // - // label44 - // - this.label44.AutoSize = true; - this.label44.BackColor = System.Drawing.Color.Transparent; - this.label44.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label44.Location = new System.Drawing.Point(571, 61); - this.label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(69, 20); - this.label44.TabIndex = 483; - this.label44.Text = "排气:"; - // - // lb_CH3ProcessTime3 - // - this.lb_CH3ProcessTime3.AutoSize = true; - this.lb_CH3ProcessTime3.BackColor = System.Drawing.Color.Transparent; - this.lb_CH3ProcessTime3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH3ProcessTime3.Location = new System.Drawing.Point(501, 61); - this.lb_CH3ProcessTime3.Name = "lb_CH3ProcessTime3"; - this.lb_CH3ProcessTime3.Size = new System.Drawing.Size(29, 20); - this.lb_CH3ProcessTime3.TabIndex = 480; - this.lb_CH3ProcessTime3.Text = "##"; - // - // label48 - // - this.label48.AutoSize = true; - this.label48.BackColor = System.Drawing.Color.Transparent; - this.label48.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label48.Location = new System.Drawing.Point(442, 61); - this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(69, 20); - this.label48.TabIndex = 481; - this.label48.Text = "检测:"; - // - // lb_CH3ProcessTime2 - // - this.lb_CH3ProcessTime2.AutoSize = true; - this.lb_CH3ProcessTime2.BackColor = System.Drawing.Color.Transparent; - this.lb_CH3ProcessTime2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH3ProcessTime2.Location = new System.Drawing.Point(630, 30); - this.lb_CH3ProcessTime2.Name = "lb_CH3ProcessTime2"; - this.lb_CH3ProcessTime2.Size = new System.Drawing.Size(29, 20); - this.lb_CH3ProcessTime2.TabIndex = 478; - this.lb_CH3ProcessTime2.Text = "##"; - // - // label53 - // - this.label53.AutoSize = true; - this.label53.BackColor = System.Drawing.Color.Transparent; - this.label53.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label53.Location = new System.Drawing.Point(571, 30); - this.label53.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(69, 20); - this.label53.TabIndex = 479; - this.label53.Text = "平衡:"; - // - // lb_CH3ProcessTime1 - // - this.lb_CH3ProcessTime1.AutoSize = true; - this.lb_CH3ProcessTime1.BackColor = System.Drawing.Color.Transparent; - this.lb_CH3ProcessTime1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH3ProcessTime1.Location = new System.Drawing.Point(501, 30); - this.lb_CH3ProcessTime1.Name = "lb_CH3ProcessTime1"; - this.lb_CH3ProcessTime1.Size = new System.Drawing.Size(29, 20); - this.lb_CH3ProcessTime1.TabIndex = 476; - this.lb_CH3ProcessTime1.Text = "##"; - // - // label57 - // - this.label57.AutoSize = true; - this.label57.BackColor = System.Drawing.Color.Transparent; - this.label57.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label57.Location = new System.Drawing.Point(442, 30); - this.label57.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(69, 20); - this.label57.TabIndex = 477; - this.label57.Text = "充气:"; - // - // lb_CH2TestPressureDown - // - this.lb_CH2TestPressureDown.AutoSize = true; - this.lb_CH2TestPressureDown.BackColor = System.Drawing.Color.Transparent; - this.lb_CH2TestPressureDown.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH2TestPressureDown.Location = new System.Drawing.Point(612, 128); - this.lb_CH2TestPressureDown.Name = "lb_CH2TestPressureDown"; - this.lb_CH2TestPressureDown.Size = new System.Drawing.Size(29, 20); - this.lb_CH2TestPressureDown.TabIndex = 486; - this.lb_CH2TestPressureDown.Text = "##"; - // - // label60 - // - this.label60.AutoSize = true; - this.label60.BackColor = System.Drawing.Color.Transparent; - this.label60.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label60.Location = new System.Drawing.Point(456, 128); - this.label60.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label60.Name = "label60"; - this.label60.Size = new System.Drawing.Size(149, 20); - this.label60.TabIndex = 487; - this.label60.Text = "测试压力下限:"; - // - // lb_CH2TestPressureUp - // - this.lb_CH2TestPressureUp.AutoSize = true; - this.lb_CH2TestPressureUp.BackColor = System.Drawing.Color.Transparent; - this.lb_CH2TestPressureUp.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH2TestPressureUp.Location = new System.Drawing.Point(612, 97); - this.lb_CH2TestPressureUp.Name = "lb_CH2TestPressureUp"; - this.lb_CH2TestPressureUp.Size = new System.Drawing.Size(29, 20); - this.lb_CH2TestPressureUp.TabIndex = 484; - this.lb_CH2TestPressureUp.Text = "##"; - // - // label63 - // - this.label63.AutoSize = true; - this.label63.BackColor = System.Drawing.Color.Transparent; - this.label63.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label63.Location = new System.Drawing.Point(456, 97); - this.label63.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label63.Name = "label63"; - this.label63.Size = new System.Drawing.Size(149, 20); - this.label63.TabIndex = 485; - this.label63.Text = "测试压力上限:"; - // - // lb_CH2ProcessTime4 - // - this.lb_CH2ProcessTime4.AutoSize = true; - this.lb_CH2ProcessTime4.BackColor = System.Drawing.Color.Transparent; - this.lb_CH2ProcessTime4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH2ProcessTime4.Location = new System.Drawing.Point(644, 61); - this.lb_CH2ProcessTime4.Name = "lb_CH2ProcessTime4"; - this.lb_CH2ProcessTime4.Size = new System.Drawing.Size(29, 20); - this.lb_CH2ProcessTime4.TabIndex = 482; - this.lb_CH2ProcessTime4.Text = "##"; - // - // label67 - // - this.label67.AutoSize = true; - this.label67.BackColor = System.Drawing.Color.Transparent; - this.label67.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label67.Location = new System.Drawing.Point(585, 61); - this.label67.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(69, 20); - this.label67.TabIndex = 483; - this.label67.Text = "排气:"; - // - // lb_CH2ProcessTime3 - // - this.lb_CH2ProcessTime3.AutoSize = true; - this.lb_CH2ProcessTime3.BackColor = System.Drawing.Color.Transparent; - this.lb_CH2ProcessTime3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH2ProcessTime3.Location = new System.Drawing.Point(515, 61); - this.lb_CH2ProcessTime3.Name = "lb_CH2ProcessTime3"; - this.lb_CH2ProcessTime3.Size = new System.Drawing.Size(29, 20); - this.lb_CH2ProcessTime3.TabIndex = 480; - this.lb_CH2ProcessTime3.Text = "##"; - // - // label72 - // - this.label72.AutoSize = true; - this.label72.BackColor = System.Drawing.Color.Transparent; - this.label72.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label72.Location = new System.Drawing.Point(456, 61); - this.label72.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label72.Name = "label72"; - this.label72.Size = new System.Drawing.Size(69, 20); - this.label72.TabIndex = 481; - this.label72.Text = "检测:"; - // - // lb_CH2ProcessTime2 - // - this.lb_CH2ProcessTime2.AutoSize = true; - this.lb_CH2ProcessTime2.BackColor = System.Drawing.Color.Transparent; - this.lb_CH2ProcessTime2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH2ProcessTime2.Location = new System.Drawing.Point(644, 30); - this.lb_CH2ProcessTime2.Name = "lb_CH2ProcessTime2"; - this.lb_CH2ProcessTime2.Size = new System.Drawing.Size(29, 20); - this.lb_CH2ProcessTime2.TabIndex = 478; - this.lb_CH2ProcessTime2.Text = "##"; - // - // label74 - // - this.label74.AutoSize = true; - this.label74.BackColor = System.Drawing.Color.Transparent; - this.label74.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label74.Location = new System.Drawing.Point(585, 30); - this.label74.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label74.Name = "label74"; - this.label74.Size = new System.Drawing.Size(69, 20); - this.label74.TabIndex = 479; - this.label74.Text = "平衡:"; - // - // lb_CH2ProcessTime1 - // - this.lb_CH2ProcessTime1.AutoSize = true; - this.lb_CH2ProcessTime1.BackColor = System.Drawing.Color.Transparent; - this.lb_CH2ProcessTime1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH2ProcessTime1.Location = new System.Drawing.Point(515, 30); - this.lb_CH2ProcessTime1.Name = "lb_CH2ProcessTime1"; - this.lb_CH2ProcessTime1.Size = new System.Drawing.Size(29, 20); - this.lb_CH2ProcessTime1.TabIndex = 476; - this.lb_CH2ProcessTime1.Text = "##"; - // - // label77 - // - this.label77.AutoSize = true; - this.label77.BackColor = System.Drawing.Color.Transparent; - this.label77.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label77.Location = new System.Drawing.Point(456, 30); - this.label77.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label77.Name = "label77"; - this.label77.Size = new System.Drawing.Size(69, 20); - this.label77.TabIndex = 477; - this.label77.Text = "充气:"; - // - // lb_CH4TestPressureDown - // - this.lb_CH4TestPressureDown.AutoSize = true; - this.lb_CH4TestPressureDown.BackColor = System.Drawing.Color.Transparent; - this.lb_CH4TestPressureDown.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH4TestPressureDown.Location = new System.Drawing.Point(612, 132); - this.lb_CH4TestPressureDown.Name = "lb_CH4TestPressureDown"; - this.lb_CH4TestPressureDown.Size = new System.Drawing.Size(29, 20); - this.lb_CH4TestPressureDown.TabIndex = 498; - this.lb_CH4TestPressureDown.Text = "##"; - // - // label79 - // - this.label79.AutoSize = true; - this.label79.BackColor = System.Drawing.Color.Transparent; - this.label79.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label79.Location = new System.Drawing.Point(456, 132); - this.label79.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label79.Name = "label79"; - this.label79.Size = new System.Drawing.Size(149, 20); - this.label79.TabIndex = 499; - this.label79.Text = "测试压力下限:"; - // - // lb_CH4TestPressureUp - // - this.lb_CH4TestPressureUp.AutoSize = true; - this.lb_CH4TestPressureUp.BackColor = System.Drawing.Color.Transparent; - this.lb_CH4TestPressureUp.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH4TestPressureUp.Location = new System.Drawing.Point(612, 101); - this.lb_CH4TestPressureUp.Name = "lb_CH4TestPressureUp"; - this.lb_CH4TestPressureUp.Size = new System.Drawing.Size(29, 20); - this.lb_CH4TestPressureUp.TabIndex = 496; - this.lb_CH4TestPressureUp.Text = "##"; - // - // label81 - // - this.label81.AutoSize = true; - this.label81.BackColor = System.Drawing.Color.Transparent; - this.label81.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label81.Location = new System.Drawing.Point(456, 101); - this.label81.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label81.Name = "label81"; - this.label81.Size = new System.Drawing.Size(149, 20); - this.label81.TabIndex = 497; - this.label81.Text = "测试压力上限:"; - // - // lb_CH4ProcessTime4 - // - this.lb_CH4ProcessTime4.AutoSize = true; - this.lb_CH4ProcessTime4.BackColor = System.Drawing.Color.Transparent; - this.lb_CH4ProcessTime4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH4ProcessTime4.Location = new System.Drawing.Point(644, 65); - this.lb_CH4ProcessTime4.Name = "lb_CH4ProcessTime4"; - this.lb_CH4ProcessTime4.Size = new System.Drawing.Size(29, 20); - this.lb_CH4ProcessTime4.TabIndex = 494; - this.lb_CH4ProcessTime4.Text = "##"; - // - // label83 - // - this.label83.AutoSize = true; - this.label83.BackColor = System.Drawing.Color.Transparent; - this.label83.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label83.Location = new System.Drawing.Point(585, 65); - this.label83.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label83.Name = "label83"; - this.label83.Size = new System.Drawing.Size(69, 20); - this.label83.TabIndex = 495; - this.label83.Text = "排气:"; - // - // lb_CH4ProcessTime3 - // - this.lb_CH4ProcessTime3.AutoSize = true; - this.lb_CH4ProcessTime3.BackColor = System.Drawing.Color.Transparent; - this.lb_CH4ProcessTime3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH4ProcessTime3.Location = new System.Drawing.Point(515, 65); - this.lb_CH4ProcessTime3.Name = "lb_CH4ProcessTime3"; - this.lb_CH4ProcessTime3.Size = new System.Drawing.Size(29, 20); - this.lb_CH4ProcessTime3.TabIndex = 492; - this.lb_CH4ProcessTime3.Text = "##"; - // - // label85 - // - this.label85.AutoSize = true; - this.label85.BackColor = System.Drawing.Color.Transparent; - this.label85.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label85.Location = new System.Drawing.Point(456, 65); - this.label85.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label85.Name = "label85"; - this.label85.Size = new System.Drawing.Size(69, 20); - this.label85.TabIndex = 493; - this.label85.Text = "检测:"; - // - // lb_CH4ProcessTime2 - // - this.lb_CH4ProcessTime2.AutoSize = true; - this.lb_CH4ProcessTime2.BackColor = System.Drawing.Color.Transparent; - this.lb_CH4ProcessTime2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH4ProcessTime2.Location = new System.Drawing.Point(644, 34); - this.lb_CH4ProcessTime2.Name = "lb_CH4ProcessTime2"; - this.lb_CH4ProcessTime2.Size = new System.Drawing.Size(29, 20); - this.lb_CH4ProcessTime2.TabIndex = 490; - this.lb_CH4ProcessTime2.Text = "##"; - // - // label87 - // - this.label87.AutoSize = true; - this.label87.BackColor = System.Drawing.Color.Transparent; - this.label87.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label87.Location = new System.Drawing.Point(585, 34); - this.label87.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label87.Name = "label87"; - this.label87.Size = new System.Drawing.Size(69, 20); - this.label87.TabIndex = 491; - this.label87.Text = "平衡:"; - // - // lb_CH4ProcessTime1 - // - this.lb_CH4ProcessTime1.AutoSize = true; - this.lb_CH4ProcessTime1.BackColor = System.Drawing.Color.Transparent; - this.lb_CH4ProcessTime1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH4ProcessTime1.Location = new System.Drawing.Point(515, 34); - this.lb_CH4ProcessTime1.Name = "lb_CH4ProcessTime1"; - this.lb_CH4ProcessTime1.Size = new System.Drawing.Size(29, 20); - this.lb_CH4ProcessTime1.TabIndex = 488; - this.lb_CH4ProcessTime1.Text = "##"; - // - // label89 - // - this.label89.AutoSize = true; - this.label89.BackColor = System.Drawing.Color.Transparent; - this.label89.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label89.Location = new System.Drawing.Point(456, 34); - this.label89.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label89.Name = "label89"; - this.label89.Size = new System.Drawing.Size(69, 20); - this.label89.TabIndex = 489; - this.label89.Text = "充气:"; + // lb_CH1testTime + // + this.lb_CH1testTime.AutoSize = true; + this.lb_CH1testTime.BackColor = System.Drawing.Color.Transparent; + this.lb_CH1testTime.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH1testTime.Location = new System.Drawing.Point(311, 217); + this.lb_CH1testTime.Name = "lb_CH1testTime"; + this.lb_CH1testTime.Size = new System.Drawing.Size(29, 20); + this.lb_CH1testTime.TabIndex = 476; + this.lb_CH1testTime.Text = "##"; + // + // label29 + // + this.label29.AutoSize = true; + this.label29.BackColor = System.Drawing.Color.Transparent; + this.label29.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label29.Location = new System.Drawing.Point(175, 217); + this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label29.Name = "label29"; + this.label29.Size = new System.Drawing.Size(129, 20); + this.label29.TabIndex = 477; + this.label29.Text = "测试总时长:"; + // + // lb_CH2testTime + // + this.lb_CH2testTime.AutoSize = true; + this.lb_CH2testTime.BackColor = System.Drawing.Color.Transparent; + this.lb_CH2testTime.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH2testTime.Location = new System.Drawing.Point(327, 218); + this.lb_CH2testTime.Name = "lb_CH2testTime"; + this.lb_CH2testTime.Size = new System.Drawing.Size(29, 20); + this.lb_CH2testTime.TabIndex = 492; + this.lb_CH2testTime.Text = "##"; + // + // label59 + // + this.label59.AutoSize = true; + this.label59.BackColor = System.Drawing.Color.Transparent; + this.label59.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label59.Location = new System.Drawing.Point(191, 218); + this.label59.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label59.Name = "label59"; + this.label59.Size = new System.Drawing.Size(129, 20); + this.label59.TabIndex = 493; + this.label59.Text = "测试总时长:"; + // + // lb_CH3testTime + // + this.lb_CH3testTime.AutoSize = true; + this.lb_CH3testTime.BackColor = System.Drawing.Color.Transparent; + this.lb_CH3testTime.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH3testTime.Location = new System.Drawing.Point(310, 218); + this.lb_CH3testTime.Name = "lb_CH3testTime"; + this.lb_CH3testTime.Size = new System.Drawing.Size(29, 20); + this.lb_CH3testTime.TabIndex = 488; + this.lb_CH3testTime.Text = "##"; + // + // label39 + // + this.label39.AutoSize = true; + this.label39.BackColor = System.Drawing.Color.Transparent; + this.label39.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label39.Location = new System.Drawing.Point(174, 218); + this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label39.Name = "label39"; + this.label39.Size = new System.Drawing.Size(129, 20); + this.label39.TabIndex = 489; + this.label39.Text = "测试总时长:"; + // + // lb_CH4testTime + // + this.lb_CH4testTime.AutoSize = true; + this.lb_CH4testTime.BackColor = System.Drawing.Color.Transparent; + this.lb_CH4testTime.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH4testTime.Location = new System.Drawing.Point(327, 217); + this.lb_CH4testTime.Name = "lb_CH4testTime"; + this.lb_CH4testTime.Size = new System.Drawing.Size(29, 20); + this.lb_CH4testTime.TabIndex = 500; + this.lb_CH4testTime.Text = "##"; + // + // label52 + // + this.label52.AutoSize = true; + this.label52.BackColor = System.Drawing.Color.Transparent; + this.label52.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label52.Location = new System.Drawing.Point(191, 217); + this.label52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label52.Name = "label52"; + this.label52.Size = new System.Drawing.Size(129, 20); + this.label52.TabIndex = 501; + this.label52.Text = "测试总时长:"; // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ClientSize = new System.Drawing.Size(1397, 946); + this.ClientSize = new System.Drawing.Size(1370, 631); this.Controls.Add(this.uiGroupBox4); this.Controls.Add(this.uiGroupBox3); this.Controls.Add(this.uiGroupBox2); @@ -2959,7 +3067,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.Name = "Form1"; - this.Text = " LL28-C_V25111501"; + this.Text = " LL28-C_V25111502"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing); this.Load += new System.EventHandler(this.Form1_Load); this.uiGroupBox5.ResumeLayout(false); @@ -3205,6 +3313,14 @@ private System.Windows.Forms.Label label87; public System.Windows.Forms.Label lb_CH4ProcessTime1; private System.Windows.Forms.Label label89; + public System.Windows.Forms.Label lb_CH2testTime; + private System.Windows.Forms.Label label59; + public System.Windows.Forms.Label lb_CH1testTime; + private System.Windows.Forms.Label label29; + public System.Windows.Forms.Label lb_CH3testTime; + private System.Windows.Forms.Label label39; + public System.Windows.Forms.Label lb_CH4testTime; + private System.Windows.Forms.Label label52; } } diff --git a/SLC1-N/Form1.cs b/SLC1-N/Form1.cs index 54d62cb..a74fc5e 100644 --- a/SLC1-N/Form1.cs +++ b/SLC1-N/Form1.cs @@ -1340,6 +1340,18 @@ namespace SLC1_N return CH1yiqiParam_P; } + // 记录开始时间 + private DateTime CH1start_time; + private DateTime CH2start_time; + private DateTime CH3start_time; + private DateTime CH4start_time; + + // 是否刷新启动时间标志位 + private bool bool_CH1start_time = false; + private bool bool_CH2start_time = false; + private bool bool_CH3start_time = false; + private bool bool_CH4start_time = false; + // 通道1状态机 public void CH1machine() { @@ -1361,6 +1373,8 @@ namespace SLC1_N CH1testCount = 0; // 重置测试次数 CH1TestRecord.Reset(); + bool_CH1start_time = false; + // 模式切回正压 //CH1NowMode = "正压"; //LL28CH1client.writeRegisters(1006, GetYiqiParam(1, "P").GetArray()); @@ -1375,8 +1389,16 @@ namespace SLC1_N } break; - case (int)yiqi.prepare: + case (int)yiqi.prepare: { + if (bool_CH1start_time == false) + { + bool_CH1start_time = true; + + CH1start_time = DateTime.Now; + SetLabelText(lb_CH1testTime, $""); + } + // 准备超时处理 if (!prepareOutTime_Dictionary.ContainsKey(1)) { @@ -1658,9 +1680,13 @@ namespace SLC1_N 1, result, tb_CH1Code.Text, ""); // 测试完成并且正负压都完成则视为结束 - if (testfinish && PorNfinish) + if (testfinish && PorNfinish) { - if(result) + bool_CH1start_time = false; + int time = (DateTime.Now - CH1start_time).Seconds; + SetLabelText(lb_CH1testTime, $"{time} s"); + + if (result) { m_production.AddOK(); } @@ -1738,6 +1764,8 @@ namespace SLC1_N CH2testCount = 0; // 重置测试次数 CH2TestRecord.Reset(); + bool_CH2start_time = false; + // 模式切回正压 //CH2NowMode = "正压"; //LL28CH2client.writeRegisters(1006, GetYiqiParam(2, "P").GetArray()); @@ -1753,6 +1781,14 @@ namespace SLC1_N case (int)yiqi.prepare: { + if (bool_CH2start_time == false) + { + bool_CH2start_time = true; + + CH2start_time = DateTime.Now; + SetLabelText(lb_CH2testTime, $""); + } + // 准备超时处理 if (!prepareOutTime_Dictionary.ContainsKey(2)) { @@ -2036,6 +2072,10 @@ namespace SLC1_N // 测试完成并且正负压都完成则视为结束 if (testfinish && PorNfinish) { + bool_CH2start_time = false; + int time = (DateTime.Now - CH2start_time).Seconds; + SetLabelText(lb_CH2testTime, $"{time} s"); + if (result) { m_production.AddOK(); @@ -2114,6 +2154,8 @@ namespace SLC1_N CH3testCount = 0; // 重置测试次数 CH2TestRecord.Reset(); + bool_CH3start_time = false; + // 模式切回正压 //CH3NowMode = "正压"; //LL28CH3client.writeRegisters(1006, GetYiqiParam(3, "P").GetArray()); @@ -2129,6 +2171,14 @@ namespace SLC1_N case (int)yiqi.prepare: { + if (bool_CH3start_time == false) + { + bool_CH3start_time = true; + + CH3start_time = DateTime.Now; + SetLabelText(lb_CH3testTime, $""); + } + // 准备超时处理 if (!prepareOutTime_Dictionary.ContainsKey(3)) { @@ -2413,6 +2463,10 @@ namespace SLC1_N // 测试完成并且正负压都完成则视为结束 if (testfinish && PorNfinish) { + bool_CH3start_time = false; + int time = (DateTime.Now - CH3start_time).Seconds; + SetLabelText(lb_CH3testTime, $"{time} s"); + if (result) { m_production.AddOK(); @@ -2491,6 +2545,8 @@ namespace SLC1_N CH4testCount = 0; // 重置测试次数 CH4TestRecord.Reset(); + bool_CH4start_time = false; + // 模式切回正压 //CH4NowMode = "正压"; //LL28CH4client.writeRegisters(1006, GetYiqiParam(4, "P").GetArray()); @@ -2506,6 +2562,14 @@ namespace SLC1_N case (int)yiqi.prepare: { + if (bool_CH4start_time == false) + { + bool_CH4start_time = true; + + CH4start_time = DateTime.Now; + SetLabelText(lb_CH4testTime, $""); + } + // 准备超时处理 if (!prepareOutTime_Dictionary.ContainsKey(4)) { @@ -2792,6 +2856,10 @@ namespace SLC1_N // 测试完成并且正负压都完成则视为结束 if (testfinish && PorNfinish) { + bool_CH4start_time = false; + int time = (DateTime.Now - CH4start_time).Seconds; + SetLabelText(lb_CH4testTime, $"{time} s"); + if (result) { m_production.AddOK(); diff --git a/SLC1-N/Form1.resx b/SLC1-N/Form1.resx index de12f9b..93b128c 100644 --- a/SLC1-N/Form1.resx +++ b/SLC1-N/Form1.resx @@ -184,7 +184,7 @@ 1251, 47 - 141 + 59 diff --git a/SLC1-N/Form_LogOn.cs b/SLC1-N/Form_LogOn.cs index 93c14fc..2e0c90a 100644 --- a/SLC1-N/Form_LogOn.cs +++ b/SLC1-N/Form_LogOn.cs @@ -166,7 +166,7 @@ namespace SLC1_N Timer1.Stop(); this.Close(); } - else if (Password.Text == userpassword3|| Password.Text == "123456") + else if (Password.Text == userpassword3 || Password.Text == "123456" || Password.Text == "8888") { Form1.f1.lb_User.Text = "超级管理员"; Form1.f1.User = "超级管理员"; diff --git a/SLC1-N/SLC1-N.csproj b/SLC1-N/SLC1-N.csproj index e4e918e..939534a 100644 --- a/SLC1-N/SLC1-N.csproj +++ b/SLC1-N/SLC1-N.csproj @@ -7,7 +7,7 @@ {F7F71589-095A-45C2-975C-739BE2D1CE15} WinExe SLC1_N - LL28-C_V25111501 + LL28-C_V25111502 v4.8 512 true diff --git a/SLC1-N/bin/Debug/LL28-C_V25111501.exe b/SLC1-N/bin/Debug/LL28-C_V25111502.exe similarity index 97% rename from SLC1-N/bin/Debug/LL28-C_V25111501.exe rename to SLC1-N/bin/Debug/LL28-C_V25111502.exe index d44973c..55e40bc 100644 Binary files a/SLC1-N/bin/Debug/LL28-C_V25111501.exe and b/SLC1-N/bin/Debug/LL28-C_V25111502.exe differ diff --git a/SLC1-N/bin/Debug/LL28-C_V25111501.exe.config b/SLC1-N/bin/Debug/LL28-C_V25111502.exe.config similarity index 100% rename from SLC1-N/bin/Debug/LL28-C_V25111501.exe.config rename to SLC1-N/bin/Debug/LL28-C_V25111502.exe.config diff --git a/SLC1-N/obj/Debug/LL28-C_V25111501.pdb b/SLC1-N/bin/Debug/LL28-C_V25111502.pdb similarity index 62% rename from SLC1-N/obj/Debug/LL28-C_V25111501.pdb rename to SLC1-N/bin/Debug/LL28-C_V25111502.pdb index 2611068..75f50cb 100644 Binary files a/SLC1-N/obj/Debug/LL28-C_V25111501.pdb and b/SLC1-N/bin/Debug/LL28-C_V25111502.pdb differ diff --git a/SLC1-N/bin/Debug/NetWorkHelper.dll b/SLC1-N/bin/Debug/NetWorkHelper.dll index 701fe09..7c5c97d 100644 Binary files a/SLC1-N/bin/Debug/NetWorkHelper.dll and b/SLC1-N/bin/Debug/NetWorkHelper.dll differ diff --git a/SLC1-N/bin/Debug/NetWorkHelper.pdb b/SLC1-N/bin/Debug/NetWorkHelper.pdb index de1ff34..6d5cfc9 100644 Binary files a/SLC1-N/bin/Debug/NetWorkHelper.pdb and b/SLC1-N/bin/Debug/NetWorkHelper.pdb differ diff --git a/SLC1-N/bin/Debug直压28.zip b/SLC1-N/bin/Debug直压28.zip index 42179ba..c3f9468 100644 Binary files a/SLC1-N/bin/Debug直压28.zip and b/SLC1-N/bin/Debug直压28.zip differ diff --git a/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index fd6c618..a6ffa41 100644 Binary files a/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SLC1-N/obj/Debug/Interop.ADOX.dll b/SLC1-N/obj/Debug/Interop.ADOX.dll index c687270..9317663 100644 Binary files a/SLC1-N/obj/Debug/Interop.ADOX.dll and b/SLC1-N/obj/Debug/Interop.ADOX.dll differ diff --git a/SLC1-N/obj/Debug/LL28-C_V25111501.exe b/SLC1-N/obj/Debug/LL28-C_V25111502.exe similarity index 97% rename from SLC1-N/obj/Debug/LL28-C_V25111501.exe rename to SLC1-N/obj/Debug/LL28-C_V25111502.exe index d44973c..55e40bc 100644 Binary files a/SLC1-N/obj/Debug/LL28-C_V25111501.exe and b/SLC1-N/obj/Debug/LL28-C_V25111502.exe differ diff --git a/SLC1-N/bin/Debug/LL28-C_V25111501.pdb b/SLC1-N/obj/Debug/LL28-C_V25111502.pdb similarity index 62% rename from SLC1-N/bin/Debug/LL28-C_V25111501.pdb rename to SLC1-N/obj/Debug/LL28-C_V25111502.pdb index 2611068..75f50cb 100644 Binary files a/SLC1-N/bin/Debug/LL28-C_V25111501.pdb and b/SLC1-N/obj/Debug/LL28-C_V25111502.pdb differ diff --git a/SLC1-N/obj/Debug/SLC1-N.csproj.AssemblyReference.cache b/SLC1-N/obj/Debug/SLC1-N.csproj.AssemblyReference.cache index 7fac064..2aec2ed 100644 Binary files a/SLC1-N/obj/Debug/SLC1-N.csproj.AssemblyReference.cache and b/SLC1-N/obj/Debug/SLC1-N.csproj.AssemblyReference.cache differ diff --git a/SLC1-N/obj/Debug/SLC1-N.csproj.FileListAbsolute.txt b/SLC1-N/obj/Debug/SLC1-N.csproj.FileListAbsolute.txt index 4f49564..4552592 100644 --- a/SLC1-N/obj/Debug/SLC1-N.csproj.FileListAbsolute.txt +++ b/SLC1-N/obj/Debug/SLC1-N.csproj.FileListAbsolute.txt @@ -708,9 +708,53 @@ D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Warni D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.GenerateResource.cache D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.CoreCompileInputs.cache D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.Up2Date -D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111501.exe.config -D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111501.exe -D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111501.pdb -D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111501.exe -D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111501.pdb D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\NetWorkHelper.pdb +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\TCP\ITcpClient.cs +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\TCP\ITcpClient.Designer.cs +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\DocumentFormat.OpenXml.dll +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\EasyModbus.dll +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Guna.UI.dll +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Guna.UI2.dll +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\HslCommunication.dll +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\NetWorkHelper.dll +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Newtonsoft.Json.dll +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Spire.XLS.dll +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\SunnyUI.Common.dll +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\SunnyUI.dll +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\NetWorkHelper.pdb +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\EasyModbus.xml +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\Newtonsoft.Json.xml +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.AssemblyReference.cache +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\Interop.ADOX.dll +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.ResolveComReference.cache +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_Alarm.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_hbMESset.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_HQMESconfig.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_NetworkSet.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Electricity.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form1.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_PLC_Serialport.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_PLCcontrol.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_PLC_TCP.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_RootSet.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.LeakCompensate.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_LogOn.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_SaomaSet.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Properties.Resources.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_Save.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.UserManagement.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.UserPassword.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Warning.resources +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.GenerateResource.cache +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.CoreCompileInputs.cache +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.CopyComplete +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111502.exe.config +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111502.exe +D:\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111502.pdb +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111502.exe +D:\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111502.pdb +D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111502.exe.config +D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111502.exe +D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\bin\Debug\LL28-C_V25111502.pdb +D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111502.exe +D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-C_V25111502.pdb diff --git a/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache b/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache index 177d150..6e7de3d 100644 Binary files a/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache and b/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache differ diff --git a/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.dll b/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.dll index 701fe09..7c5c97d 100644 Binary files a/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.dll and b/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.dll differ diff --git a/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.pdb b/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.pdb index de1ff34..6d5cfc9 100644 Binary files a/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.pdb and b/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.pdb differ diff --git a/tongxin/NetWorkHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/tongxin/NetWorkHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 35c3ce8..017075f 100644 Binary files a/tongxin/NetWorkHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/tongxin/NetWorkHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.AssemblyReference.cache b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.AssemblyReference.cache index ca25f48..279a4d7 100644 Binary files a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.AssemblyReference.cache and b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.AssemblyReference.cache differ diff --git a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.FileListAbsolute.txt b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.FileListAbsolute.txt index 9b1e808..98b5c2e 100644 --- a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.FileListAbsolute.txt +++ b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.FileListAbsolute.txt @@ -167,3 +167,12 @@ D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Deb D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.csproj.CoreCompileInputs.cache D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.dll D:\桌面\莫禧亮\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.pdb +D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\bin\Debug\TCP\ITcpClient.cs +D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\bin\Debug\TCP\ITcpClient.Designer.cs +D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\bin\Debug\NetWorkHelper.dll +D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\bin\Debug\NetWorkHelper.pdb +D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.AxUdpClient.resources +D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.csproj.GenerateResource.cache +D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.csproj.CoreCompileInputs.cache +D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.dll +D:\华贝\直压28\huabei4tongdao\tongxin\NetWorkHelper\obj\Debug\NetWorkHelper.pdb diff --git a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.dll b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.dll index 701fe09..7c5c97d 100644 Binary files a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.dll and b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.dll differ diff --git a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb index de1ff34..6d5cfc9 100644 Binary files a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb and b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb differ