diff --git a/.vs/LL28在线/FileContentIndex/3410a28e-485a-4eee-a983-52233701e420.vsidx b/.vs/LL28在线/FileContentIndex/b044ac9a-30c4-4fe1-90d2-574b0d2717c6.vsidx similarity index 99% rename from .vs/LL28在线/FileContentIndex/3410a28e-485a-4eee-a983-52233701e420.vsidx rename to .vs/LL28在线/FileContentIndex/b044ac9a-30c4-4fe1-90d2-574b0d2717c6.vsidx index 02e0428..0ed57ff 100644 Binary files a/.vs/LL28在线/FileContentIndex/3410a28e-485a-4eee-a983-52233701e420.vsidx and b/.vs/LL28在线/FileContentIndex/b044ac9a-30c4-4fe1-90d2-574b0d2717c6.vsidx differ diff --git a/.vs/LL28在线/v17/.suo b/.vs/LL28在线/v17/.suo index 2a491fe..519a141 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 a479c21..3641c16 100644 --- a/.vs/LL28在线/v17/DocumentLayout.json +++ b/.vs/LL28在线/v17/DocumentLayout.json @@ -2,24 +2,13 @@ "Version": 1, "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:{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\\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\\form_batchsave.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", - "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_batchsave.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\\form_batchsave.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_batchsave.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|d:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "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}", @@ -29,6 +18,17 @@ "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:{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\\form_batchsave.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_batchsave.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\\form_batchsave.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_batchsave.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\\form_logon.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_logon.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\\\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": [ @@ -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\\\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": "AQIAANMEAAAAAAAAAAAzwO0EAAAAAAAA", + "ViewState": "AQIAAJQBAAAAAAAAAAAqwJoBAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-10-18T01:41:29.412Z", "IsPinned": true, @@ -274,7 +271,7 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 6, "Title": "Form_BatchSave.cs", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\Form_BatchSave.cs", "RelativeDocumentMoniker": "SLC1-N\\Form_BatchSave.cs", @@ -286,7 +283,7 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 5, "Title": "Form_BatchSave.cs [\u8BBE\u8BA1]", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\Form_BatchSave.cs", "RelativeDocumentMoniker": "SLC1-N\\Form_BatchSave.cs", @@ -309,30 +306,32 @@ }, { "$type": "Document", - "DocumentIndex": 6, + "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\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" + "WhenOpened": "2025-08-18T01:03:21.678Z", + "EditorCaption": " [\u8BBE\u8BA1]" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 2, "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": "AQIAALQCAAAAAAAAAAA0wNECAAAyAAAA", + "ViewState": "AQIAAGEAAAAAAAAAAADwv4MAAAAgAAAA", "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": 2, + "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", @@ -344,15 +343,14 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 4, "Title": "SLC1-N", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\SLC1-N.csproj", "RelativeDocumentMoniker": "SLC1-N\\SLC1-N.csproj", "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u8D1D\\\u76F4\u538B28\\huabei4tongdao\\SLC1-N\\SLC1-N.csproj", "RelativeToolTip": "SLC1-N\\SLC1-N.csproj", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|", - "WhenOpened": "2025-11-11T02:49:54.535Z", - "EditorCaption": "" + "WhenOpened": "2025-11-11T02:49:54.535Z" }, { "$type": "Document", @@ -376,7 +374,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 62aff1b..8f8a8ff 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_SafetyDoor = new System.Windows.Forms.CheckBox(); + 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.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(505, 466); 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(847, 534); 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(909, 530); 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(849, 498); 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(509, 601); 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(509, 567); 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(509, 532); 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(510, 498); 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(600, 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 = 476; + 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; @@ -1582,20 +1609,74 @@ this.uiTabControlMenu1.TabSelectedForeColor = System.Drawing.Color.Black; this.uiTabControlMenu1.TabUnSelectedForeColor = System.Drawing.Color.Black; // - // bt_BatchParamSave + // chk_SafetyDoor // - 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(600, 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 = 476; - 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_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(659, 634); + this.chk_SafetyDoor.Name = "chk_SafetyDoor"; + this.chk_SafetyDoor.Size = new System.Drawing.Size(128, 24); + this.chk_SafetyDoor.TabIndex = 493; + this.chk_SafetyDoor.Text = "安全门屏蔽"; + this.chk_SafetyDoor.UseVisualStyleBackColor = false; + this.chk_SafetyDoor.CheckedChanged += new System.EventHandler(this.chk_SafetyDoor_CheckedChanged); + // + // chk_CH4Grating + // + 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(659, 601); + this.chk_CH4Grating.Name = "chk_CH4Grating"; + this.chk_CH4Grating.Size = new System.Drawing.Size(158, 24); + this.chk_CH4Grating.TabIndex = 492; + 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(659, 567); + this.chk_CH3Grating.Name = "chk_CH3Grating"; + this.chk_CH3Grating.Size = new System.Drawing.Size(158, 24); + this.chk_CH3Grating.TabIndex = 491; + 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(659, 532); + this.chk_CH2Grating.Name = "chk_CH2Grating"; + this.chk_CH2Grating.Size = new System.Drawing.Size(158, 24); + this.chk_CH2Grating.TabIndex = 490; + 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(659, 498); + this.chk_CH1Grating.Name = "chk_CH1Grating"; + this.chk_CH1Grating.Size = new System.Drawing.Size(158, 24); + this.chk_CH1Grating.TabIndex = 489; + this.chk_CH1Grating.Text = "通道1光栅屏蔽"; + this.chk_CH1Grating.UseVisualStyleBackColor = false; + this.chk_CH1Grating.CheckedChanged += new System.EventHandler(this.chk_CH1Grating_CheckedChanged); + // + // timer_Block + // + this.timer_Block.Tick += new System.EventHandler(this.timer_Block_Tick); // // Electricity // @@ -1727,5 +1808,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 8f9ffd5..dd86893 100644 --- a/SLC1-N/Electricity.cs +++ b/SLC1-N/Electricity.cs @@ -126,6 +126,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(); } //上传参数 @@ -747,5 +751,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 1f8b7f5..a3ca64b 100644 --- a/SLC1-N/Form1.Designer.cs +++ b/SLC1-N/Form1.Designer.cs @@ -1050,7 +1050,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(612, 16); this.chk_SaomaFocus.Name = "chk_SaomaFocus"; this.chk_SaomaFocus.Size = new System.Drawing.Size(90, 20); this.chk_SaomaFocus.TabIndex = 474; @@ -3067,7 +3067,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.Name = "Form1"; - this.Text = " LL28-C_V25111701"; + this.Text = " LL28-C_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 a74fc5e..f80826a 100644 --- a/SLC1-N/Form1.cs +++ b/SLC1-N/Form1.cs @@ -202,6 +202,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() @@ -431,8 +432,8 @@ namespace SLC1_N } else { - HCPLC_client.ReadHoldingRegisters(1, 1); // 如果失败，会抛异常 - Thread.Sleep(10); + coilBlock = HCPLC_client.ReadCoils(1040, 5); // 如果失败，会抛异常 + Thread.Sleep(100); Signal_PLCStatus?.Invoke(0, true); // 更新PLC连接状态UI coilSaoma = HCPLC_client.ReadCoils(1012, 4); diff --git a/SLC1-N/bin/Debug/LL28-C_V25111701.exe b/SLC1-N/bin/Debug/LL28-C_V25111701.exe index 19064e1..887cac4 100644 Binary files a/SLC1-N/bin/Debug/LL28-C_V25111701.exe and b/SLC1-N/bin/Debug/LL28-C_V25111701.exe differ diff --git a/SLC1-N/bin/Debug/LL28-C_V25111701.pdb b/SLC1-N/bin/Debug/LL28-C_V25111701.pdb index 14e57f9..6e747c1 100644 Binary files a/SLC1-N/bin/Debug/LL28-C_V25111701.pdb and b/SLC1-N/bin/Debug/LL28-C_V25111701.pdb differ diff --git a/SLC1-N/bin/Debug/NetWorkHelper.dll b/SLC1-N/bin/Debug/NetWorkHelper.dll index 0091dff..e33d62e 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 a801ebc..d3e48e3 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..5ac7013 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 fd6c618..a6ffa41 100644 Binary files a/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SLC1-N/obj/Debug/Interop.ADOX.dll b/SLC1-N/obj/Debug/Interop.ADOX.dll index 9d85db2..98b2d47 100644 Binary files a/SLC1-N/obj/Debug/Interop.ADOX.dll and b/SLC1-N/obj/Debug/Interop.ADOX.dll differ diff --git a/SLC1-N/obj/Debug/LL28-C_V25111701.exe b/SLC1-N/obj/Debug/LL28-C_V25111701.exe index 19064e1..887cac4 100644 Binary files a/SLC1-N/obj/Debug/LL28-C_V25111701.exe and b/SLC1-N/obj/Debug/LL28-C_V25111701.exe differ diff --git a/SLC1-N/obj/Debug/LL28-C_V25111701.pdb b/SLC1-N/obj/Debug/LL28-C_V25111701.pdb index 14e57f9..6e747c1 100644 Binary files a/SLC1-N/obj/Debug/LL28-C_V25111701.pdb and b/SLC1-N/obj/Debug/LL28-C_V25111701.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 12b5aae..6780f71 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 f659d6f..bc9f92a 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 0091dff..e33d62e 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 a801ebc..d3e48e3 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.AssemblyReference.cache b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.AssemblyReference.cache index c49c241..279a4d7 100644 Binary files a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.AssemblyReference.cache and b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.AssemblyReference.cache differ diff --git a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.dll b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.dll index 0091dff..e33d62e 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 a801ebc..d3e48e3 100644 Binary files a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb and b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb differ