diff --git a/.vs/LL28在线/FileContentIndex/31a788c5-51ea-4bb1-9528-47952c33ea01.vsidx b/.vs/LL28在线/FileContentIndex/1680e4fd-5fcb-40a2-a007-0eb91cac484b.vsidx similarity index 99% rename from .vs/LL28在线/FileContentIndex/31a788c5-51ea-4bb1-9528-47952c33ea01.vsidx rename to .vs/LL28在线/FileContentIndex/1680e4fd-5fcb-40a2-a007-0eb91cac484b.vsidx index 7b7bb7a..de37f20 100644 Binary files a/.vs/LL28在线/FileContentIndex/31a788c5-51ea-4bb1-9528-47952c33ea01.vsidx and b/.vs/LL28在线/FileContentIndex/1680e4fd-5fcb-40a2-a007-0eb91cac484b.vsidx differ diff --git a/.vs/LL28在线/v17/.suo b/.vs/LL28在线/v17/.suo index b8be030..5e22009 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 406a45d..99c62fa 100644 --- a/.vs/LL28在线/v17/DocumentLayout.json +++ b/.vs/LL28在线/v17/DocumentLayout.json @@ -2,24 +2,24 @@ "Version": 1, "WorkspaceRootPath": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\", "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|d:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B ll-28\\ll-28\\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\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\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\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B ll-28\\ll-28\\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\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\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\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\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\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\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:{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\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\slc1-n\\form_batchsave.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -212,9 +212,6 @@ { "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\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\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B ll-28\\ll-28\\slc1-n\\||{B270807C-D8C6-49EB-8EBE-8E8D566637A1}|5e9a8ac2-4f34-4521-858f-4c248ba31532" } ], "DocumentGroupContainers": [ @@ -224,17 +221,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\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Form1.cs", "RelativeDocumentMoniker": "SLC1-N\\Form1.cs", "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Form1.cs", "RelativeToolTip": "SLC1-N\\Form1.cs", - "ViewState": "AQIAAAkQAAAAAAAAAAAzwEYQAAAPAAAA", + "ViewState": "AQIAAJcBAAAAAAAAAAAAAJ0BAAA8AAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-10-18T01:41:29.412Z", "IsPinned": true, @@ -242,42 +239,17 @@ }, { "$type": "Document", - "DocumentIndex": 7, - "Title": "Form_LogOn.cs", - "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Form_LogOn.cs", - "RelativeDocumentMoniker": "SLC1-N\\Form_LogOn.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Form_LogOn.cs", - "RelativeToolTip": "SLC1-N\\Form_LogOn.cs", - "ViewState": "AQIAAGEAAAAAAAAAAAA0wIUAAABEAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-11-17T06:04:04.368Z", - "IsPinned": true - }, - { - "$type": "Document", - "DocumentIndex": 5, - "Title": "Form_BatchSave.cs", - "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Form_BatchSave.cs", - "RelativeDocumentMoniker": "SLC1-N\\Form_BatchSave.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Form_BatchSave.cs", - "RelativeToolTip": "SLC1-N\\Form_BatchSave.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAABsAAAAwAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-11-17T02:16:54.363Z", - "IsPinned": true - }, - { - "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 2, "Title": "Electricity.cs", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Electricity.cs", "RelativeDocumentMoniker": "SLC1-N\\Electricity.cs", "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Electricity.cs", "RelativeToolTip": "SLC1-N\\Electricity.cs", - "ViewState": "AQIAALoCAAAAAAAAAAAUwNMCAAAeAAAA", + "ViewState": "AQIAAGYAAAAAAAAAAAA1wIMAAAAJAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-10-30T02:55:49.085Z", - "IsPinned": true + "IsPinned": true, + "EditorCaption": "" }, { "$type": "Bookmark", @@ -311,6 +283,30 @@ "$type": "Bookmark", "Name": "ST:0:0:{5a4e9529-b6a0-46b5-be4f-0f0b239bc0eb}" }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "Form_LogOn.cs", + "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Form_LogOn.cs", + "RelativeDocumentMoniker": "SLC1-N\\Form_LogOn.cs", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Form_LogOn.cs", + "RelativeToolTip": "SLC1-N\\Form_LogOn.cs", + "ViewState": "AQIAAGEAAAAAAAAAAAA0wIUAAABEAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-11-17T06:04:04.368Z" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "Form_BatchSave.cs", + "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Form_BatchSave.cs", + "RelativeDocumentMoniker": "SLC1-N\\Form_BatchSave.cs", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Form_BatchSave.cs", + "RelativeToolTip": "SLC1-N\\Form_BatchSave.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAABsAAAAwAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-11-17T02:16:54.363Z" + }, { "$type": "Document", "DocumentIndex": 3, @@ -320,7 +316,8 @@ "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\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" + "WhenOpened": "2025-08-18T01:03:21.678Z", + "EditorCaption": " [\u8BBE\u8BA1]" }, { "$type": "Document", @@ -335,7 +332,7 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 0, "Title": "Form1.cs [\u8BBE\u8BA1]", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\Form1.cs", "RelativeDocumentMoniker": "SLC1-N\\Form1.cs", @@ -347,15 +344,14 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 4, "Title": "SLC1-N", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\SLC1-N.csproj", "RelativeDocumentMoniker": "SLC1-N\\SLC1-N.csproj", "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u6B63\u8D1F\u538B28\\\u6B63\u8D1F\u538B LL-28\\LL-28\\SLC1-N\\SLC1-N.csproj", "RelativeToolTip": "SLC1-N\\SLC1-N.csproj", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|", - "WhenOpened": "2025-11-11T02:49:54.535Z", - "EditorCaption": "" + "WhenOpened": "2025-11-11T02:49:54.535Z" }, { "$type": "Document", @@ -401,7 +397,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.Designer.cs b/SLC1-N/Electricity.Designer.cs index 82ded33..885addd 100644 --- a/SLC1-N/Electricity.Designer.cs +++ b/SLC1-N/Electricity.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Electricity)); this.tabPage3 = new System.Windows.Forms.TabPage(); this.lb_PLCsaomamsg = new System.Windows.Forms.Label(); @@ -65,6 +66,7 @@ this.SaveConfig = new Sunny.UI.UISymbolButton(); this.label33 = new System.Windows.Forms.Label(); this.uiGroupBox13 = new Sunny.UI.UIGroupBox(); + this.bt_BatchParamSave = new Sunny.UI.UISymbolButton(); this.chk_ChkBee = new System.Windows.Forms.CheckBox(); this.rbt_NpressureMode = new System.Windows.Forms.RadioButton(); this.tb_ParaName = new Sunny.UI.UITextBox(); @@ -129,7 +131,12 @@ this.label89 = new System.Windows.Forms.Label(); this.SendText = new System.Windows.Forms.TextBox(); this.uiTabControlMenu1 = new Sunny.UI.UITabControlMenu(); - this.bt_BatchParamSave = new Sunny.UI.UISymbolButton(); + this.chk_CH4Grating = new System.Windows.Forms.CheckBox(); + this.chk_CH3Grating = new System.Windows.Forms.CheckBox(); + this.chk_CH2Grating = new System.Windows.Forms.CheckBox(); + this.chk_CH1Grating = new System.Windows.Forms.CheckBox(); + this.chk_SafetyDoor = new System.Windows.Forms.CheckBox(); + this.timer_Block = new System.Windows.Forms.Timer(this.components); this.tabPage3.SuspendLayout(); this.uiGroupBox2.SuspendLayout(); this.uiGroupBox1.SuspendLayout(); @@ -142,6 +149,11 @@ // tabPage3 // this.tabPage3.BackColor = System.Drawing.Color.LightBlue; + this.tabPage3.Controls.Add(this.chk_SafetyDoor); + this.tabPage3.Controls.Add(this.chk_CH4Grating); + this.tabPage3.Controls.Add(this.chk_CH3Grating); + this.tabPage3.Controls.Add(this.chk_CH2Grating); + this.tabPage3.Controls.Add(this.chk_CH1Grating); this.tabPage3.Controls.Add(this.lb_PLCsaomamsg); this.tabPage3.Controls.Add(this.label17); this.tabPage3.Controls.Add(this.tb_ContinueTestCount); @@ -164,7 +176,7 @@ // this.lb_PLCsaomamsg.AutoSize = true; this.lb_PLCsaomamsg.Font = new System.Drawing.Font("宋体", 15F); - this.lb_PLCsaomamsg.Location = new System.Drawing.Point(758, 569); + this.lb_PLCsaomamsg.Location = new System.Drawing.Point(509, 474); this.lb_PLCsaomamsg.Name = "lb_PLCsaomamsg"; this.lb_PLCsaomamsg.Size = new System.Drawing.Size(29, 20); this.lb_PLCsaomamsg.TabIndex = 483; @@ -174,7 +186,7 @@ // this.label17.AutoSize = true; this.label17.Font = new System.Drawing.Font("宋体", 15F); - this.label17.Location = new System.Drawing.Point(789, 530); + this.label17.Location = new System.Drawing.Point(862, 551); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(59, 20); this.label17.TabIndex = 482; @@ -186,7 +198,7 @@ this.tb_ContinueTestCount.Cursor = System.Windows.Forms.Cursors.IBeam; this.tb_ContinueTestCount.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.tb_ContinueTestCount.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.tb_ContinueTestCount.Location = new System.Drawing.Point(851, 526); + this.tb_ContinueTestCount.Location = new System.Drawing.Point(924, 547); this.tb_ContinueTestCount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tb_ContinueTestCount.Maximum = 2147483647D; this.tb_ContinueTestCount.Minimum = -2147483648D; @@ -203,7 +215,7 @@ this.chk_ContinueTest.AutoSize = true; this.chk_ContinueTest.BackColor = System.Drawing.Color.LightBlue; this.chk_ContinueTest.Font = new System.Drawing.Font("宋体", 15F); - this.chk_ContinueTest.Location = new System.Drawing.Point(791, 494); + this.chk_ContinueTest.Location = new System.Drawing.Point(864, 515); this.chk_ContinueTest.Name = "chk_ContinueTest"; this.chk_ContinueTest.Size = new System.Drawing.Size(108, 24); this.chk_ContinueTest.TabIndex = 481; @@ -216,7 +228,7 @@ this.chk_ch4saoma.AutoSize = true; this.chk_ch4saoma.BackColor = System.Drawing.Color.LightBlue; this.chk_ch4saoma.Font = new System.Drawing.Font("宋体", 15F); - this.chk_ch4saoma.Location = new System.Drawing.Point(887, 638); + this.chk_ch4saoma.Location = new System.Drawing.Point(514, 609); this.chk_ch4saoma.Name = "chk_ch4saoma"; this.chk_ch4saoma.Size = new System.Drawing.Size(118, 24); this.chk_ch4saoma.TabIndex = 480; @@ -229,7 +241,7 @@ this.chk_ch3saoma.AutoSize = true; this.chk_ch3saoma.BackColor = System.Drawing.Color.LightBlue; this.chk_ch3saoma.Font = new System.Drawing.Font("宋体", 15F); - this.chk_ch3saoma.Location = new System.Drawing.Point(763, 638); + this.chk_ch3saoma.Location = new System.Drawing.Point(514, 575); this.chk_ch3saoma.Name = "chk_ch3saoma"; this.chk_ch3saoma.Size = new System.Drawing.Size(118, 24); this.chk_ch3saoma.TabIndex = 479; @@ -242,7 +254,7 @@ this.chk_ch2saoma.AutoSize = true; this.chk_ch2saoma.BackColor = System.Drawing.Color.LightBlue; this.chk_ch2saoma.Font = new System.Drawing.Font("宋体", 15F); - this.chk_ch2saoma.Location = new System.Drawing.Point(887, 601); + this.chk_ch2saoma.Location = new System.Drawing.Point(514, 540); this.chk_ch2saoma.Name = "chk_ch2saoma"; this.chk_ch2saoma.Size = new System.Drawing.Size(118, 24); this.chk_ch2saoma.TabIndex = 478; @@ -255,7 +267,7 @@ this.chk_ch1saoma.AutoSize = true; this.chk_ch1saoma.BackColor = System.Drawing.Color.LightBlue; this.chk_ch1saoma.Font = new System.Drawing.Font("宋体", 15F); - this.chk_ch1saoma.Location = new System.Drawing.Point(763, 601); + this.chk_ch1saoma.Location = new System.Drawing.Point(514, 506); this.chk_ch1saoma.Name = "chk_ch1saoma"; this.chk_ch1saoma.Size = new System.Drawing.Size(118, 24); this.chk_ch1saoma.TabIndex = 477; @@ -677,6 +689,21 @@ this.uiGroupBox13.Text = "仪器参数设置"; this.uiGroupBox13.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // + // bt_BatchParamSave + // + this.bt_BatchParamSave.Cursor = System.Windows.Forms.Cursors.Hand; + this.bt_BatchParamSave.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.bt_BatchParamSave.Location = new System.Drawing.Point(603, 385); + this.bt_BatchParamSave.MinimumSize = new System.Drawing.Size(1, 1); + this.bt_BatchParamSave.Name = "bt_BatchParamSave"; + this.bt_BatchParamSave.Size = new System.Drawing.Size(149, 35); + this.bt_BatchParamSave.Style = Sunny.UI.UIStyle.Custom; + this.bt_BatchParamSave.Symbol = 61678; + this.bt_BatchParamSave.TabIndex = 475; + this.bt_BatchParamSave.Text = "批量保存参数"; + this.bt_BatchParamSave.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.bt_BatchParamSave.Click += new System.EventHandler(this.bt_BatchParamSave_Click); + // // chk_ChkBee // this.chk_ChkBee.AutoSize = true; @@ -1575,20 +1602,74 @@ this.uiTabControlMenu1.TabSelectedForeColor = System.Drawing.Color.Black; this.uiTabControlMenu1.TabUnSelectedForeColor = System.Drawing.Color.Black; // - // bt_BatchParamSave + // chk_CH4Grating // - this.bt_BatchParamSave.Cursor = System.Windows.Forms.Cursors.Hand; - this.bt_BatchParamSave.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.bt_BatchParamSave.Location = new System.Drawing.Point(603, 385); - this.bt_BatchParamSave.MinimumSize = new System.Drawing.Size(1, 1); - this.bt_BatchParamSave.Name = "bt_BatchParamSave"; - this.bt_BatchParamSave.Size = new System.Drawing.Size(149, 35); - this.bt_BatchParamSave.Style = Sunny.UI.UIStyle.Custom; - this.bt_BatchParamSave.Symbol = 61678; - this.bt_BatchParamSave.TabIndex = 475; - this.bt_BatchParamSave.Text = "批量保存参数"; - this.bt_BatchParamSave.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.bt_BatchParamSave.Click += new System.EventHandler(this.bt_BatchParamSave_Click); + this.chk_CH4Grating.AutoSize = true; + this.chk_CH4Grating.BackColor = System.Drawing.Color.LightBlue; + this.chk_CH4Grating.Font = new System.Drawing.Font("宋体", 15F); + this.chk_CH4Grating.Location = new System.Drawing.Point(666, 606); + this.chk_CH4Grating.Name = "chk_CH4Grating"; + this.chk_CH4Grating.Size = new System.Drawing.Size(158, 24); + this.chk_CH4Grating.TabIndex = 487; + this.chk_CH4Grating.Text = "通道4光栅屏蔽"; + this.chk_CH4Grating.UseVisualStyleBackColor = false; + this.chk_CH4Grating.CheckedChanged += new System.EventHandler(this.chk_CH4Grating_CheckedChanged); + // + // chk_CH3Grating + // + this.chk_CH3Grating.AutoSize = true; + this.chk_CH3Grating.BackColor = System.Drawing.Color.LightBlue; + this.chk_CH3Grating.Font = new System.Drawing.Font("宋体", 15F); + this.chk_CH3Grating.Location = new System.Drawing.Point(666, 572); + this.chk_CH3Grating.Name = "chk_CH3Grating"; + this.chk_CH3Grating.Size = new System.Drawing.Size(158, 24); + this.chk_CH3Grating.TabIndex = 486; + this.chk_CH3Grating.Text = "通道3光栅屏蔽"; + this.chk_CH3Grating.UseVisualStyleBackColor = false; + this.chk_CH3Grating.CheckedChanged += new System.EventHandler(this.chk_CH3Grating_CheckedChanged); + // + // chk_CH2Grating + // + this.chk_CH2Grating.AutoSize = true; + this.chk_CH2Grating.BackColor = System.Drawing.Color.LightBlue; + this.chk_CH2Grating.Font = new System.Drawing.Font("宋体", 15F); + this.chk_CH2Grating.Location = new System.Drawing.Point(666, 537); + this.chk_CH2Grating.Name = "chk_CH2Grating"; + this.chk_CH2Grating.Size = new System.Drawing.Size(158, 24); + this.chk_CH2Grating.TabIndex = 485; + this.chk_CH2Grating.Text = "通道2光栅屏蔽"; + this.chk_CH2Grating.UseVisualStyleBackColor = false; + this.chk_CH2Grating.CheckedChanged += new System.EventHandler(this.chk_CH2Grating_CheckedChanged); + // + // chk_CH1Grating + // + this.chk_CH1Grating.AutoSize = true; + this.chk_CH1Grating.BackColor = System.Drawing.Color.LightBlue; + this.chk_CH1Grating.Font = new System.Drawing.Font("宋体", 15F); + this.chk_CH1Grating.Location = new System.Drawing.Point(666, 503); + this.chk_CH1Grating.Name = "chk_CH1Grating"; + this.chk_CH1Grating.Size = new System.Drawing.Size(158, 24); + this.chk_CH1Grating.TabIndex = 484; + this.chk_CH1Grating.Text = "通道1光栅屏蔽"; + this.chk_CH1Grating.UseVisualStyleBackColor = false; + this.chk_CH1Grating.CheckedChanged += new System.EventHandler(this.chk_CH1Grating_CheckedChanged); + // + // chk_SafetyDoor + // + this.chk_SafetyDoor.AutoSize = true; + this.chk_SafetyDoor.BackColor = System.Drawing.Color.LightBlue; + this.chk_SafetyDoor.Font = new System.Drawing.Font("宋体", 15F); + this.chk_SafetyDoor.Location = new System.Drawing.Point(666, 639); + this.chk_SafetyDoor.Name = "chk_SafetyDoor"; + this.chk_SafetyDoor.Size = new System.Drawing.Size(128, 24); + this.chk_SafetyDoor.TabIndex = 488; + this.chk_SafetyDoor.Text = "安全门屏蔽"; + this.chk_SafetyDoor.UseVisualStyleBackColor = false; + this.chk_SafetyDoor.CheckedChanged += new System.EventHandler(this.chk_SafetyDoor_CheckedChanged); + // + // timer_Block + // + this.timer_Block.Tick += new System.EventHandler(this.timer_Block_Tick); // // Electricity // @@ -1720,5 +1801,11 @@ private Sunny.UI.UITextBox tb_ContinueTestCount; private System.Windows.Forms.Label lb_PLCsaomamsg; private Sunny.UI.UISymbolButton bt_BatchParamSave; + private System.Windows.Forms.CheckBox chk_SafetyDoor; + private System.Windows.Forms.CheckBox chk_CH4Grating; + private System.Windows.Forms.CheckBox chk_CH3Grating; + private System.Windows.Forms.CheckBox chk_CH2Grating; + private System.Windows.Forms.CheckBox chk_CH1Grating; + private System.Windows.Forms.Timer timer_Block; } } \ No newline at end of file diff --git a/SLC1-N/Electricity.cs b/SLC1-N/Electricity.cs index dee810b..abf54cc 100644 --- a/SLC1-N/Electricity.cs +++ b/SLC1-N/Electricity.cs @@ -128,6 +128,10 @@ namespace SLC1_N chk_ContinueTest.Checked = config.GetValue("chk_ContinueTest", true); tb_ContinueTestCount.Enabled = chk_ContinueTest.Checked; tb_ContinueTestCount.Text = config.GetValue("tb_ContinueTestCount", 1).ToString(); + + // 刷新屏蔽状态 + timer_Block.Interval = 1000; + timer_Block.Start(); } //上传参数 @@ -748,5 +752,39 @@ namespace SLC1_N } } + + private void chk_CH1Grating_CheckedChanged(object sender, EventArgs e) + { + Signal_PLC_WriteCoil?.Invoke(1040, chk_CH1Grating.Checked); + } + + private void chk_CH2Grating_CheckedChanged(object sender, EventArgs e) + { + Signal_PLC_WriteCoil?.Invoke(1041, chk_CH2Grating.Checked); + } + + private void chk_CH3Grating_CheckedChanged(object sender, EventArgs e) + { + Signal_PLC_WriteCoil?.Invoke(1042, chk_CH3Grating.Checked); + } + + private void chk_CH4Grating_CheckedChanged(object sender, EventArgs e) + { + Signal_PLC_WriteCoil?.Invoke(1043, chk_CH4Grating.Checked); + } + + private void chk_SafetyDoor_CheckedChanged(object sender, EventArgs e) + { + Signal_PLC_WriteCoil?.Invoke(1044, chk_SafetyDoor.Checked); + } + + private void timer_Block_Tick(object sender, EventArgs e) + { + chk_CH1Grating.Checked = Form1.f1.coilBlock[0]; + chk_CH2Grating.Checked = Form1.f1.coilBlock[1]; + chk_CH3Grating.Checked = Form1.f1.coilBlock[2]; + chk_CH4Grating.Checked = Form1.f1.coilBlock[3]; + chk_SafetyDoor.Checked = Form1.f1.coilBlock[4]; + } } } diff --git a/SLC1-N/Electricity.resx b/SLC1-N/Electricity.resx index 46d1fa7..112a3ba 100644 --- a/SLC1-N/Electricity.resx +++ b/SLC1-N/Electricity.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + 138 diff --git a/SLC1-N/Form1.Designer.cs b/SLC1-N/Form1.Designer.cs index c19d23f..8c263cf 100644 --- a/SLC1-N/Form1.Designer.cs +++ b/SLC1-N/Form1.Designer.cs @@ -545,12 +545,12 @@ 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))); - this.uiGroupBox5.Location = new System.Drawing.Point(690, 103); + this.uiGroupBox5.Location = new System.Drawing.Point(683, 103); this.uiGroupBox5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiGroupBox5.MinimumSize = new System.Drawing.Size(1, 1); this.uiGroupBox5.Name = "uiGroupBox5"; this.uiGroupBox5.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0); - this.uiGroupBox5.Size = new System.Drawing.Size(703, 262); + this.uiGroupBox5.Size = new System.Drawing.Size(686, 262); this.uiGroupBox5.Style = Sunny.UI.UIStyle.Custom; this.uiGroupBox5.TabIndex = 443; this.uiGroupBox5.Text = "CH2工位"; @@ -572,7 +572,7 @@ 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(608, 131); + this.lb_CH2TestPressureDown.Location = new System.Drawing.Point(604, 131); this.lb_CH2TestPressureDown.Name = "lb_CH2TestPressureDown"; this.lb_CH2TestPressureDown.Size = new System.Drawing.Size(29, 20); this.lb_CH2TestPressureDown.TabIndex = 474; @@ -595,7 +595,7 @@ 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(452, 131); + this.label60.Location = new System.Drawing.Point(448, 131); 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); @@ -628,7 +628,7 @@ 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(608, 100); + this.lb_CH2TestPressureUp.Location = new System.Drawing.Point(604, 100); this.lb_CH2TestPressureUp.Name = "lb_CH2TestPressureUp"; this.lb_CH2TestPressureUp.Size = new System.Drawing.Size(29, 20); this.lb_CH2TestPressureUp.TabIndex = 472; @@ -649,7 +649,7 @@ 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(452, 100); + this.label63.Location = new System.Drawing.Point(448, 100); 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); @@ -672,7 +672,7 @@ 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(640, 64); + this.lb_CH2ProcessTime4.Location = new System.Drawing.Point(636, 64); this.lb_CH2ProcessTime4.Name = "lb_CH2ProcessTime4"; this.lb_CH2ProcessTime4.Size = new System.Drawing.Size(29, 20); this.lb_CH2ProcessTime4.TabIndex = 470; @@ -695,7 +695,7 @@ 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(581, 64); + this.label67.Location = new System.Drawing.Point(577, 64); 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); @@ -716,7 +716,7 @@ 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(511, 64); + this.lb_CH2ProcessTime3.Location = new System.Drawing.Point(507, 64); this.lb_CH2ProcessTime3.Name = "lb_CH2ProcessTime3"; this.lb_CH2ProcessTime3.Size = new System.Drawing.Size(29, 20); this.lb_CH2ProcessTime3.TabIndex = 468; @@ -727,7 +727,7 @@ 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(452, 64); + this.label72.Location = new System.Drawing.Point(448, 64); 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); @@ -751,7 +751,7 @@ 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(640, 33); + this.lb_CH2ProcessTime2.Location = new System.Drawing.Point(636, 33); this.lb_CH2ProcessTime2.Name = "lb_CH2ProcessTime2"; this.lb_CH2ProcessTime2.Size = new System.Drawing.Size(29, 20); this.lb_CH2ProcessTime2.TabIndex = 466; @@ -773,7 +773,7 @@ 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(581, 33); + this.label74.Location = new System.Drawing.Point(577, 33); 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); @@ -797,7 +797,7 @@ 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(511, 33); + this.lb_CH2ProcessTime1.Location = new System.Drawing.Point(507, 33); this.lb_CH2ProcessTime1.Name = "lb_CH2ProcessTime1"; this.lb_CH2ProcessTime1.Size = new System.Drawing.Size(29, 20); this.lb_CH2ProcessTime1.TabIndex = 464; @@ -808,7 +808,7 @@ 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(452, 33); + this.label77.Location = new System.Drawing.Point(448, 33); 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); @@ -1049,7 +1049,7 @@ // chk_SaomaFocus // this.chk_SaomaFocus.AutoSize = true; - this.chk_SaomaFocus.Location = new System.Drawing.Point(642, 16); + this.chk_SaomaFocus.Location = new System.Drawing.Point(611, 17); this.chk_SaomaFocus.Name = "chk_SaomaFocus"; this.chk_SaomaFocus.Size = new System.Drawing.Size(90, 20); this.chk_SaomaFocus.TabIndex = 474; @@ -1206,12 +1206,12 @@ this.uiGroupBox1.Controls.Add(this.lb_CH1_SmallLeak); 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); + this.uiGroupBox1.Location = new System.Drawing.Point(1, 103); this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiGroupBox1.MinimumSize = new System.Drawing.Size(1, 1); this.uiGroupBox1.Name = "uiGroupBox1"; this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0); - this.uiGroupBox1.Size = new System.Drawing.Size(685, 262); + this.uiGroupBox1.Size = new System.Drawing.Size(680, 262); this.uiGroupBox1.TabIndex = 436; this.uiGroupBox1.Text = "CH1工位"; this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; @@ -1244,7 +1244,7 @@ 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(594, 126); + this.lb_CH1TestPressureDown.Location = new System.Drawing.Point(590, 126); this.lb_CH1TestPressureDown.Name = "lb_CH1TestPressureDown"; this.lb_CH1TestPressureDown.Size = new System.Drawing.Size(29, 20); this.lb_CH1TestPressureDown.TabIndex = 462; @@ -1255,7 +1255,7 @@ 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(438, 126); + this.label43.Location = new System.Drawing.Point(434, 126); 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); @@ -1267,7 +1267,7 @@ 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(594, 95); + this.lb_CH1TestPressureUp.Location = new System.Drawing.Point(590, 95); this.lb_CH1TestPressureUp.Name = "lb_CH1TestPressureUp"; this.lb_CH1TestPressureUp.Size = new System.Drawing.Size(29, 20); this.lb_CH1TestPressureUp.TabIndex = 460; @@ -1278,7 +1278,7 @@ 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(438, 95); + this.label6.Location = new System.Drawing.Point(434, 95); 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); @@ -1290,7 +1290,7 @@ 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(626, 59); + this.lb_CH1ProcessTime4.Location = new System.Drawing.Point(622, 59); this.lb_CH1ProcessTime4.Name = "lb_CH1ProcessTime4"; this.lb_CH1ProcessTime4.Size = new System.Drawing.Size(29, 20); this.lb_CH1ProcessTime4.TabIndex = 458; @@ -1301,7 +1301,7 @@ 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(567, 59); + this.label42.Location = new System.Drawing.Point(563, 59); 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); @@ -1313,7 +1313,7 @@ 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(497, 59); + this.lb_CH1ProcessTime3.Location = new System.Drawing.Point(493, 59); this.lb_CH1ProcessTime3.Name = "lb_CH1ProcessTime3"; this.lb_CH1ProcessTime3.Size = new System.Drawing.Size(29, 20); this.lb_CH1ProcessTime3.TabIndex = 456; @@ -1324,7 +1324,7 @@ 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(438, 59); + this.label46.Location = new System.Drawing.Point(434, 59); 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); @@ -1336,7 +1336,7 @@ 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(626, 28); + this.lb_CH1ProcessTime2.Location = new System.Drawing.Point(622, 28); this.lb_CH1ProcessTime2.Name = "lb_CH1ProcessTime2"; this.lb_CH1ProcessTime2.Size = new System.Drawing.Size(29, 20); this.lb_CH1ProcessTime2.TabIndex = 454; @@ -1347,7 +1347,7 @@ 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(567, 28); + this.label37.Location = new System.Drawing.Point(563, 28); 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); @@ -1359,7 +1359,7 @@ 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(497, 28); + this.lb_CH1ProcessTime1.Location = new System.Drawing.Point(493, 28); this.lb_CH1ProcessTime1.Name = "lb_CH1ProcessTime1"; this.lb_CH1ProcessTime1.Size = new System.Drawing.Size(29, 20); this.lb_CH1ProcessTime1.TabIndex = 452; @@ -1370,7 +1370,7 @@ 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(438, 28); + this.label15.Location = new System.Drawing.Point(434, 28); 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); @@ -1677,7 +1677,7 @@ this.tb_CH1MainMessage.Cursor = System.Windows.Forms.Cursors.IBeam; this.tb_CH1MainMessage.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.tb_CH1MainMessage.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.tb_CH1MainMessage.Location = new System.Drawing.Point(3, 54); + this.tb_CH1MainMessage.Location = new System.Drawing.Point(2, 54); this.tb_CH1MainMessage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tb_CH1MainMessage.Maximum = 2147483647D; this.tb_CH1MainMessage.Minimum = -2147483648D; @@ -1685,7 +1685,7 @@ this.tb_CH1MainMessage.Multiline = true; this.tb_CH1MainMessage.Name = "tb_CH1MainMessage"; this.tb_CH1MainMessage.ReadOnly = true; - this.tb_CH1MainMessage.Size = new System.Drawing.Size(684, 51); + this.tb_CH1MainMessage.Size = new System.Drawing.Size(679, 51); this.tb_CH1MainMessage.Style = Sunny.UI.UIStyle.Custom; this.tb_CH1MainMessage.TabIndex = 429; this.tb_CH1MainMessage.TabStop = false; @@ -1702,7 +1702,7 @@ this.tb_CH2MainMessage.Cursor = System.Windows.Forms.Cursors.IBeam; this.tb_CH2MainMessage.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.tb_CH2MainMessage.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.tb_CH2MainMessage.Location = new System.Drawing.Point(690, 54); + this.tb_CH2MainMessage.Location = new System.Drawing.Point(683, 54); this.tb_CH2MainMessage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tb_CH2MainMessage.Maximum = 2147483647D; this.tb_CH2MainMessage.Minimum = -2147483648D; @@ -1710,7 +1710,7 @@ this.tb_CH2MainMessage.Multiline = true; this.tb_CH2MainMessage.Name = "tb_CH2MainMessage"; this.tb_CH2MainMessage.ReadOnly = true; - this.tb_CH2MainMessage.Size = new System.Drawing.Size(703, 51); + this.tb_CH2MainMessage.Size = new System.Drawing.Size(686, 51); this.tb_CH2MainMessage.Style = Sunny.UI.UIStyle.Custom; this.tb_CH2MainMessage.TabIndex = 430; this.tb_CH2MainMessage.TabStop = false; @@ -1783,12 +1783,12 @@ 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))); - this.uiGroupBox2.Location = new System.Drawing.Point(3, 365); + this.uiGroupBox2.Location = new System.Drawing.Point(2, 365); this.uiGroupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiGroupBox2.MinimumSize = new System.Drawing.Size(1, 1); this.uiGroupBox2.Name = "uiGroupBox2"; this.uiGroupBox2.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0); - this.uiGroupBox2.Size = new System.Drawing.Size(685, 262); + this.uiGroupBox2.Size = new System.Drawing.Size(679, 262); this.uiGroupBox2.Style = Sunny.UI.UIStyle.Custom; this.uiGroupBox2.TabIndex = 452; this.uiGroupBox2.Text = "CH3工位"; @@ -1822,7 +1822,7 @@ 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(593, 130); + this.lb_CH3TestPressureDown.Location = new System.Drawing.Point(589, 130); this.lb_CH3TestPressureDown.Name = "lb_CH3TestPressureDown"; this.lb_CH3TestPressureDown.Size = new System.Drawing.Size(29, 20); this.lb_CH3TestPressureDown.TabIndex = 474; @@ -1833,7 +1833,7 @@ 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(437, 130); + this.label3.Location = new System.Drawing.Point(433, 130); 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); @@ -1866,7 +1866,7 @@ 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(593, 99); + this.lb_CH3TestPressureUp.Location = new System.Drawing.Point(589, 99); this.lb_CH3TestPressureUp.Name = "lb_CH3TestPressureUp"; this.lb_CH3TestPressureUp.Size = new System.Drawing.Size(29, 20); this.lb_CH3TestPressureUp.TabIndex = 472; @@ -1887,7 +1887,7 @@ 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(437, 99); + this.label36.Location = new System.Drawing.Point(433, 99); 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); @@ -1911,7 +1911,7 @@ 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(625, 63); + this.lb_CH3ProcessTime4.Location = new System.Drawing.Point(621, 63); this.lb_CH3ProcessTime4.Name = "lb_CH3ProcessTime4"; this.lb_CH3ProcessTime4.Size = new System.Drawing.Size(29, 20); this.lb_CH3ProcessTime4.TabIndex = 470; @@ -1931,7 +1931,7 @@ 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(566, 63); + this.label44.Location = new System.Drawing.Point(562, 63); 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); @@ -1955,7 +1955,7 @@ 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(496, 63); + this.lb_CH3ProcessTime3.Location = new System.Drawing.Point(492, 63); this.lb_CH3ProcessTime3.Name = "lb_CH3ProcessTime3"; this.lb_CH3ProcessTime3.Size = new System.Drawing.Size(29, 20); this.lb_CH3ProcessTime3.TabIndex = 468; @@ -1975,7 +1975,7 @@ 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(437, 63); + this.label48.Location = new System.Drawing.Point(433, 63); 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); @@ -1998,7 +1998,7 @@ 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(625, 32); + this.lb_CH3ProcessTime2.Location = new System.Drawing.Point(621, 32); this.lb_CH3ProcessTime2.Name = "lb_CH3ProcessTime2"; this.lb_CH3ProcessTime2.Size = new System.Drawing.Size(29, 20); this.lb_CH3ProcessTime2.TabIndex = 466; @@ -2017,7 +2017,7 @@ 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(566, 32); + this.label53.Location = new System.Drawing.Point(562, 32); 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); @@ -2040,7 +2040,7 @@ 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(496, 32); + this.lb_CH3ProcessTime1.Location = new System.Drawing.Point(492, 32); this.lb_CH3ProcessTime1.Name = "lb_CH3ProcessTime1"; this.lb_CH3ProcessTime1.Size = new System.Drawing.Size(29, 20); this.lb_CH3ProcessTime1.TabIndex = 464; @@ -2059,7 +2059,7 @@ 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(437, 32); + this.label57.Location = new System.Drawing.Point(433, 32); 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); @@ -2319,12 +2319,12 @@ 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))); - this.uiGroupBox3.Location = new System.Drawing.Point(690, 365); + this.uiGroupBox3.Location = new System.Drawing.Point(683, 365); this.uiGroupBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiGroupBox3.MinimumSize = new System.Drawing.Size(1, 1); this.uiGroupBox3.Name = "uiGroupBox3"; this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0); - this.uiGroupBox3.Size = new System.Drawing.Size(703, 262); + this.uiGroupBox3.Size = new System.Drawing.Size(686, 262); this.uiGroupBox3.Style = Sunny.UI.UIStyle.Custom; this.uiGroupBox3.TabIndex = 464; this.uiGroupBox3.Text = "CH4工位"; @@ -2358,7 +2358,7 @@ 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(608, 130); + this.lb_CH4TestPressureDown.Location = new System.Drawing.Point(604, 130); this.lb_CH4TestPressureDown.Name = "lb_CH4TestPressureDown"; this.lb_CH4TestPressureDown.Size = new System.Drawing.Size(29, 20); this.lb_CH4TestPressureDown.TabIndex = 486; @@ -2369,7 +2369,7 @@ 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(452, 130); + this.label79.Location = new System.Drawing.Point(448, 130); 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); @@ -2402,7 +2402,7 @@ 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(608, 99); + this.lb_CH4TestPressureUp.Location = new System.Drawing.Point(604, 99); this.lb_CH4TestPressureUp.Name = "lb_CH4TestPressureUp"; this.lb_CH4TestPressureUp.Size = new System.Drawing.Size(29, 20); this.lb_CH4TestPressureUp.TabIndex = 484; @@ -2423,7 +2423,7 @@ 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(452, 99); + this.label81.Location = new System.Drawing.Point(448, 99); 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); @@ -2446,7 +2446,7 @@ 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(640, 63); + this.lb_CH4ProcessTime4.Location = new System.Drawing.Point(636, 63); this.lb_CH4ProcessTime4.Name = "lb_CH4ProcessTime4"; this.lb_CH4ProcessTime4.Size = new System.Drawing.Size(29, 20); this.lb_CH4ProcessTime4.TabIndex = 482; @@ -2469,7 +2469,7 @@ 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(581, 63); + this.label83.Location = new System.Drawing.Point(577, 63); 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); @@ -2489,7 +2489,7 @@ 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(511, 63); + this.lb_CH4ProcessTime3.Location = new System.Drawing.Point(507, 63); this.lb_CH4ProcessTime3.Name = "lb_CH4ProcessTime3"; this.lb_CH4ProcessTime3.Size = new System.Drawing.Size(29, 20); this.lb_CH4ProcessTime3.TabIndex = 480; @@ -2511,7 +2511,7 @@ 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(452, 63); + this.label85.Location = new System.Drawing.Point(448, 63); 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); @@ -2535,7 +2535,7 @@ 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(640, 32); + this.lb_CH4ProcessTime2.Location = new System.Drawing.Point(636, 32); this.lb_CH4ProcessTime2.Name = "lb_CH4ProcessTime2"; this.lb_CH4ProcessTime2.Size = new System.Drawing.Size(29, 20); this.lb_CH4ProcessTime2.TabIndex = 478; @@ -2557,7 +2557,7 @@ 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(581, 32); + this.label87.Location = new System.Drawing.Point(577, 32); 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); @@ -2581,7 +2581,7 @@ 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(511, 32); + this.lb_CH4ProcessTime1.Location = new System.Drawing.Point(507, 32); this.lb_CH4ProcessTime1.Name = "lb_CH4ProcessTime1"; this.lb_CH4ProcessTime1.Size = new System.Drawing.Size(29, 20); this.lb_CH4ProcessTime1.TabIndex = 476; @@ -2603,7 +2603,7 @@ 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(452, 32); + this.label89.Location = new System.Drawing.Point(448, 32); 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); @@ -3062,7 +3062,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.Name = "Form1"; - this.Text = " LL28-Z_V25111702"; + this.Text = " LL28-Z_V25111801"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing); this.Load += new System.EventHandler(this.Form1_Load); this.uiGroupBox5.ResumeLayout(false); diff --git a/SLC1-N/Form1.cs b/SLC1-N/Form1.cs index bc90f44..b69afd2 100644 --- a/SLC1-N/Form1.cs +++ b/SLC1-N/Form1.cs @@ -201,6 +201,7 @@ namespace SLC1_N bool[] coil1100 = new bool[14]; bool[] coil1032 = new bool[8]; public bool[] coilSaoma = new bool[4]; + public bool[] coilBlock = new bool[5]; // PLC警报 void PLC_Alarm() @@ -430,7 +431,7 @@ namespace SLC1_N } else { - HCPLC_client.ReadHoldingRegisters(1, 1); // 如果失败，会抛异常 + coilBlock = HCPLC_client.ReadCoils(1040, 5); // 如果失败，会抛异常 Thread.Sleep(100); Signal_PLCStatus?.Invoke(0, true); // 更新PLC连接状态UI diff --git a/SLC1-N/bin/Debug/LL28-Z-V25111702.exe b/SLC1-N/bin/Debug/LL28-Z-V25111702.exe index a16fd4b..a97ecab 100644 Binary files a/SLC1-N/bin/Debug/LL28-Z-V25111702.exe and b/SLC1-N/bin/Debug/LL28-Z-V25111702.exe differ diff --git a/SLC1-N/bin/Debug/LL28-Z-V25111702.pdb b/SLC1-N/bin/Debug/LL28-Z-V25111702.pdb index aa0fabd..ffefb3c 100644 Binary files a/SLC1-N/bin/Debug/LL28-Z-V25111702.pdb and b/SLC1-N/bin/Debug/LL28-Z-V25111702.pdb differ diff --git a/SLC1-N/bin/Debug/NetWorkHelper.dll b/SLC1-N/bin/Debug/NetWorkHelper.dll index 138b71f..60c1ce6 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 32c9d2e..04bf227 100644 Binary files a/SLC1-N/bin/Debug/NetWorkHelper.pdb and b/SLC1-N/bin/Debug/NetWorkHelper.pdb differ diff --git a/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 18f056c..6a94954 100644 Binary files a/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index a21de41..b9c9f2b 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 26a7e5e..12d8f4b 100644 Binary files a/SLC1-N/obj/Debug/Interop.ADOX.dll and b/SLC1-N/obj/Debug/Interop.ADOX.dll differ diff --git a/SLC1-N/obj/Debug/LL28-Z-V25111702.exe b/SLC1-N/obj/Debug/LL28-Z-V25111702.exe index a16fd4b..a97ecab 100644 Binary files a/SLC1-N/obj/Debug/LL28-Z-V25111702.exe and b/SLC1-N/obj/Debug/LL28-Z-V25111702.exe differ diff --git a/SLC1-N/obj/Debug/LL28-Z-V25111702.pdb b/SLC1-N/obj/Debug/LL28-Z-V25111702.pdb index aa0fabd..ffefb3c 100644 Binary files a/SLC1-N/obj/Debug/LL28-Z-V25111702.pdb and b/SLC1-N/obj/Debug/LL28-Z-V25111702.pdb differ diff --git a/SLC1-N/obj/Debug/SLC1-N.csproj.AssemblyReference.cache b/SLC1-N/obj/Debug/SLC1-N.csproj.AssemblyReference.cache index 196a15c..e5d8b1e 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.GenerateResource.cache b/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache index 8c6587a..bbb09f6 100644 Binary files a/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache and b/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache differ diff --git a/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.dll b/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.dll index 138b71f..60c1ce6 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 32c9d2e..04bf227 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.dll b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.dll index 138b71f..60c1ce6 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 32c9d2e..04bf227 100644 Binary files a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb and b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb differ