diff --git a/.vs/LL28在线/FileContentIndex/5a78faf8-5b11-4c6e-988b-e79d9aea7615.vsidx b/.vs/LL28在线/FileContentIndex/5a78faf8-5b11-4c6e-988b-e79d9aea7615.vsidx new file mode 100644 index 0000000..6c2eceb Binary files /dev/null and b/.vs/LL28在线/FileContentIndex/5a78faf8-5b11-4c6e-988b-e79d9aea7615.vsidx differ diff --git a/.vs/LL28在线/FileContentIndex/f693b06a-f494-453e-bbd0-f0bea2eb1974.vsidx b/.vs/LL28在线/FileContentIndex/f693b06a-f494-453e-bbd0-f0bea2eb1974.vsidx deleted file mode 100644 index cc000c9..0000000 Binary files a/.vs/LL28在线/FileContentIndex/f693b06a-f494-453e-bbd0-f0bea2eb1974.vsidx and /dev/null differ diff --git a/.vs/LL28在线/v17/.suo b/.vs/LL28在线/v17/.suo index 088c39e..9ae4442 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 b66eded..7c2f501 100644 --- a/.vs/LL28在线/v17/DocumentLayout.json +++ b/.vs/LL28在线/v17/DocumentLayout.json @@ -3,24 +3,24 @@ "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}", - "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative: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}|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}|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}", + "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{00000000-0000-0000-0000-000000000000}|\u003CSolution\u003E|SLC1-N||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|" }, - { - "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\\electricity.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", - "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\electricity.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\\electricity.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\electricity.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\\electricity.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\electricity.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\\yiqiparam.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\yiqiparam.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -200,6 +200,9 @@ { "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": [ @@ -209,17 +212,17 @@ "DocumentGroups": [ { "DockedWidth": 396, - "SelectedChildIndex": 0, + "SelectedChildIndex": 14, "Children": [ { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 1, "Title": "Form1.cs", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\Form1.cs", "RelativeDocumentMoniker": "SLC1-N\\Form1.cs", "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\Form1.cs", "RelativeToolTip": "SLC1-N\\Form1.cs", - "ViewState": "AQIAAEEGAAAAAAAAAAAAAGUGAAA0AAAA", + "ViewState": "AQIAADMFAAAAAAAAAAAuwD4FAAARAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-10-18T01:41:29.412Z", "IsPinned": true, @@ -296,34 +299,37 @@ "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" - }, - { - "$type": "Document", - "DocumentIndex": 3, - "Title": "Electricity.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\Electricity.cs", - "RelativeDocumentMoniker": "SLC1-N\\Electricity.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u6B63\u8D1F\u538B\\\u5355\u4E2A\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Electricity.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "..\\..\\..\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u6B63\u8D1F\u538B\\\u5355\u4E2A\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Electricity.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-18T01:03:21.678Z" + "WhenOpened": "2025-11-11T02:49:54.535Z", + "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 4, + "Title": "Electricity.cs [\u8BBE\u8BA1]", + "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\Electricity.cs", + "RelativeDocumentMoniker": "SLC1-N\\Electricity.cs", + "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]" + }, + { + "$type": "Document", + "DocumentIndex": 3, "Title": "Electricity.cs", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\Electricity.cs", "RelativeDocumentMoniker": "SLC1-N\\Electricity.cs", "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\Electricity.cs", "RelativeToolTip": "SLC1-N\\Electricity.cs", - "ViewState": "AQIAAJ8AAAAAAAAAAAAYwKoAAABAAAAA", + "ViewState": "AQIAAGIBAAAAAAAAAAAuwI8BAABdAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-10-30T02:55:49.085Z" + "WhenOpened": "2025-10-30T02:55:49.085Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 0, "Title": "Form1.cs [\u8BBE\u8BA1]", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\Form1.cs", "RelativeDocumentMoniker": "SLC1-N\\Form1.cs", @@ -347,7 +353,8 @@ "RelativeToolTip": "SLC1-N\\Electricity.Designer.cs", "ViewState": "AQIAANMCAAAAAAAAAAA1wOoCAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-10-28T09:46:39.581Z" + "WhenOpened": "2025-10-28T09:46:39.581Z", + "EditorCaption": "" }, { "$type": "Document", diff --git a/SLC1-N/Electricity.cs b/SLC1-N/Electricity.cs index 5251f2c..cfd0491 100644 --- a/SLC1-N/Electricity.cs +++ b/SLC1-N/Electricity.cs @@ -392,15 +392,15 @@ namespace SLC1_N Form1.f1.GetYiqiParam(CH, PorN).delaytime1 = Convert.ToInt32(tb_DelayTime1.Text); Form1.f1.GetYiqiParam(CH, PorN).delaytime2 = Convert.ToInt32(tb_DelayTime2.Text); Form1.f1.GetYiqiParam(CH, PorN).relievedelay = Convert.ToInt32(tb_RelieveDelay.Text); - Form1.f1.GetYiqiParam(CH, PorN).evolume = Convert.ToInt32(tb_Evolume.Text); + Form1.f1.GetYiqiParam(CH, PorN).evolume = StringToFloat(tb_Evolume.Text); - Form1.f1.GetYiqiParam(CH, PorN).fptoplimit = Convert.ToInt32(tb_FPtoplimit.Text); - Form1.f1.GetYiqiParam(CH, PorN).fplowlimit = Convert.ToInt32(tb_FPlowlimit.Text); - Form1.f1.GetYiqiParam(CH, PorN).balanpremax = Convert.ToInt32(tb_BalanPreMax.Text); - Form1.f1.GetYiqiParam(CH, PorN).balanpremin = Convert.ToInt32(tb_BalanPreMin.Text); + Form1.f1.GetYiqiParam(CH, PorN).fptoplimit = StringToFloat(tb_FPtoplimit.Text); + Form1.f1.GetYiqiParam(CH, PorN).fplowlimit = StringToFloat(tb_FPlowlimit.Text); + Form1.f1.GetYiqiParam(CH, PorN).balanpremax = StringToFloat(tb_BalanPreMax.Text); + Form1.f1.GetYiqiParam(CH, PorN).balanpremin = StringToFloat(tb_BalanPreMin.Text); - Form1.f1.GetYiqiParam(CH, PorN).leaktoplimit = Convert.ToInt32(tb_Leaktoplimit.Text); - Form1.f1.GetYiqiParam(CH, PorN).leaklowlimit = Convert.ToInt32(tb_Leaklowlimit.Text); + Form1.f1.GetYiqiParam(CH, PorN).leaktoplimit = StringToFloat(tb_Leaktoplimit.Text); + Form1.f1.GetYiqiParam(CH, PorN).leaklowlimit = StringToFloat(tb_Leaklowlimit.Text); Form1.f1.GetYiqiParam(CH, PorN).punit = cb_PUnit.SelectedIndex; Form1.f1.GetYiqiParam(CH, PorN).lunit = cb_LUnit.SelectedIndex; @@ -411,6 +411,11 @@ namespace SLC1_N //MessageBox.Show("仪器编号：" + CH + "保存" + i + "组参数成功！"); } + private float StringToFloat(string value, float defaultValue = 0f) + { + return float.TryParse(value, out float result) ? result : defaultValue; + } + // 读取本地参数记录 private void ReadParametersJson(string CH, string i, string PorN) { diff --git a/SLC1-N/Form1.Designer.cs b/SLC1-N/Form1.Designer.cs index d0a8cba..7407c34 100644 --- a/SLC1-N/Form1.Designer.cs +++ b/SLC1-N/Form1.Designer.cs @@ -94,7 +94,6 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); this.SerialPort_CH1Saoma = new System.IO.Ports.SerialPort(this.components); this.lb_CH2_SmallLeakUnit = new System.Windows.Forms.Label(); - this.lb_CH2BigLeakUnit = new System.Windows.Forms.Label(); this.lb_CH2_PressureUnit = new System.Windows.Forms.Label(); this.lb_CH2_Result = new System.Windows.Forms.Label(); this.lb_CH2_Status = new System.Windows.Forms.Label(); @@ -102,21 +101,15 @@ this.label45 = new System.Windows.Forms.Label(); this.lb_CH2Communication_status = new System.Windows.Forms.Label(); this.lb_CH2_SmallLeak = new System.Windows.Forms.Label(); - this.lb_CH2BigLeak = new System.Windows.Forms.Label(); this.lb_CH1_SmallLeakUnit = new System.Windows.Forms.Label(); - this.lb_CH1BigLeakUnit = new System.Windows.Forms.Label(); this.lb_CH1_PressureUnit = new System.Windows.Forms.Label(); this.lb_CH2_TestPressure = new System.Windows.Forms.Label(); this.label69 = new System.Windows.Forms.Label(); this.CH1_2presstext = new System.Windows.Forms.Label(); this.label75 = new System.Windows.Forms.Label(); - this.label74 = new System.Windows.Forms.Label(); this.label103 = new System.Windows.Forms.Label(); this.uiGroupBox5 = new Sunny.UI.UIGroupBox(); this.tb_CH2Code = new Sunny.UI.UITextBox(); - this.lb_CH2_nowPressureUnit = new System.Windows.Forms.Label(); - this.label43 = new System.Windows.Forms.Label(); - this.lb_CH2nowPressure = new System.Windows.Forms.Label(); this.bt_code2clear = new System.Windows.Forms.Button(); this.lb_CH2MES_INstatus = new System.Windows.Forms.Label(); this.label16 = new System.Windows.Forms.Label(); @@ -131,11 +124,9 @@ this.pb_CH1progressBar = new Sunny.UI.UIProcessBar(); this.label50 = new System.Windows.Forms.Label(); this.lb_CH1_SmallLeak = new System.Windows.Forms.Label(); - this.lb_CH1BigLeak = new System.Windows.Forms.Label(); this.lb_CH1_TestPressure = new System.Windows.Forms.Label(); this.label49 = new System.Windows.Forms.Label(); this.CH1_1presstext = new System.Windows.Forms.Label(); - this.label52 = new System.Windows.Forms.Label(); this.label51 = new System.Windows.Forms.Label(); this.label32 = new System.Windows.Forms.Label(); this.nb_MainMenu = new Sunny.UI.UINavBar(); @@ -151,9 +142,6 @@ this.PLCControl = new Sunny.UI.UIHeaderButton(); this.uiGroupBox1 = new Sunny.UI.UIGroupBox(); this.tb_CH1Code = new Sunny.UI.UITextBox(); - this.lb_CH1_nowPressureUnit = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.lb_CH1nowPressure = new System.Windows.Forms.Label(); this.bt_code1clear = new System.Windows.Forms.Button(); this.label34 = new System.Windows.Forms.Label(); this.pictureBox5 = new System.Windows.Forms.PictureBox(); @@ -188,9 +176,6 @@ this.timer_nowTime = new System.Windows.Forms.Timer(this.components); this.uiGroupBox2 = new Sunny.UI.UIGroupBox(); this.tb_CH3Code = new Sunny.UI.UITextBox(); - this.lb_CH3_nowPressureUnit = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.lb_CH3nowPressure = new System.Windows.Forms.Label(); this.bt_code3clear = new System.Windows.Forms.Button(); this.label5 = new System.Windows.Forms.Label(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); @@ -207,7 +192,6 @@ this.lb_CH3MES_OUTstatus = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); this.lb_CH3_SmallLeakUnit = new System.Windows.Forms.Label(); - this.lb_CH3BigLeakUnit = new System.Windows.Forms.Label(); this.lb_CH3_PressureUnit = new System.Windows.Forms.Label(); this.label27 = new System.Windows.Forms.Label(); this.lb_CH3_Result = new System.Windows.Forms.Label(); @@ -215,18 +199,13 @@ this.pb_CH3progressBar = new Sunny.UI.UIProcessBar(); this.label33 = new System.Windows.Forms.Label(); this.label35 = new System.Windows.Forms.Label(); - this.label36 = new System.Windows.Forms.Label(); this.lb_CH3Communication_status = new System.Windows.Forms.Label(); this.label38 = new System.Windows.Forms.Label(); this.label40 = new System.Windows.Forms.Label(); this.lb_CH3_SmallLeak = new System.Windows.Forms.Label(); - this.lb_CH3BigLeak = new System.Windows.Forms.Label(); this.lb_CH3_TestPressure = new System.Windows.Forms.Label(); this.uiGroupBox3 = new Sunny.UI.UIGroupBox(); this.tb_CH4Code = new Sunny.UI.UITextBox(); - this.lb_CH4_nowPressureUnit = new System.Windows.Forms.Label(); - this.label47 = new System.Windows.Forms.Label(); - this.lb_CH4nowPressure = new System.Windows.Forms.Label(); this.bt_code4clear = new System.Windows.Forms.Button(); this.lb_CH4MES_INstatus = new System.Windows.Forms.Label(); this.label55 = new System.Windows.Forms.Label(); @@ -236,19 +215,16 @@ this.lb_CH4MES_OUTstatus = new System.Windows.Forms.Label(); this.label58 = new System.Windows.Forms.Label(); this.lb_CH4_SmallLeakUnit = new System.Windows.Forms.Label(); - this.lb_CH4BigLeakUnit = new System.Windows.Forms.Label(); this.lb_CH4_PressureUnit = new System.Windows.Forms.Label(); this.label62 = new System.Windows.Forms.Label(); this.lb_CH4_Result = new System.Windows.Forms.Label(); this.lb_CH4_Status = new System.Windows.Forms.Label(); this.label65 = new System.Windows.Forms.Label(); this.label66 = new System.Windows.Forms.Label(); - this.label67 = new System.Windows.Forms.Label(); this.lb_CH4Communication_status = new System.Windows.Forms.Label(); this.label70 = new System.Windows.Forms.Label(); this.label71 = new System.Windows.Forms.Label(); this.lb_CH4_SmallLeak = new System.Windows.Forms.Label(); - this.lb_CH4BigLeak = new System.Windows.Forms.Label(); this.lb_CH4_TestPressure = new System.Windows.Forms.Label(); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.uiGroupBox4 = new Sunny.UI.UIGroupBox(); @@ -277,6 +253,54 @@ 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.uiGroupBox5.SuspendLayout(); this.nb_MainMenu.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pb_MESswitch)).BeginInit(); @@ -316,18 +340,6 @@ this.lb_CH2_SmallLeakUnit.TabIndex = 423; this.lb_CH2_SmallLeakUnit.Text = "Pa"; // - // lb_CH2BigLeakUnit - // - this.lb_CH2BigLeakUnit.AutoSize = true; - this.lb_CH2BigLeakUnit.BackColor = System.Drawing.Color.Transparent; - this.lb_CH2BigLeakUnit.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH2BigLeakUnit.Location = new System.Drawing.Point(667, 60); - this.lb_CH2BigLeakUnit.Name = "lb_CH2BigLeakUnit"; - this.lb_CH2BigLeakUnit.Size = new System.Drawing.Size(17, 9); - this.lb_CH2BigLeakUnit.TabIndex = 421; - this.lb_CH2BigLeakUnit.Text = "Pa"; - this.lb_CH2BigLeakUnit.Visible = false; - // // lb_CH2_PressureUnit // this.lb_CH2_PressureUnit.AutoSize = true; @@ -343,11 +355,11 @@ // this.lb_CH2_Result.AutoSize = true; this.lb_CH2_Result.BackColor = System.Drawing.Color.Transparent; - this.lb_CH2_Result.Font = new System.Drawing.Font("宋体", 100F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH2_Result.Font = new System.Drawing.Font("宋体", 80F); this.lb_CH2_Result.ForeColor = System.Drawing.Color.Red; - this.lb_CH2_Result.Location = new System.Drawing.Point(509, 116); + this.lb_CH2_Result.Location = new System.Drawing.Point(514, 151); this.lb_CH2_Result.Name = "lb_CH2_Result"; - this.lb_CH2_Result.Size = new System.Drawing.Size(191, 134); + this.lb_CH2_Result.Size = new System.Drawing.Size(153, 107); this.lb_CH2_Result.TabIndex = 28; this.lb_CH2_Result.Text = "NG"; // @@ -407,18 +419,6 @@ this.lb_CH2_SmallLeak.TabIndex = 412; this.lb_CH2_SmallLeak.Text = "##"; // - // lb_CH2BigLeak - // - this.lb_CH2BigLeak.AutoSize = true; - this.lb_CH2BigLeak.BackColor = System.Drawing.Color.Transparent; - this.lb_CH2BigLeak.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH2BigLeak.Location = new System.Drawing.Point(616, 72); - this.lb_CH2BigLeak.Name = "lb_CH2BigLeak"; - this.lb_CH2BigLeak.Size = new System.Drawing.Size(17, 9); - this.lb_CH2BigLeak.TabIndex = 411; - this.lb_CH2BigLeak.Text = "##"; - this.lb_CH2BigLeak.Visible = false; - // // lb_CH1_SmallLeakUnit // this.lb_CH1_SmallLeakUnit.AutoSize = true; @@ -430,18 +430,6 @@ this.lb_CH1_SmallLeakUnit.TabIndex = 423; this.lb_CH1_SmallLeakUnit.Text = "Pa"; // - // lb_CH1BigLeakUnit - // - this.lb_CH1BigLeakUnit.AutoSize = true; - this.lb_CH1BigLeakUnit.BackColor = System.Drawing.Color.Transparent; - this.lb_CH1BigLeakUnit.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH1BigLeakUnit.Location = new System.Drawing.Point(654, 58); - this.lb_CH1BigLeakUnit.Name = "lb_CH1BigLeakUnit"; - this.lb_CH1BigLeakUnit.Size = new System.Drawing.Size(17, 9); - this.lb_CH1BigLeakUnit.TabIndex = 421; - this.lb_CH1BigLeakUnit.Text = "Pa"; - this.lb_CH1BigLeakUnit.Visible = false; - // // lb_CH1_PressureUnit // this.lb_CH1_PressureUnit.AutoSize = true; @@ -500,19 +488,6 @@ this.label75.TabIndex = 401; this.label75.Text = "泄漏量"; // - // label74 - // - this.label74.AutoSize = true; - this.label74.BackColor = System.Drawing.Color.Transparent; - this.label74.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label74.Location = new System.Drawing.Point(616, 60); - this.label74.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label74.Name = "label74"; - this.label74.Size = new System.Drawing.Size(41, 9); - this.label74.TabIndex = 405; - this.label74.Text = "平衡压差"; - this.label74.Visible = false; - // // label103 // this.label103.AutoSize = true; @@ -526,10 +501,19 @@ // // uiGroupBox5 // + this.uiGroupBox5.Controls.Add(this.lb_CH2TestPressureDown); + this.uiGroupBox5.Controls.Add(this.label60); + this.uiGroupBox5.Controls.Add(this.lb_CH2TestPressureUp); + this.uiGroupBox5.Controls.Add(this.label63); + this.uiGroupBox5.Controls.Add(this.lb_CH2ProcessTime4); + this.uiGroupBox5.Controls.Add(this.label67); + this.uiGroupBox5.Controls.Add(this.lb_CH2ProcessTime3); + this.uiGroupBox5.Controls.Add(this.label72); + this.uiGroupBox5.Controls.Add(this.lb_CH2ProcessTime2); + this.uiGroupBox5.Controls.Add(this.label74); + this.uiGroupBox5.Controls.Add(this.lb_CH2ProcessTime1); + this.uiGroupBox5.Controls.Add(this.label77); this.uiGroupBox5.Controls.Add(this.tb_CH2Code); - this.uiGroupBox5.Controls.Add(this.lb_CH2_nowPressureUnit); - this.uiGroupBox5.Controls.Add(this.label43); - this.uiGroupBox5.Controls.Add(this.lb_CH2nowPressure); this.uiGroupBox5.Controls.Add(this.bt_code2clear); this.uiGroupBox5.Controls.Add(this.lb_CH2MES_INstatus); this.uiGroupBox5.Controls.Add(this.label16); @@ -539,19 +523,16 @@ this.uiGroupBox5.Controls.Add(this.lb_CH2MES_OUTstatus); this.uiGroupBox5.Controls.Add(this.label8); this.uiGroupBox5.Controls.Add(this.lb_CH2_SmallLeakUnit); - this.uiGroupBox5.Controls.Add(this.lb_CH2BigLeakUnit); this.uiGroupBox5.Controls.Add(this.lb_CH2_PressureUnit); this.uiGroupBox5.Controls.Add(this.label103); this.uiGroupBox5.Controls.Add(this.lb_CH2_Result); this.uiGroupBox5.Controls.Add(this.lb_CH2_Status); this.uiGroupBox5.Controls.Add(this.label75); this.uiGroupBox5.Controls.Add(this.label45); - this.uiGroupBox5.Controls.Add(this.label74); this.uiGroupBox5.Controls.Add(this.lb_CH2Communication_status); this.uiGroupBox5.Controls.Add(this.CH1_2presstext); this.uiGroupBox5.Controls.Add(this.label69); this.uiGroupBox5.Controls.Add(this.lb_CH2_SmallLeak); - this.uiGroupBox5.Controls.Add(this.lb_CH2BigLeak); this.uiGroupBox5.Controls.Add(this.lb_CH2_TestPressure); this.uiGroupBox5.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.uiGroupBox5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -572,14 +553,14 @@ this.tb_CH2Code.Cursor = System.Windows.Forms.Cursors.IBeam; this.tb_CH2Code.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.tb_CH2Code.Font = new System.Drawing.Font("微软雅黑", 15F); - this.tb_CH2Code.Location = new System.Drawing.Point(92, 94); + this.tb_CH2Code.Location = new System.Drawing.Point(79, 94); this.tb_CH2Code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tb_CH2Code.Maximum = 2147483647D; this.tb_CH2Code.Minimum = -2147483648D; this.tb_CH2Code.MinimumSize = new System.Drawing.Size(1, 16); this.tb_CH2Code.Multiline = true; this.tb_CH2Code.Name = "tb_CH2Code"; - this.tb_CH2Code.Size = new System.Drawing.Size(389, 34); + this.tb_CH2Code.Size = new System.Drawing.Size(336, 34); this.tb_CH2Code.Style = Sunny.UI.UIStyle.Custom; this.tb_CH2Code.TabIndex = 431; this.tb_CH2Code.TabStop = false; @@ -587,43 +568,6 @@ this.tb_CH2Code.TextChanged += new System.EventHandler(this.CH2Code_TextChanged); this.tb_CH2Code.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_CHxCode_KeyPress); // - // lb_CH2_nowPressureUnit - // - this.lb_CH2_nowPressureUnit.AutoSize = true; - this.lb_CH2_nowPressureUnit.BackColor = System.Drawing.Color.Transparent; - this.lb_CH2_nowPressureUnit.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH2_nowPressureUnit.Location = new System.Drawing.Point(575, 60); - this.lb_CH2_nowPressureUnit.Name = "lb_CH2_nowPressureUnit"; - this.lb_CH2_nowPressureUnit.Size = new System.Drawing.Size(17, 9); - this.lb_CH2_nowPressureUnit.TabIndex = 463; - this.lb_CH2_nowPressureUnit.Text = "Pa"; - this.lb_CH2_nowPressureUnit.Visible = false; - // - // label43 - // - this.label43.AutoSize = true; - this.label43.BackColor = System.Drawing.Color.Transparent; - this.label43.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label43.Location = new System.Drawing.Point(531, 60); - this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(23, 9); - this.label43.TabIndex = 461; - this.label43.Text = "压力"; - this.label43.Visible = false; - // - // lb_CH2nowPressure - // - this.lb_CH2nowPressure.AutoSize = true; - this.lb_CH2nowPressure.BackColor = System.Drawing.Color.Transparent; - this.lb_CH2nowPressure.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH2nowPressure.Location = new System.Drawing.Point(524, 72); - this.lb_CH2nowPressure.Name = "lb_CH2nowPressure"; - this.lb_CH2nowPressure.Size = new System.Drawing.Size(17, 9); - this.lb_CH2nowPressure.TabIndex = 462; - this.lb_CH2nowPressure.Text = "##"; - this.lb_CH2nowPressure.Visible = false; - // // bt_code2clear // this.bt_code2clear.Location = new System.Drawing.Point(9, 30); @@ -683,7 +627,7 @@ this.lb_CH2MES_OUTstatus.AutoSize = true; this.lb_CH2MES_OUTstatus.BackColor = System.Drawing.Color.Transparent; this.lb_CH2MES_OUTstatus.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH2MES_OUTstatus.Location = new System.Drawing.Point(573, 27); + this.lb_CH2MES_OUTstatus.Location = new System.Drawing.Point(335, 61); this.lb_CH2MES_OUTstatus.Name = "lb_CH2MES_OUTstatus"; this.lb_CH2MES_OUTstatus.Size = new System.Drawing.Size(29, 20); this.lb_CH2MES_OUTstatus.TabIndex = 456; @@ -694,7 +638,7 @@ this.label8.AutoSize = true; this.label8.BackColor = System.Drawing.Color.Transparent; this.label8.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(429, 27); + this.label8.Location = new System.Drawing.Point(191, 61); this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(139, 20); @@ -727,11 +671,11 @@ // this.lb_CH1_Result.AutoSize = true; this.lb_CH1_Result.BackColor = System.Drawing.Color.Transparent; - this.lb_CH1_Result.Font = new System.Drawing.Font("宋体", 100F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH1_Result.Font = new System.Drawing.Font("宋体", 80F); this.lb_CH1_Result.ForeColor = System.Drawing.Color.Red; - this.lb_CH1_Result.Location = new System.Drawing.Point(502, 115); + this.lb_CH1_Result.Location = new System.Drawing.Point(507, 150); this.lb_CH1_Result.Name = "lb_CH1_Result"; - this.lb_CH1_Result.Size = new System.Drawing.Size(191, 134); + this.lb_CH1_Result.Size = new System.Drawing.Size(153, 107); this.lb_CH1_Result.TabIndex = 28; this.lb_CH1_Result.Text = "NG"; // @@ -779,18 +723,6 @@ this.lb_CH1_SmallLeak.TabIndex = 412; this.lb_CH1_SmallLeak.Text = "##"; // - // lb_CH1BigLeak - // - this.lb_CH1BigLeak.AutoSize = true; - this.lb_CH1BigLeak.BackColor = System.Drawing.Color.Transparent; - this.lb_CH1BigLeak.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH1BigLeak.Location = new System.Drawing.Point(606, 70); - this.lb_CH1BigLeak.Name = "lb_CH1BigLeak"; - this.lb_CH1BigLeak.Size = new System.Drawing.Size(17, 9); - this.lb_CH1BigLeak.TabIndex = 411; - this.lb_CH1BigLeak.Text = "##"; - this.lb_CH1BigLeak.Visible = false; - // // lb_CH1_TestPressure // this.lb_CH1_TestPressure.AutoSize = true; @@ -826,19 +758,6 @@ this.CH1_1presstext.TabIndex = 400; this.CH1_1presstext.Text = "测试压力"; // - // label52 - // - this.label52.AutoSize = true; - this.label52.BackColor = System.Drawing.Color.Transparent; - this.label52.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label52.Location = new System.Drawing.Point(606, 58); - this.label52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(41, 9); - this.label52.TabIndex = 405; - this.label52.Text = "平衡压差"; - this.label52.Visible = false; - // // label51 // this.label51.AutoSize = true; @@ -1073,10 +992,19 @@ // // uiGroupBox1 // - this.uiGroupBox1.Controls.Add(this.tb_CH1Code); - this.uiGroupBox1.Controls.Add(this.lb_CH1_nowPressureUnit); + this.uiGroupBox1.Controls.Add(this.lb_CH1TestPressureDown); + this.uiGroupBox1.Controls.Add(this.label43); + this.uiGroupBox1.Controls.Add(this.lb_CH1TestPressureUp); this.uiGroupBox1.Controls.Add(this.label6); - this.uiGroupBox1.Controls.Add(this.lb_CH1nowPressure); + this.uiGroupBox1.Controls.Add(this.lb_CH1ProcessTime4); + this.uiGroupBox1.Controls.Add(this.label42); + this.uiGroupBox1.Controls.Add(this.lb_CH1ProcessTime3); + this.uiGroupBox1.Controls.Add(this.label46); + this.uiGroupBox1.Controls.Add(this.lb_CH1ProcessTime2); + this.uiGroupBox1.Controls.Add(this.label37); + this.uiGroupBox1.Controls.Add(this.lb_CH1ProcessTime1); + this.uiGroupBox1.Controls.Add(this.label15); + this.uiGroupBox1.Controls.Add(this.tb_CH1Code); this.uiGroupBox1.Controls.Add(this.bt_code1clear); this.uiGroupBox1.Controls.Add(this.label34); this.uiGroupBox1.Controls.Add(this.pictureBox5); @@ -1093,7 +1021,6 @@ this.uiGroupBox1.Controls.Add(this.lb_CH1MES_OUTstatus); this.uiGroupBox1.Controls.Add(this.label7); this.uiGroupBox1.Controls.Add(this.lb_CH1_SmallLeakUnit); - this.uiGroupBox1.Controls.Add(this.lb_CH1BigLeakUnit); this.uiGroupBox1.Controls.Add(this.lb_CH1_PressureUnit); this.uiGroupBox1.Controls.Add(this.label32); this.uiGroupBox1.Controls.Add(this.lb_CH1_Result); @@ -1101,12 +1028,10 @@ this.uiGroupBox1.Controls.Add(this.pb_CH1progressBar); this.uiGroupBox1.Controls.Add(this.label51); this.uiGroupBox1.Controls.Add(this.label50); - this.uiGroupBox1.Controls.Add(this.label52); this.uiGroupBox1.Controls.Add(this.lb_CH1Communication_status); this.uiGroupBox1.Controls.Add(this.CH1_1presstext); this.uiGroupBox1.Controls.Add(this.label49); this.uiGroupBox1.Controls.Add(this.lb_CH1_SmallLeak); - this.uiGroupBox1.Controls.Add(this.lb_CH1BigLeak); this.uiGroupBox1.Controls.Add(this.lb_CH1_TestPressure); this.uiGroupBox1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiGroupBox1.Location = new System.Drawing.Point(2, 103); @@ -1125,57 +1050,20 @@ this.tb_CH1Code.Cursor = System.Windows.Forms.Cursors.IBeam; this.tb_CH1Code.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.tb_CH1Code.Font = new System.Drawing.Font("微软雅黑", 15F); - this.tb_CH1Code.Location = new System.Drawing.Point(85, 94); + this.tb_CH1Code.Location = new System.Drawing.Point(72, 94); this.tb_CH1Code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tb_CH1Code.Maximum = 2147483647D; this.tb_CH1Code.Minimum = -2147483648D; this.tb_CH1Code.MinimumSize = new System.Drawing.Size(1, 16); this.tb_CH1Code.Multiline = true; this.tb_CH1Code.Name = "tb_CH1Code"; - this.tb_CH1Code.Size = new System.Drawing.Size(389, 34); + this.tb_CH1Code.Size = new System.Drawing.Size(336, 34); this.tb_CH1Code.TabIndex = 430; this.tb_CH1Code.TabStop = false; this.tb_CH1Code.TextAlignment = System.Drawing.ContentAlignment.TopLeft; this.tb_CH1Code.TextChanged += new System.EventHandler(this.CH1Code_TextChanged); this.tb_CH1Code.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_CHxCode_KeyPress); // - // lb_CH1_nowPressureUnit - // - this.lb_CH1_nowPressureUnit.AutoSize = true; - this.lb_CH1_nowPressureUnit.BackColor = System.Drawing.Color.Transparent; - this.lb_CH1_nowPressureUnit.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH1_nowPressureUnit.Location = new System.Drawing.Point(560, 58); - this.lb_CH1_nowPressureUnit.Name = "lb_CH1_nowPressureUnit"; - this.lb_CH1_nowPressureUnit.Size = new System.Drawing.Size(17, 9); - this.lb_CH1_nowPressureUnit.TabIndex = 451; - this.lb_CH1_nowPressureUnit.Text = "Pa"; - this.lb_CH1_nowPressureUnit.Visible = false; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.BackColor = System.Drawing.Color.Transparent; - this.label6.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(523, 58); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(23, 9); - this.label6.TabIndex = 449; - this.label6.Text = "压力"; - this.label6.Visible = false; - // - // lb_CH1nowPressure - // - this.lb_CH1nowPressure.AutoSize = true; - this.lb_CH1nowPressure.BackColor = System.Drawing.Color.Transparent; - this.lb_CH1nowPressure.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH1nowPressure.Location = new System.Drawing.Point(512, 70); - this.lb_CH1nowPressure.Name = "lb_CH1nowPressure"; - this.lb_CH1nowPressure.Size = new System.Drawing.Size(17, 9); - this.lb_CH1nowPressure.TabIndex = 450; - this.lb_CH1nowPressure.Text = "##"; - this.lb_CH1nowPressure.Visible = false; - // // bt_code1clear // this.bt_code1clear.Location = new System.Drawing.Point(10, 31); @@ -1315,7 +1203,7 @@ this.lb_CH1MES_OUTstatus.AutoSize = true; this.lb_CH1MES_OUTstatus.BackColor = System.Drawing.Color.Transparent; this.lb_CH1MES_OUTstatus.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH1MES_OUTstatus.Location = new System.Drawing.Point(558, 28); + this.lb_CH1MES_OUTstatus.Location = new System.Drawing.Point(318, 61); this.lb_CH1MES_OUTstatus.Name = "lb_CH1MES_OUTstatus"; this.lb_CH1MES_OUTstatus.Size = new System.Drawing.Size(29, 20); this.lb_CH1MES_OUTstatus.TabIndex = 430; @@ -1326,7 +1214,7 @@ this.label7.AutoSize = true; this.label7.BackColor = System.Drawing.Color.Transparent; this.label7.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(414, 28); + this.label7.Location = new System.Drawing.Point(174, 61); this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(139, 20); @@ -1517,10 +1405,19 @@ // // uiGroupBox2 // + this.uiGroupBox2.Controls.Add(this.lb_CH3TestPressureDown); + this.uiGroupBox2.Controls.Add(this.label3); + this.uiGroupBox2.Controls.Add(this.lb_CH3TestPressureUp); + this.uiGroupBox2.Controls.Add(this.label36); + this.uiGroupBox2.Controls.Add(this.lb_CH3ProcessTime4); + this.uiGroupBox2.Controls.Add(this.label44); + this.uiGroupBox2.Controls.Add(this.lb_CH3ProcessTime3); + this.uiGroupBox2.Controls.Add(this.label48); + this.uiGroupBox2.Controls.Add(this.lb_CH3ProcessTime2); + this.uiGroupBox2.Controls.Add(this.label53); + this.uiGroupBox2.Controls.Add(this.lb_CH3ProcessTime1); + this.uiGroupBox2.Controls.Add(this.label57); this.uiGroupBox2.Controls.Add(this.tb_CH3Code); - this.uiGroupBox2.Controls.Add(this.lb_CH3_nowPressureUnit); - this.uiGroupBox2.Controls.Add(this.label2); - this.uiGroupBox2.Controls.Add(this.lb_CH3nowPressure); this.uiGroupBox2.Controls.Add(this.bt_code3clear); this.uiGroupBox2.Controls.Add(this.label5); this.uiGroupBox2.Controls.Add(this.pictureBox1); @@ -1537,7 +1434,6 @@ this.uiGroupBox2.Controls.Add(this.lb_CH3MES_OUTstatus); this.uiGroupBox2.Controls.Add(this.label23); this.uiGroupBox2.Controls.Add(this.lb_CH3_SmallLeakUnit); - this.uiGroupBox2.Controls.Add(this.lb_CH3BigLeakUnit); this.uiGroupBox2.Controls.Add(this.lb_CH3_PressureUnit); this.uiGroupBox2.Controls.Add(this.label27); this.uiGroupBox2.Controls.Add(this.lb_CH3_Result); @@ -1545,12 +1441,10 @@ this.uiGroupBox2.Controls.Add(this.pb_CH3progressBar); this.uiGroupBox2.Controls.Add(this.label33); this.uiGroupBox2.Controls.Add(this.label35); - this.uiGroupBox2.Controls.Add(this.label36); this.uiGroupBox2.Controls.Add(this.lb_CH3Communication_status); this.uiGroupBox2.Controls.Add(this.label38); this.uiGroupBox2.Controls.Add(this.label40); this.uiGroupBox2.Controls.Add(this.lb_CH3_SmallLeak); - this.uiGroupBox2.Controls.Add(this.lb_CH3BigLeak); this.uiGroupBox2.Controls.Add(this.lb_CH3_TestPressure); this.uiGroupBox2.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.uiGroupBox2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -1571,14 +1465,14 @@ this.tb_CH3Code.Cursor = System.Windows.Forms.Cursors.IBeam; this.tb_CH3Code.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.tb_CH3Code.Font = new System.Drawing.Font("微软雅黑", 15F); - this.tb_CH3Code.Location = new System.Drawing.Point(87, 95); + this.tb_CH3Code.Location = new System.Drawing.Point(74, 95); this.tb_CH3Code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tb_CH3Code.Maximum = 2147483647D; this.tb_CH3Code.Minimum = -2147483648D; this.tb_CH3Code.MinimumSize = new System.Drawing.Size(1, 16); this.tb_CH3Code.Multiline = true; this.tb_CH3Code.Name = "tb_CH3Code"; - this.tb_CH3Code.Size = new System.Drawing.Size(389, 34); + this.tb_CH3Code.Size = new System.Drawing.Size(336, 34); this.tb_CH3Code.Style = Sunny.UI.UIStyle.Custom; this.tb_CH3Code.TabIndex = 431; this.tb_CH3Code.TabStop = false; @@ -1586,43 +1480,6 @@ this.tb_CH3Code.TextChanged += new System.EventHandler(this.lb_CH3Code_TextChanged); this.tb_CH3Code.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_CHxCode_KeyPress); // - // lb_CH3_nowPressureUnit - // - this.lb_CH3_nowPressureUnit.AutoSize = true; - this.lb_CH3_nowPressureUnit.BackColor = System.Drawing.Color.Transparent; - this.lb_CH3_nowPressureUnit.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH3_nowPressureUnit.Location = new System.Drawing.Point(560, 58); - this.lb_CH3_nowPressureUnit.Name = "lb_CH3_nowPressureUnit"; - this.lb_CH3_nowPressureUnit.Size = new System.Drawing.Size(17, 9); - this.lb_CH3_nowPressureUnit.TabIndex = 451; - this.lb_CH3_nowPressureUnit.Text = "Pa"; - this.lb_CH3_nowPressureUnit.Visible = false; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(523, 58); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(23, 9); - this.label2.TabIndex = 449; - this.label2.Text = "压力"; - this.label2.Visible = false; - // - // lb_CH3nowPressure - // - this.lb_CH3nowPressure.AutoSize = true; - this.lb_CH3nowPressure.BackColor = System.Drawing.Color.Transparent; - this.lb_CH3nowPressure.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH3nowPressure.Location = new System.Drawing.Point(512, 70); - this.lb_CH3nowPressure.Name = "lb_CH3nowPressure"; - this.lb_CH3nowPressure.Size = new System.Drawing.Size(17, 9); - this.lb_CH3nowPressure.TabIndex = 450; - this.lb_CH3nowPressure.Text = "##"; - this.lb_CH3nowPressure.Visible = false; - // // bt_code3clear // this.bt_code3clear.Location = new System.Drawing.Point(10, 31); @@ -1761,7 +1618,7 @@ this.lb_CH3MES_OUTstatus.AutoSize = true; this.lb_CH3MES_OUTstatus.BackColor = System.Drawing.Color.Transparent; this.lb_CH3MES_OUTstatus.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH3MES_OUTstatus.Location = new System.Drawing.Point(558, 28); + this.lb_CH3MES_OUTstatus.Location = new System.Drawing.Point(317, 61); this.lb_CH3MES_OUTstatus.Name = "lb_CH3MES_OUTstatus"; this.lb_CH3MES_OUTstatus.Size = new System.Drawing.Size(29, 20); this.lb_CH3MES_OUTstatus.TabIndex = 430; @@ -1772,7 +1629,7 @@ this.label23.AutoSize = true; this.label23.BackColor = System.Drawing.Color.Transparent; this.label23.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label23.Location = new System.Drawing.Point(414, 28); + this.label23.Location = new System.Drawing.Point(173, 61); this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label23.Name = "label23"; this.label23.Size = new System.Drawing.Size(139, 20); @@ -1790,18 +1647,6 @@ this.lb_CH3_SmallLeakUnit.TabIndex = 423; this.lb_CH3_SmallLeakUnit.Text = "Pa"; // - // lb_CH3BigLeakUnit - // - this.lb_CH3BigLeakUnit.AutoSize = true; - this.lb_CH3BigLeakUnit.BackColor = System.Drawing.Color.Transparent; - this.lb_CH3BigLeakUnit.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH3BigLeakUnit.Location = new System.Drawing.Point(654, 58); - this.lb_CH3BigLeakUnit.Name = "lb_CH3BigLeakUnit"; - this.lb_CH3BigLeakUnit.Size = new System.Drawing.Size(17, 9); - this.lb_CH3BigLeakUnit.TabIndex = 421; - this.lb_CH3BigLeakUnit.Text = "Pa"; - this.lb_CH3BigLeakUnit.Visible = false; - // // lb_CH3_PressureUnit // this.lb_CH3_PressureUnit.AutoSize = true; @@ -1828,11 +1673,11 @@ // this.lb_CH3_Result.AutoSize = true; this.lb_CH3_Result.BackColor = System.Drawing.Color.Transparent; - this.lb_CH3_Result.Font = new System.Drawing.Font("宋体", 100F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH3_Result.Font = new System.Drawing.Font("宋体", 80F); this.lb_CH3_Result.ForeColor = System.Drawing.Color.Red; - this.lb_CH3_Result.Location = new System.Drawing.Point(502, 115); + this.lb_CH3_Result.Location = new System.Drawing.Point(507, 150); this.lb_CH3_Result.Name = "lb_CH3_Result"; - this.lb_CH3_Result.Size = new System.Drawing.Size(191, 134); + this.lb_CH3_Result.Size = new System.Drawing.Size(153, 107); this.lb_CH3_Result.TabIndex = 28; this.lb_CH3_Result.Text = "NG"; // @@ -1882,19 +1727,6 @@ this.label35.TabIndex = 28; this.label35.Text = "测试进度："; // - // label36 - // - this.label36.AutoSize = true; - this.label36.BackColor = System.Drawing.Color.Transparent; - this.label36.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label36.Location = new System.Drawing.Point(606, 58); - this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(41, 9); - this.label36.TabIndex = 405; - this.label36.Text = "平衡压差"; - this.label36.Visible = false; - // // lb_CH3Communication_status // this.lb_CH3Communication_status.AutoSize = true; @@ -1941,18 +1773,6 @@ this.lb_CH3_SmallLeak.TabIndex = 412; this.lb_CH3_SmallLeak.Text = "##"; // - // lb_CH3BigLeak - // - this.lb_CH3BigLeak.AutoSize = true; - this.lb_CH3BigLeak.BackColor = System.Drawing.Color.Transparent; - this.lb_CH3BigLeak.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH3BigLeak.Location = new System.Drawing.Point(606, 70); - this.lb_CH3BigLeak.Name = "lb_CH3BigLeak"; - this.lb_CH3BigLeak.Size = new System.Drawing.Size(17, 9); - this.lb_CH3BigLeak.TabIndex = 411; - this.lb_CH3BigLeak.Text = "##"; - this.lb_CH3BigLeak.Visible = false; - // // lb_CH3_TestPressure // this.lb_CH3_TestPressure.AutoSize = true; @@ -1966,10 +1786,19 @@ // // uiGroupBox3 // + this.uiGroupBox3.Controls.Add(this.lb_CH4TestPressureDown); + this.uiGroupBox3.Controls.Add(this.label79); + this.uiGroupBox3.Controls.Add(this.lb_CH4TestPressureUp); + this.uiGroupBox3.Controls.Add(this.label81); + this.uiGroupBox3.Controls.Add(this.lb_CH4ProcessTime4); + this.uiGroupBox3.Controls.Add(this.label83); + this.uiGroupBox3.Controls.Add(this.lb_CH4ProcessTime3); + this.uiGroupBox3.Controls.Add(this.label85); + this.uiGroupBox3.Controls.Add(this.lb_CH4ProcessTime2); + this.uiGroupBox3.Controls.Add(this.label87); + this.uiGroupBox3.Controls.Add(this.lb_CH4ProcessTime1); + this.uiGroupBox3.Controls.Add(this.label89); this.uiGroupBox3.Controls.Add(this.tb_CH4Code); - this.uiGroupBox3.Controls.Add(this.lb_CH4_nowPressureUnit); - this.uiGroupBox3.Controls.Add(this.label47); - this.uiGroupBox3.Controls.Add(this.lb_CH4nowPressure); this.uiGroupBox3.Controls.Add(this.bt_code4clear); this.uiGroupBox3.Controls.Add(this.lb_CH4MES_INstatus); this.uiGroupBox3.Controls.Add(this.label55); @@ -1979,19 +1808,16 @@ this.uiGroupBox3.Controls.Add(this.lb_CH4MES_OUTstatus); this.uiGroupBox3.Controls.Add(this.label58); this.uiGroupBox3.Controls.Add(this.lb_CH4_SmallLeakUnit); - this.uiGroupBox3.Controls.Add(this.lb_CH4BigLeakUnit); this.uiGroupBox3.Controls.Add(this.lb_CH4_PressureUnit); this.uiGroupBox3.Controls.Add(this.label62); this.uiGroupBox3.Controls.Add(this.lb_CH4_Result); this.uiGroupBox3.Controls.Add(this.lb_CH4_Status); this.uiGroupBox3.Controls.Add(this.label65); this.uiGroupBox3.Controls.Add(this.label66); - this.uiGroupBox3.Controls.Add(this.label67); this.uiGroupBox3.Controls.Add(this.lb_CH4Communication_status); this.uiGroupBox3.Controls.Add(this.label70); this.uiGroupBox3.Controls.Add(this.label71); this.uiGroupBox3.Controls.Add(this.lb_CH4_SmallLeak); - this.uiGroupBox3.Controls.Add(this.lb_CH4BigLeak); this.uiGroupBox3.Controls.Add(this.lb_CH4_TestPressure); this.uiGroupBox3.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.uiGroupBox3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -2012,14 +1838,14 @@ this.tb_CH4Code.Cursor = System.Windows.Forms.Cursors.IBeam; this.tb_CH4Code.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.tb_CH4Code.Font = new System.Drawing.Font("微软雅黑", 15F); - this.tb_CH4Code.Location = new System.Drawing.Point(91, 95); + this.tb_CH4Code.Location = new System.Drawing.Point(78, 95); this.tb_CH4Code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tb_CH4Code.Maximum = 2147483647D; this.tb_CH4Code.Minimum = -2147483648D; this.tb_CH4Code.MinimumSize = new System.Drawing.Size(1, 16); this.tb_CH4Code.Multiline = true; this.tb_CH4Code.Name = "tb_CH4Code"; - this.tb_CH4Code.Size = new System.Drawing.Size(389, 34); + this.tb_CH4Code.Size = new System.Drawing.Size(336, 34); this.tb_CH4Code.Style = Sunny.UI.UIStyle.Custom; this.tb_CH4Code.TabIndex = 431; this.tb_CH4Code.TabStop = false; @@ -2027,43 +1853,6 @@ this.tb_CH4Code.TextChanged += new System.EventHandler(this.lb_CH4Code_TextChanged); this.tb_CH4Code.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_CHxCode_KeyPress); // - // lb_CH4_nowPressureUnit - // - this.lb_CH4_nowPressureUnit.AutoSize = true; - this.lb_CH4_nowPressureUnit.BackColor = System.Drawing.Color.Transparent; - this.lb_CH4_nowPressureUnit.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH4_nowPressureUnit.Location = new System.Drawing.Point(575, 60); - this.lb_CH4_nowPressureUnit.Name = "lb_CH4_nowPressureUnit"; - this.lb_CH4_nowPressureUnit.Size = new System.Drawing.Size(17, 9); - this.lb_CH4_nowPressureUnit.TabIndex = 463; - this.lb_CH4_nowPressureUnit.Text = "Pa"; - this.lb_CH4_nowPressureUnit.Visible = false; - // - // label47 - // - this.label47.AutoSize = true; - this.label47.BackColor = System.Drawing.Color.Transparent; - this.label47.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label47.Location = new System.Drawing.Point(531, 60); - this.label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(23, 9); - this.label47.TabIndex = 461; - this.label47.Text = "压力"; - this.label47.Visible = false; - // - // lb_CH4nowPressure - // - this.lb_CH4nowPressure.AutoSize = true; - this.lb_CH4nowPressure.BackColor = System.Drawing.Color.Transparent; - this.lb_CH4nowPressure.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH4nowPressure.Location = new System.Drawing.Point(524, 72); - this.lb_CH4nowPressure.Name = "lb_CH4nowPressure"; - this.lb_CH4nowPressure.Size = new System.Drawing.Size(17, 9); - this.lb_CH4nowPressure.TabIndex = 462; - this.lb_CH4nowPressure.Text = "##"; - this.lb_CH4nowPressure.Visible = false; - // // bt_code4clear // this.bt_code4clear.Location = new System.Drawing.Point(9, 30); @@ -2133,7 +1922,7 @@ this.lb_CH4MES_OUTstatus.AutoSize = true; this.lb_CH4MES_OUTstatus.BackColor = System.Drawing.Color.Transparent; this.lb_CH4MES_OUTstatus.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH4MES_OUTstatus.Location = new System.Drawing.Point(573, 27); + this.lb_CH4MES_OUTstatus.Location = new System.Drawing.Point(335, 61); this.lb_CH4MES_OUTstatus.Name = "lb_CH4MES_OUTstatus"; this.lb_CH4MES_OUTstatus.Size = new System.Drawing.Size(29, 20); this.lb_CH4MES_OUTstatus.TabIndex = 456; @@ -2144,7 +1933,7 @@ this.label58.AutoSize = true; this.label58.BackColor = System.Drawing.Color.Transparent; this.label58.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label58.Location = new System.Drawing.Point(429, 27); + this.label58.Location = new System.Drawing.Point(191, 61); this.label58.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label58.Name = "label58"; this.label58.Size = new System.Drawing.Size(139, 20); @@ -2162,18 +1951,6 @@ this.lb_CH4_SmallLeakUnit.TabIndex = 423; this.lb_CH4_SmallLeakUnit.Text = "Pa"; // - // lb_CH4BigLeakUnit - // - this.lb_CH4BigLeakUnit.AutoSize = true; - this.lb_CH4BigLeakUnit.BackColor = System.Drawing.Color.Transparent; - this.lb_CH4BigLeakUnit.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH4BigLeakUnit.Location = new System.Drawing.Point(667, 60); - this.lb_CH4BigLeakUnit.Name = "lb_CH4BigLeakUnit"; - this.lb_CH4BigLeakUnit.Size = new System.Drawing.Size(17, 9); - this.lb_CH4BigLeakUnit.TabIndex = 421; - this.lb_CH4BigLeakUnit.Text = "Pa"; - this.lb_CH4BigLeakUnit.Visible = false; - // // lb_CH4_PressureUnit // this.lb_CH4_PressureUnit.AutoSize = true; @@ -2200,11 +1977,11 @@ // this.lb_CH4_Result.AutoSize = true; this.lb_CH4_Result.BackColor = System.Drawing.Color.Transparent; - this.lb_CH4_Result.Font = new System.Drawing.Font("宋体", 100F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lb_CH4_Result.Font = new System.Drawing.Font("宋体", 80F); this.lb_CH4_Result.ForeColor = System.Drawing.Color.Red; - this.lb_CH4_Result.Location = new System.Drawing.Point(509, 116); + this.lb_CH4_Result.Location = new System.Drawing.Point(514, 151); this.lb_CH4_Result.Name = "lb_CH4_Result"; - this.lb_CH4_Result.Size = new System.Drawing.Size(191, 134); + this.lb_CH4_Result.Size = new System.Drawing.Size(153, 107); this.lb_CH4_Result.TabIndex = 28; this.lb_CH4_Result.Text = "NG"; // @@ -2243,19 +2020,6 @@ this.label66.TabIndex = 28; this.label66.Text = "测试进度："; // - // label67 - // - this.label67.AutoSize = true; - this.label67.BackColor = System.Drawing.Color.Transparent; - this.label67.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label67.Location = new System.Drawing.Point(616, 60); - this.label67.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(41, 9); - this.label67.TabIndex = 405; - this.label67.Text = "平衡压差"; - this.label67.Visible = false; - // // lb_CH4Communication_status // this.lb_CH4Communication_status.AutoSize = true; @@ -2302,18 +2066,6 @@ this.lb_CH4_SmallLeak.TabIndex = 412; this.lb_CH4_SmallLeak.Text = "##"; // - // lb_CH4BigLeak - // - this.lb_CH4BigLeak.AutoSize = true; - this.lb_CH4BigLeak.BackColor = System.Drawing.Color.Transparent; - this.lb_CH4BigLeak.Font = new System.Drawing.Font("宋体", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lb_CH4BigLeak.Location = new System.Drawing.Point(616, 72); - this.lb_CH4BigLeak.Name = "lb_CH4BigLeak"; - this.lb_CH4BigLeak.Size = new System.Drawing.Size(17, 9); - this.lb_CH4BigLeak.TabIndex = 411; - this.lb_CH4BigLeak.Text = "##"; - this.lb_CH4BigLeak.Visible = false; - // // lb_CH4_TestPressure // this.lb_CH4_TestPressure.AutoSize = true; @@ -2634,6 +2386,558 @@ // 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 = "充气："; + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -2655,7 +2959,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.Name = "Form1"; - this.Text = " LL28-Z_V25111302(c-USB)"; + this.Text = " LL28-C_V25111501"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing); this.Load += new System.EventHandler(this.Form1_Load); this.uiGroupBox5.ResumeLayout(false); @@ -2694,33 +2998,27 @@ #endregion public System.IO.Ports.SerialPort SerialPort_CH1Saoma; private System.Windows.Forms.Label lb_CH2_SmallLeakUnit; - private System.Windows.Forms.Label lb_CH2BigLeakUnit; private System.Windows.Forms.Label lb_CH2_PressureUnit; private System.Windows.Forms.Label lb_CH2_Result; private System.Windows.Forms.Label lb_CH2_Status; private Sunny.UI.UIProcessBar pb_CH2progressBar; private System.Windows.Forms.Label label45; private System.Windows.Forms.Label lb_CH2_SmallLeak; - private System.Windows.Forms.Label lb_CH2BigLeak; private System.Windows.Forms.Label lb_CH1_SmallLeakUnit; - private System.Windows.Forms.Label lb_CH1BigLeakUnit; private System.Windows.Forms.Label lb_CH1_PressureUnit; private System.Windows.Forms.Label lb_CH2_TestPressure; private System.Windows.Forms.Label label69; private System.Windows.Forms.Label CH1_2presstext; private System.Windows.Forms.Label label75; - private System.Windows.Forms.Label label74; private System.Windows.Forms.Label label103; private Sunny.UI.UIGroupBox uiGroupBox5; private System.Windows.Forms.Label lb_CH1_Result; private System.Windows.Forms.Label lb_CH1_Status; private System.Windows.Forms.Label label50; private System.Windows.Forms.Label lb_CH1_SmallLeak; - private System.Windows.Forms.Label lb_CH1BigLeak; private System.Windows.Forms.Label lb_CH1_TestPressure; private System.Windows.Forms.Label label49; private System.Windows.Forms.Label CH1_1presstext; - private System.Windows.Forms.Label label52; private System.Windows.Forms.Label label51; private System.Windows.Forms.Label label32; private Sunny.UI.UINavBar nb_MainMenu; @@ -2763,12 +3061,6 @@ private System.Windows.Forms.Button bt_code1clear; private System.Windows.Forms.Button bt_code2clear; private System.Windows.Forms.Timer timer_yiqiRun; - private System.Windows.Forms.Label lb_CH2_nowPressureUnit; - private System.Windows.Forms.Label label43; - private System.Windows.Forms.Label lb_CH2nowPressure; - private System.Windows.Forms.Label lb_CH1_nowPressureUnit; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label lb_CH1nowPressure; private System.Windows.Forms.Button bt_test; private Sunny.UI.UITextBox tb_CH1MainMessage; public System.Windows.Forms.Timer UserClear; @@ -2778,9 +3070,6 @@ public System.Windows.Forms.Timer timer_SaomaStart; public System.Windows.Forms.Timer timer_nowTime; private Sunny.UI.UIGroupBox uiGroupBox2; - private System.Windows.Forms.Label lb_CH3_nowPressureUnit; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label lb_CH3nowPressure; private System.Windows.Forms.Button bt_code3clear; public System.Windows.Forms.Label label5; private System.Windows.Forms.PictureBox pictureBox1; @@ -2797,7 +3086,6 @@ public System.Windows.Forms.Label lb_CH3MES_OUTstatus; private System.Windows.Forms.Label label23; private System.Windows.Forms.Label lb_CH3_SmallLeakUnit; - private System.Windows.Forms.Label lb_CH3BigLeakUnit; private System.Windows.Forms.Label lb_CH3_PressureUnit; private System.Windows.Forms.Label label27; private System.Windows.Forms.Label lb_CH3_Result; @@ -2805,17 +3093,12 @@ private Sunny.UI.UIProcessBar pb_CH3progressBar; private System.Windows.Forms.Label label33; private System.Windows.Forms.Label label35; - private System.Windows.Forms.Label label36; public System.Windows.Forms.Label lb_CH3Communication_status; private System.Windows.Forms.Label label38; private System.Windows.Forms.Label label40; private System.Windows.Forms.Label lb_CH3_SmallLeak; - private System.Windows.Forms.Label lb_CH3BigLeak; private System.Windows.Forms.Label lb_CH3_TestPressure; private Sunny.UI.UIGroupBox uiGroupBox3; - private System.Windows.Forms.Label lb_CH4_nowPressureUnit; - private System.Windows.Forms.Label label47; - private System.Windows.Forms.Label lb_CH4nowPressure; private System.Windows.Forms.Button bt_code4clear; public System.Windows.Forms.Label lb_CH4MES_INstatus; private System.Windows.Forms.Label label55; @@ -2825,19 +3108,16 @@ public System.Windows.Forms.Label lb_CH4MES_OUTstatus; private System.Windows.Forms.Label label58; private System.Windows.Forms.Label lb_CH4_SmallLeakUnit; - private System.Windows.Forms.Label lb_CH4BigLeakUnit; private System.Windows.Forms.Label lb_CH4_PressureUnit; private System.Windows.Forms.Label label62; private System.Windows.Forms.Label lb_CH4_Result; private System.Windows.Forms.Label lb_CH4_Status; private System.Windows.Forms.Label label65; private System.Windows.Forms.Label label66; - private System.Windows.Forms.Label label67; public System.Windows.Forms.Label lb_CH4Communication_status; private System.Windows.Forms.Label label70; private System.Windows.Forms.Label label71; private System.Windows.Forms.Label lb_CH4_SmallLeak; - private System.Windows.Forms.Label lb_CH4BigLeak; private System.Windows.Forms.Label lb_CH4_TestPressure; private System.Windows.Forms.DataGridViewTextBoxColumn Column1; private System.Windows.Forms.DataGridViewTextBoxColumn Column8; @@ -2877,6 +3157,54 @@ private Sunny.UI.UITextBox tb_CH4Code; private System.Windows.Forms.CheckBox chk_SaomaFocus; public System.Windows.Forms.Timer timer2; + public System.Windows.Forms.Label lb_CH1TestPressureDown; + private System.Windows.Forms.Label label43; + public System.Windows.Forms.Label lb_CH1TestPressureUp; + private System.Windows.Forms.Label label6; + public System.Windows.Forms.Label lb_CH1ProcessTime4; + private System.Windows.Forms.Label label42; + public System.Windows.Forms.Label lb_CH1ProcessTime3; + private System.Windows.Forms.Label label46; + public System.Windows.Forms.Label lb_CH1ProcessTime2; + private System.Windows.Forms.Label label37; + public System.Windows.Forms.Label lb_CH1ProcessTime1; + private System.Windows.Forms.Label label15; + public System.Windows.Forms.Label lb_CH3TestPressureDown; + private System.Windows.Forms.Label label3; + public System.Windows.Forms.Label lb_CH3TestPressureUp; + private System.Windows.Forms.Label label36; + public System.Windows.Forms.Label lb_CH3ProcessTime4; + private System.Windows.Forms.Label label44; + public System.Windows.Forms.Label lb_CH3ProcessTime3; + private System.Windows.Forms.Label label48; + public System.Windows.Forms.Label lb_CH3ProcessTime2; + private System.Windows.Forms.Label label53; + public System.Windows.Forms.Label lb_CH3ProcessTime1; + private System.Windows.Forms.Label label57; + public System.Windows.Forms.Label lb_CH2TestPressureDown; + private System.Windows.Forms.Label label60; + public System.Windows.Forms.Label lb_CH2TestPressureUp; + private System.Windows.Forms.Label label63; + public System.Windows.Forms.Label lb_CH2ProcessTime4; + private System.Windows.Forms.Label label67; + public System.Windows.Forms.Label lb_CH2ProcessTime3; + private System.Windows.Forms.Label label72; + public System.Windows.Forms.Label lb_CH2ProcessTime2; + private System.Windows.Forms.Label label74; + public System.Windows.Forms.Label lb_CH2ProcessTime1; + private System.Windows.Forms.Label label77; + public System.Windows.Forms.Label lb_CH4TestPressureDown; + private System.Windows.Forms.Label label79; + public System.Windows.Forms.Label lb_CH4TestPressureUp; + private System.Windows.Forms.Label label81; + public System.Windows.Forms.Label lb_CH4ProcessTime4; + private System.Windows.Forms.Label label83; + public System.Windows.Forms.Label lb_CH4ProcessTime3; + private System.Windows.Forms.Label label85; + public System.Windows.Forms.Label lb_CH4ProcessTime2; + private System.Windows.Forms.Label label87; + public System.Windows.Forms.Label lb_CH4ProcessTime1; + private System.Windows.Forms.Label label89; } } diff --git a/SLC1-N/Form1.cs b/SLC1-N/Form1.cs index f145b54..54d62cb 100644 --- a/SLC1-N/Form1.cs +++ b/SLC1-N/Form1.cs @@ -1235,15 +1235,15 @@ namespace SLC1_N GetYiqiParam(i, "P").delaytime1 = Convert.ToInt32(jsconfig.GetValue($"{i}" + "P" + "delaytime1" + j, "0")); GetYiqiParam(i, "P").delaytime2 = Convert.ToInt32(jsconfig.GetValue($"{i}" + "P" + "delaytime2" + j, "0")); GetYiqiParam(i, "P").relievedelay = Convert.ToInt32(jsconfig.GetValue($"{i}" + "P" + "relievedelay" + j, "0")); - GetYiqiParam(i, "P").evolume = Convert.ToInt32(jsconfig.GetValue($"{i}" + "P" + "evolume" + j, "0")); + GetYiqiParam(i, "P").evolume = StringToFloat(jsconfig.GetValue($"{i}" + "P" + "evolume" + j, "0")); - GetYiqiParam(i, "P").fptoplimit = Convert.ToInt32(jsconfig.GetValue($"{i}" + "P" + "fptoplimit" + j, "0")); - GetYiqiParam(i, "P").fplowlimit = Convert.ToInt32(jsconfig.GetValue($"{i}" + "P" + "fplowlimit" + j, "0")); - GetYiqiParam(i, "P").balanpremax = Convert.ToInt32(jsconfig.GetValue($"{i}" + "P" + "balanpremax" + j, "0")); - GetYiqiParam(i, "P").balanpremin = Convert.ToInt32(jsconfig.GetValue($"{i}" + "P" + "balanpremin" + j, "0")); + GetYiqiParam(i, "P").fptoplimit = StringToFloat(jsconfig.GetValue($"{i}" + "P" + "fptoplimit" + j, "0")); + GetYiqiParam(i, "P").fplowlimit = StringToFloat(jsconfig.GetValue($"{i}" + "P" + "fplowlimit" + j, "0")); + GetYiqiParam(i, "P").balanpremax = StringToFloat(jsconfig.GetValue($"{i}" + "P" + "balanpremax" + j, "0")); + GetYiqiParam(i, "P").balanpremin = StringToFloat(jsconfig.GetValue($"{i}" + "P" + "balanpremin" + j, "0")); - GetYiqiParam(i, "P").leaktoplimit = Convert.ToInt32(jsconfig.GetValue($"{i}" + "P" + "leaktoplimit" + j, "0")); - GetYiqiParam(i, "P").leaklowlimit = Convert.ToInt32(jsconfig.GetValue($"{i}" + "P" + "leaklowlimit" + j, "0")); + GetYiqiParam(i, "P").leaktoplimit = StringToFloat(jsconfig.GetValue($"{i}" + "P" + "leaktoplimit" + j, "0")); + GetYiqiParam(i, "P").leaklowlimit = StringToFloat(jsconfig.GetValue($"{i}" + "P" + "leaklowlimit" + j, "0")); GetYiqiParam(i, "P").punit = jsconfig.GetValue($"{i}" + "P" + "punit" + j, 0); GetYiqiParam(i, "P").lunit = jsconfig.GetValue($"{i}" + "P" + "lunit" + j, 0); @@ -1258,15 +1258,15 @@ namespace SLC1_N GetYiqiParam(i, "N").delaytime1 = Convert.ToInt32(jsconfig.GetValue($"{i}" + "N" + "delaytime1" + j, "0")); GetYiqiParam(i, "N").delaytime2 = Convert.ToInt32(jsconfig.GetValue($"{i}" + "N" + "delaytime2" + j, "0")); GetYiqiParam(i, "N").relievedelay = Convert.ToInt32(jsconfig.GetValue($"{i}" + "N" + "relievedelay" + j, "0")); - GetYiqiParam(i, "N").evolume = Convert.ToInt32(jsconfig.GetValue($"{i}" + "N" + "evolume" + j, "0")); + GetYiqiParam(i, "N").evolume = StringToFloat(jsconfig.GetValue($"{i}" + "N" + "evolume" + j, "0")); - GetYiqiParam(i, "N").fptoplimit = Convert.ToInt32(jsconfig.GetValue($"{i}" + "N" + "fptoplimit" + j, "0")); - GetYiqiParam(i, "N").fplowlimit = Convert.ToInt32(jsconfig.GetValue($"{i}" + "N" + "fplowlimit" + j, "0")); - GetYiqiParam(i, "N").balanpremax = Convert.ToInt32(jsconfig.GetValue($"{i}" + "N" + "balanpremax" + j, "0")); - GetYiqiParam(i, "N").balanpremin = Convert.ToInt32(jsconfig.GetValue($"{i}" + "N" + "balanpremin" + j, "0")); + GetYiqiParam(i, "N").fptoplimit = StringToFloat(jsconfig.GetValue($"{i}" + "N" + "fptoplimit" + j, "0")); + GetYiqiParam(i, "N").fplowlimit = StringToFloat(jsconfig.GetValue($"{i}" + "N" + "fplowlimit" + j, "0")); + GetYiqiParam(i, "N").balanpremax = StringToFloat(jsconfig.GetValue($"{i}" + "N" + "balanpremax" + j, "0")); + GetYiqiParam(i, "N").balanpremin = StringToFloat(jsconfig.GetValue($"{i}" + "N" + "balanpremin" + j, "0")); - GetYiqiParam(i, "N").leaktoplimit = Convert.ToInt32(jsconfig.GetValue($"{i}" + "N" + "leaktoplimit" + j, "0")); - GetYiqiParam(i, "N").leaklowlimit = Convert.ToInt32(jsconfig.GetValue($"{i}" + "N" + "leaklowlimit" + j, "0")); + GetYiqiParam(i, "N").leaktoplimit = StringToFloat(jsconfig.GetValue($"{i}" + "N" + "leaktoplimit" + j, "0")); + GetYiqiParam(i, "N").leaklowlimit = StringToFloat(jsconfig.GetValue($"{i}" + "N" + "leaklowlimit" + j, "0")); GetYiqiParam(i, "N").punit = jsconfig.GetValue($"{i}" + "N" + "punit" + j, 0); GetYiqiParam(i, "N").lunit = jsconfig.GetValue($"{i}" + "N" + "lunit" + j, 0); @@ -1406,6 +1406,15 @@ namespace SLC1_N if (LL28CH1client.ArrCoil[2]) { prepareOutTime_Dictionary.Remove(1); + + SetLabelText(lb_CH1ProcessTime1, (LL28CH1client.ArrRegister[6] / 10.0).ToString() + " s"); + SetLabelText(lb_CH1ProcessTime2, (LL28CH1client.ArrRegister[7] / 10.0).ToString() + " s"); + SetLabelText(lb_CH1ProcessTime3, (LL28CH1client.ArrRegister[8] / 10.0).ToString() + " s"); + SetLabelText(lb_CH1ProcessTime4, (LL28CH1client.ArrRegister[9] / 10.0).ToString() + " s"); + + SetLabelText(lb_CH1TestPressureUp, LL28CH1client.readFloat(13)); + SetLabelText(lb_CH1TestPressureDown, LL28CH1client.readFloat(15)); + ch1workstation = (int)yiqi.test; } } @@ -1453,17 +1462,17 @@ namespace SLC1_N int lunit = Convert.ToInt32(LL28CH1client.ArrRegister[28]); SetLUnit(1, lunit); - // 当前压力 - string fNowpressure = LL28CH1client.readFloatF2(48); - SetLabelText(lb_CH1nowPressure, fNowpressure); + //// 当前压力 + //string fNowpressure = LL28CH1client.readFloatF2(48); + //SetLabelText(lb_CH1nowPressure, fNowpressure); // 充气压力（测试压力） string fTestpressure = LL28CH1client.readFloatF2(57); SetLabelText(lb_CH1_TestPressure, fTestpressure); - // 大漏（平衡压差） - string fBigLeak = LL28CH1client.readFloatF2(35); - SetLabelText(lb_CH1BigLeak, fBigLeak); + //// 大漏（平衡压差） + //string fBigLeak = LL28CH1client.readFloatF2(35); + //SetLabelText(lb_CH1BigLeak, fBigLeak); // 微漏（泄漏量） string fSmallLeak = LL28CH1client.readFloatF2(38); @@ -1524,17 +1533,17 @@ namespace SLC1_N SetLabelText(lb_CH1_Status, "完成"); CH1TestTime.stopTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - // 当前压力 - string fNowpressure = LL28CH1client.readFloatF2(48); - SetLabelText(lb_CH1nowPressure, fNowpressure); + //// 当前压力 + //string fNowpressure = LL28CH1client.readFloatF2(48); + //SetLabelText(lb_CH1nowPressure, fNowpressure); // 充气压力 string fTestpressure = LL28CH1client.readFloatF2(57); SetLabelText(lb_CH1_TestPressure, fTestpressure); - //大漏 - string fBigLeak = LL28CH1client.readFloatF2(35); - SetLabelText(lb_CH1BigLeak, fBigLeak); + ////大漏 + //string fBigLeak = LL28CH1client.readFloatF2(35); + //SetLabelText(lb_CH1BigLeak, fBigLeak); //微漏 string fSmallLeak = LL28CH1client.readFloatF2(38); @@ -1773,6 +1782,15 @@ namespace SLC1_N if (LL28CH2client.ArrCoil[2]) { prepareOutTime_Dictionary.Remove(2); + + SetLabelText(lb_CH2ProcessTime1, (LL28CH2client.ArrRegister[6] / 10.0).ToString() + " s"); + SetLabelText(lb_CH2ProcessTime2, (LL28CH2client.ArrRegister[7] / 10.0).ToString() + " s"); + SetLabelText(lb_CH2ProcessTime3, (LL28CH2client.ArrRegister[8] / 10.0).ToString() + " s"); + SetLabelText(lb_CH2ProcessTime4, (LL28CH2client.ArrRegister[9] / 10.0).ToString() + " s"); + + SetLabelText(lb_CH2TestPressureUp, LL28CH2client.readFloat(13)); + SetLabelText(lb_CH2TestPressureDown, LL28CH2client.readFloat(15)); + ch2workstation = (int)yiqi.test; } } @@ -1820,17 +1838,17 @@ namespace SLC1_N int lunit = Convert.ToInt32(LL28CH2client.ArrRegister[28]); SetLUnit(2, lunit); - // 当前压力 - string fNowpressure = LL28CH2client.readFloatF2(48); - SetLabelText(lb_CH2nowPressure, fNowpressure); + //// 当前压力 + //string fNowpressure = LL28CH2client.readFloatF2(48); + //SetLabelText(lb_CH2nowPressure, fNowpressure); // 充气压力（测试压力） string fTestpressure = LL28CH2client.readFloatF2(57); SetLabelText(lb_CH2_TestPressure, fTestpressure); - // 大漏（平衡压差） - string fBigLeak = LL28CH2client.readFloatF2(35); - SetLabelText(lb_CH2BigLeak, fBigLeak); + //// 大漏（平衡压差） + //string fBigLeak = LL28CH2client.readFloatF2(35); + //SetLabelText(lb_CH2BigLeak, fBigLeak); // 微漏（泄漏量） string fSmallLeak = LL28CH2client.readFloatF2(38); @@ -1891,17 +1909,17 @@ namespace SLC1_N SetLabelText(lb_CH2_Status, "完成"); CH2TestTime.stopTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - // 当前压力 - string fNowpressure = LL28CH2client.readFloatF2(48); - SetLabelText(lb_CH2nowPressure, fNowpressure); + //// 当前压力 + //string fNowpressure = LL28CH2client.readFloatF2(48); + //SetLabelText(lb_CH2nowPressure, fNowpressure); // 充气压力 string fTestpressure = LL28CH2client.readFloatF2(57); SetLabelText(lb_CH2_TestPressure, fTestpressure); - //大漏 - string fBigLeak = LL28CH2client.readFloatF2(35); - SetLabelText(lb_CH2BigLeak, fBigLeak); + ////大漏 + //string fBigLeak = LL28CH2client.readFloatF2(35); + //SetLabelText(lb_CH2BigLeak, fBigLeak); //微漏 string fSmallLeak = LL28CH2client.readFloatF2(38); @@ -2140,6 +2158,15 @@ namespace SLC1_N if (LL28CH3client.ArrCoil[2]) { prepareOutTime_Dictionary.Remove(3); + + SetLabelText(lb_CH3ProcessTime1, (LL28CH3client.ArrRegister[6] / 10.0).ToString() + " s"); + SetLabelText(lb_CH3ProcessTime2, (LL28CH3client.ArrRegister[7] / 10.0).ToString() + " s"); + SetLabelText(lb_CH3ProcessTime3, (LL28CH3client.ArrRegister[8] / 10.0).ToString() + " s"); + SetLabelText(lb_CH3ProcessTime4, (LL28CH3client.ArrRegister[9] / 10.0).ToString() + " s"); + + SetLabelText(lb_CH3TestPressureUp, LL28CH3client.readFloat(13)); + SetLabelText(lb_CH3TestPressureDown, LL28CH3client.readFloat(15)); + ch3workstation = (int)yiqi.test; } } @@ -2187,17 +2214,17 @@ namespace SLC1_N int lunit = Convert.ToInt32(LL28CH3client.ArrRegister[28]); SetLUnit(3, lunit); - // 当前压力 - string fNowpressure = LL28CH3client.readFloatF2(48); - SetLabelText(lb_CH3nowPressure, fNowpressure); + //// 当前压力 + //string fNowpressure = LL28CH3client.readFloatF2(48); + //SetLabelText(lb_CH3nowPressure, fNowpressure); // 充气压力（测试压力） string fTestpressure = LL28CH3client.readFloatF2(57); SetLabelText(lb_CH3_TestPressure, fTestpressure); - // 大漏（平衡压差） - string fBigLeak = LL28CH3client.readFloatF2(35); - SetLabelText(lb_CH3BigLeak, fBigLeak); + //// 大漏（平衡压差） + //string fBigLeak = LL28CH3client.readFloatF2(35); + //SetLabelText(lb_CH3BigLeak, fBigLeak); // 微漏（泄漏量） string fSmallLeak = LL28CH3client.readFloatF2(38); @@ -2258,17 +2285,17 @@ namespace SLC1_N SetLabelText(lb_CH3_Status, "完成"); CH3TestTime.stopTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - // 当前压力 - string fNowpressure = LL28CH3client.readFloatF2(48); - SetLabelText(lb_CH3nowPressure, fNowpressure); + //// 当前压力 + //string fNowpressure = LL28CH3client.readFloatF2(48); + //SetLabelText(lb_CH3nowPressure, fNowpressure); // 充气压力 string fTestpressure = LL28CH3client.readFloatF2(57); SetLabelText(lb_CH3_TestPressure, fTestpressure); - //大漏 - string fBigLeak = LL28CH3client.readFloatF2(35); - SetLabelText(lb_CH3BigLeak, fBigLeak); + ////大漏 + //string fBigLeak = LL28CH3client.readFloatF2(35); + //SetLabelText(lb_CH3BigLeak, fBigLeak); //微漏 string fSmallLeak = LL28CH3client.readFloatF2(38); @@ -2508,6 +2535,15 @@ namespace SLC1_N if (LL28CH4client.ArrCoil[2]) { prepareOutTime_Dictionary.Remove(4); + + SetLabelText(lb_CH4ProcessTime1, (LL28CH4client.ArrRegister[6] / 10.0).ToString() + " s"); + SetLabelText(lb_CH4ProcessTime2, (LL28CH4client.ArrRegister[7] / 10.0).ToString() + " s"); + SetLabelText(lb_CH4ProcessTime3, (LL28CH4client.ArrRegister[8] / 10.0).ToString() + " s"); + SetLabelText(lb_CH4ProcessTime4, (LL28CH4client.ArrRegister[9] / 10.0).ToString() + " s"); + + SetLabelText(lb_CH4TestPressureUp, LL28CH4client.readFloat(13)); + SetLabelText(lb_CH4TestPressureDown, LL28CH4client.readFloat(15)); + ch4workstation = (int)yiqi.test; } } @@ -2555,17 +2591,17 @@ namespace SLC1_N int lunit = Convert.ToInt32(LL28CH4client.ArrRegister[28]); SetLUnit(4, lunit); - // 当前压力 - string fNowpressure = LL28CH4client.readFloatF2(48); - SetLabelText(lb_CH4nowPressure, fNowpressure); + //// 当前压力 + //string fNowpressure = LL28CH4client.readFloatF2(48); + //SetLabelText(lb_CH4nowPressure, fNowpressure); // 充气压力（测试压力） string fTestpressure = LL28CH4client.readFloatF2(57); SetLabelText(lb_CH4_TestPressure, fTestpressure); - // 大漏（平衡压差） - string fBigLeak = LL28CH4client.readFloatF2(35); - SetLabelText(lb_CH4BigLeak, fBigLeak); + //// 大漏（平衡压差） + //string fBigLeak = LL28CH4client.readFloatF2(35); + //SetLabelText(lb_CH4BigLeak, fBigLeak); // 微漏（泄漏量） string fSmallLeak = LL28CH4client.readFloatF2(38); @@ -2626,17 +2662,17 @@ namespace SLC1_N SetLabelText(lb_CH4_Status, "完成"); CH4TestTime.stopTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - // 当前压力 - string fNowpressure = LL28CH4client.readFloatF2(48); - SetLabelText(lb_CH4nowPressure, fNowpressure); + //// 当前压力 + //string fNowpressure = LL28CH4client.readFloatF2(48); + //SetLabelText(lb_CH4nowPressure, fNowpressure); // 充气压力 string fTestpressure = LL28CH4client.readFloatF2(57); SetLabelText(lb_CH4_TestPressure, fTestpressure); - //大漏 - string fBigLeak = LL28CH4client.readFloatF2(35); - SetLabelText(lb_CH4BigLeak, fBigLeak); + ////大漏 + //string fBigLeak = LL28CH4client.readFloatF2(35); + //SetLabelText(lb_CH4BigLeak, fBigLeak); //微漏 string fSmallLeak = LL28CH4client.readFloatF2(38); @@ -2809,6 +2845,11 @@ namespace SLC1_N } } + private float StringToFloat(string value, float defaultValue = 0f) + { + return float.TryParse(value, out float result) ? result : defaultValue; + } + // 更新产能数据 void UploadProductionData(int total, int ok, int ng, double okRate) { @@ -2873,32 +2914,32 @@ namespace SLC1_N case 1: lb_CH1_PressureUnit.Invoke((MethodInvoker)delegate { - lb_CH1BigLeakUnit.Text = PUnit; - lb_CH1_nowPressureUnit.Text = PUnit; + //lb_CH1BigLeakUnit.Text = PUnit; + //lb_CH1_nowPressureUnit.Text = PUnit; lb_CH1_PressureUnit.Text = PUnit; }); break; case 2: lb_CH2_PressureUnit.Invoke((MethodInvoker)delegate { - lb_CH2BigLeakUnit.Text = PUnit; - lb_CH2_nowPressureUnit.Text = PUnit; + //lb_CH2BigLeakUnit.Text = PUnit; + //lb_CH2_nowPressureUnit.Text = PUnit; lb_CH2_PressureUnit.Text = PUnit; }); break; case 3: lb_CH3_PressureUnit.Invoke((MethodInvoker)delegate { - lb_CH3BigLeakUnit.Text = PUnit; - lb_CH3_nowPressureUnit.Text = PUnit; + //lb_CH3BigLeakUnit.Text = PUnit; + //lb_CH3_nowPressureUnit.Text = PUnit; lb_CH3_PressureUnit.Text = PUnit; }); break; case 4: lb_CH4_PressureUnit.Invoke((MethodInvoker)delegate { - lb_CH4BigLeakUnit.Text = PUnit; - lb_CH4_nowPressureUnit.Text = PUnit; + //lb_CH4BigLeakUnit.Text = PUnit; + //lb_CH4_nowPressureUnit.Text = PUnit; lb_CH4_PressureUnit.Text = PUnit; }); break; @@ -3614,7 +3655,7 @@ namespace SLC1_N //fileWriter.Write(ch2params.Leaklowlimit + ch2params.LUnit + ","); fileWriter.Write(lb_CH2_Result.Text + ","); //fileWriter.Write(CH2LeakPress.Text + ch2params.PUnit + ","); - fileWriter.Write(lb_CH2BigLeak.Text + ","); + //fileWriter.Write(lb_CH2BigLeak.Text + ","); //fileWriter.Write(CH2SmallLeak.Text + ch2params.LUnit + ","); fileWriter.Write(lb_CH2_Result.Text + "\n"); } diff --git a/SLC1-N/SLC1-N.csproj b/SLC1-N/SLC1-N.csproj index e4431f5..e4e918e 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-V25111302-c + LL28-C_V25111501 v4.8 512 true diff --git a/SLC1-N/obj/Debug/LL28-V25111302-c.exe b/SLC1-N/bin/Debug/LL28-C_V25111501.exe similarity index 97% rename from SLC1-N/obj/Debug/LL28-V25111302-c.exe rename to SLC1-N/bin/Debug/LL28-C_V25111501.exe index 98f4bcc..d44973c 100644 Binary files a/SLC1-N/obj/Debug/LL28-V25111302-c.exe and b/SLC1-N/bin/Debug/LL28-C_V25111501.exe differ diff --git a/SLC1-N/bin/Debug/LL28-V25111302-c.exe.config b/SLC1-N/bin/Debug/LL28-C_V25111501.exe.config similarity index 100% rename from SLC1-N/bin/Debug/LL28-V25111302-c.exe.config rename to SLC1-N/bin/Debug/LL28-C_V25111501.exe.config diff --git a/SLC1-N/bin/Debug/LL28-C_V25111501.pdb b/SLC1-N/bin/Debug/LL28-C_V25111501.pdb new file mode 100644 index 0000000..2611068 Binary files /dev/null and b/SLC1-N/bin/Debug/LL28-C_V25111501.pdb differ diff --git a/SLC1-N/bin/Debug/LL28-V25111302-c.pdb b/SLC1-N/bin/Debug/LL28-V25111302-c.pdb deleted file mode 100644 index 651d406..0000000 Binary files a/SLC1-N/bin/Debug/LL28-V25111302-c.pdb and /dev/null differ diff --git a/SLC1-N/bin/Debug/Logs/log_20251016.log b/SLC1-N/bin/Debug/Logs/log_20251016.log deleted file mode 100644 index 8996ae8..0000000 --- a/SLC1-N/bin/Debug/Logs/log_20251016.log +++ /dev/null @@ -1,28 +0,0 @@ -2025-10-16 13:58:51.555 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567891","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 13:58:51"} -2025-10-16 13:58:54.614 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 14:00:30.665 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567890","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 14:00:30"} -2025-10-16 14:00:33.677 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 15:53:53.051 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567891","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 15:53:53"} -2025-10-16 15:53:56.075 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 15:54:15.143 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567892","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 15:54:15"} -2025-10-16 15:54:18.163 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 15:54:32.565 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567893","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 15:54:32"} -2025-10-16 15:54:35.608 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 16:37:28.764 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567893","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:37:28"} -2025-10-16 16:37:31.851 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 16:37:40.365 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567894","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:37:40"} -2025-10-16 16:37:43.385 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 16:38:00.879 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567895","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:38:00"} -2025-10-16 16:38:03.898 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 16:39:46.522 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"12345678951234567895","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:39:46"} -2025-10-16 16:39:46.695 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567895","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:39:46"} -2025-10-16 16:39:49.567 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 16:39:49.712 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 16:43:59.780 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"12345678951234567895","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:43:59"} -2025-10-16 16:44:02.843 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 16:44:08.923 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567894","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:44:08"} -2025-10-16 16:44:11.948 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 16:52:29.050 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567894","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:52:29"} -2025-10-16 16:52:32.089 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 -2025-10-16 16:52:34.581 [DEBUG] [MES] http://172.16.12.62:8084/TestWebService.asmx/AutoVerificationTestSN, {"barcode":"1234567895","workorder":"1","partno":"1","station":"1","equipmentno":"1","computerName":"PC-20230419CFZS","computerIP":"192.168.1.90","intime":"2025-10-16 16:52:34"} -2025-10-16 16:52:37.601 [DEBUG] [MES] 调用CreatePostHttpResponse超时: 操作超时 diff --git a/SLC1-N/bin/Debug/NetWorkHelper.dll b/SLC1-N/bin/Debug/NetWorkHelper.dll index 2033eec..701fe09 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 982d094..de1ff34 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/config.json b/SLC1-N/bin/Debug/config.json index 1f57149..357642b 100644 --- a/SLC1-N/bin/Debug/config.json +++ b/SLC1-N/bin/Debug/config.json @@ -142,8 +142,8 @@ "chk_ContinueTest": true, "rbt_VolumeMode": false, "rbt_OpeningMode": true, - "rbt_PpressureMode": true, - "rbt_NpressureMode": false, + "rbt_PpressureMode": false, + "rbt_NpressureMode": true, "tb_ContinueTestCount": 3, "1Nparams_number1": "1", "1Nparaname1": "产品1负压", @@ -212,10 +212,10 @@ "2Ndelaytime21": "1", "2Nrelievedelay1": "0", "2Nevolume1": "5", - "2Nfptoplimit1": "999", - "2Nfplowlimit1": "-999", - "2Nbalanpremax1": "999", - "2Nbalanpremin1": "-999", + "2Nfptoplimit1": "99.1", + "2Nfplowlimit1": "-99.2", + "2Nbalanpremax1": "99.3", + "2Nbalanpremin1": "-99.4", "2Nleaktoplimit1": "999", "2Nleaklowlimit1": "-999", "2Npunit1": 1, @@ -346,5 +346,6 @@ "1Npunit2": 1, "1Nlunit2": 1, "1Nbee2": false, - "1Nopmode2": false + "1Nopmode2": false, + "2Nopmode1": false } \ No newline at end of file diff --git a/SLC1-N/bin/Debug/productiondata.json b/SLC1-N/bin/Debug/productiondata.json index 887cd4d..8891ae6 100644 --- a/SLC1-N/bin/Debug/productiondata.json +++ b/SLC1-N/bin/Debug/productiondata.json @@ -1,10 +1,10 @@ { "ProductionData": { - "Total": 197, - "OK": 189, + "Total": 201, + "OK": 193, "NG": 8, - "LastUpdate": "2025-11-13T21:21:03.5024133+08:00", - "OKRate": 95.94, - "NGRate": 4.06 + "LastUpdate": "2025-11-15T10:39:41.659068+08:00", + "OKRate": 96.02, + "NGRate": 3.98 } } \ No newline at end of file diff --git a/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index a6ffa41..fd6c618 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 8e2da4e..c687270 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/bin/Debug/LL28-V25111302-c.exe b/SLC1-N/obj/Debug/LL28-C_V25111501.exe similarity index 97% rename from SLC1-N/bin/Debug/LL28-V25111302-c.exe rename to SLC1-N/obj/Debug/LL28-C_V25111501.exe index 98f4bcc..d44973c 100644 Binary files a/SLC1-N/bin/Debug/LL28-V25111302-c.exe and b/SLC1-N/obj/Debug/LL28-C_V25111501.exe differ diff --git a/SLC1-N/obj/Debug/LL28-C_V25111501.pdb b/SLC1-N/obj/Debug/LL28-C_V25111501.pdb new file mode 100644 index 0000000..2611068 Binary files /dev/null and b/SLC1-N/obj/Debug/LL28-C_V25111501.pdb differ diff --git a/SLC1-N/obj/Debug/LL28-V25111302-c.pdb b/SLC1-N/obj/Debug/LL28-V25111302-c.pdb deleted file mode 100644 index 651d406..0000000 Binary files a/SLC1-N/obj/Debug/LL28-V25111302-c.pdb and /dev/null differ diff --git a/SLC1-N/obj/Debug/SLC1-N.csproj.AssemblyReference.cache b/SLC1-N/obj/Debug/SLC1-N.csproj.AssemblyReference.cache index d6e5f45..7fac064 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.CoreCompileInputs.cache b/SLC1-N/obj/Debug/SLC1-N.csproj.CoreCompileInputs.cache index ca979de..86e5754 100644 --- a/SLC1-N/obj/Debug/SLC1-N.csproj.CoreCompileInputs.cache +++ b/SLC1-N/obj/Debug/SLC1-N.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e243c2a7e876228fdb35cebda95fefde21416cc1fcc67108400c68731d1b4700 +aacf5b050de7acd90af410ba8d75385da81a3d8bb5ff20764b8cd3a5b7363f84 diff --git a/SLC1-N/obj/Debug/SLC1-N.csproj.FileListAbsolute.txt b/SLC1-N/obj/Debug/SLC1-N.csproj.FileListAbsolute.txt index f3c7724..4f49564 100644 --- a/SLC1-N/obj/Debug/SLC1-N.csproj.FileListAbsolute.txt +++ b/SLC1-N/obj/Debug/SLC1-N.csproj.FileListAbsolute.txt @@ -670,3 +670,47 @@ D:\桌面\莫禧亮\华贝\差压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.cspro D:\桌面\莫禧亮\华贝\差压28\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.Up2Date D:\桌面\莫禧亮\华贝\差压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-V25111302-c.exe D:\桌面\莫禧亮\华贝\差压28\huabei4tongdao\SLC1-N\obj\Debug\LL28-V25111302-c.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\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.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 diff --git a/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache b/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache index 27e24f5..177d150 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/SLC1-N/obj/Debug/SLC1-N.csproj.ResolveComReference.cache b/SLC1-N/obj/Debug/SLC1-N.csproj.ResolveComReference.cache index 6816598..eb29a0a 100644 Binary files a/SLC1-N/obj/Debug/SLC1-N.csproj.ResolveComReference.cache and b/SLC1-N/obj/Debug/SLC1-N.csproj.ResolveComReference.cache differ diff --git a/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.dll b/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.dll index 2033eec..701fe09 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 982d094..de1ff34 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/NetWorkHelper.csproj.CoreCompileInputs.cache b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.CoreCompileInputs.cache index 8b89bdd..7991074 100644 --- a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.CoreCompileInputs.cache +++ b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -fd1470a5ec7772d60dcf67497416fa5a98dbb5cca52c0adfcc1db2697f2a8034 +30962076f24dea4ee6bdc0447f4558105c5ed9da1c6b00a0d14f2c603541d976 diff --git a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.FileListAbsolute.txt b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.FileListAbsolute.txt index c05982e..9b1e808 100644 --- a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.FileListAbsolute.txt +++ b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.FileListAbsolute.txt @@ -157,3 +157,13 @@ 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.csproj.AssemblyReference.cache +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 2033eec..701fe09 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 982d094..de1ff34 100644 Binary files a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb and b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb differ