diff --git a/WindowsFormsApp6/App.config b/WindowsFormsApp6/App.config index 4867de8..d59ed04 100644 --- a/WindowsFormsApp6/App.config +++ b/WindowsFormsApp6/App.config @@ -1,7 +1,7 @@  - + @@ -25,6 +25,7 @@ + - \ No newline at end of file + diff --git a/WindowsFormsApp6/Form1.Designer.cs b/WindowsFormsApp6/Form1.Designer.cs index b4a6866..4532131 100644 --- a/WindowsFormsApp6/Form1.Designer.cs +++ b/WindowsFormsApp6/Form1.Designer.cs @@ -228,6 +228,7 @@ this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridView1.Size = new System.Drawing.Size(1142, 512); this.dataGridView1.TabIndex = 0; + this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); // // panel1 // @@ -483,7 +484,7 @@ this.label3.TabIndex = 0; this.label3.Text = "样品名称:"; // - // Form3 + // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -491,7 +492,7 @@ this.ClientSize = new System.Drawing.Size(1178, 844); this.Controls.Add(this.tableLayoutPanel1); this.Font = new System.Drawing.Font("微软雅黑", 8F); - this.Name = "Form3"; + this.Name = "Form1"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "液体吸收时间测试报告系统"; this.tableLayoutPanel1.ResumeLayout(false); diff --git a/WindowsFormsApp6/Form1.cs b/WindowsFormsApp6/Form1.cs index 5d599ee..4d64ab5 100644 --- a/WindowsFormsApp6/Form1.cs +++ b/WindowsFormsApp6/Form1.cs @@ -1004,6 +1004,11 @@ namespace WindowsFormsApp6 sampleCount = 0; UpdateDisplay(); } + + private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + + } } } diff --git a/WindowsFormsApp6/MainForm.Designer.cs b/WindowsFormsApp6/MainForm.Designer.cs index 9d25063..408c876 100644 --- a/WindowsFormsApp6/MainForm.Designer.cs +++ b/WindowsFormsApp6/MainForm.Designer.cs @@ -16,7 +16,7 @@ namespace WindowsFormsApp6 base.Dispose(disposing); } - #region Windows Form Designer generated code + #region Windows Form Designer generated code private void InitializeComponent() { @@ -46,10 +46,10 @@ namespace WindowsFormsApp6 this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage(); this.panelBottom = new System.Windows.Forms.Panel(); + this.buttonToggleLayout = new System.Windows.Forms.Button(); this.button5 = new System.Windows.Forms.Button(); this.buttonExport = new System.Windows.Forms.Button(); this.buttonPrint = new System.Windows.Forms.Button(); - this.buttonToggleLayout = new System.Windows.Forms.Button(); this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.panelTitle.SuspendLayout(); @@ -109,7 +109,7 @@ namespace WindowsFormsApp6 this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(1188, 30); this.label1.TabIndex = 0; - this.label1.Text = "📄 液体吸收测试报告"; + this.label1.Text = "液体吸收测试报告"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // panelInfo @@ -204,6 +204,7 @@ namespace WindowsFormsApp6 this.textBox5.Name = "textBox5"; this.textBox5.Size = new System.Drawing.Size(140, 27); this.textBox5.TabIndex = 9; + this.textBox5.TextChanged += new System.EventHandler(this.textBox5_TextChanged); // // label7 // @@ -306,30 +307,30 @@ namespace WindowsFormsApp6 // // tabPage1 // - this.tabPage1.Location = new System.Drawing.Point(4, 32); + this.tabPage1.Location = new System.Drawing.Point(4, 33); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1186, 558); + this.tabPage1.Size = new System.Drawing.Size(1186, 557); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "液体吸收时间"; this.tabPage1.UseVisualStyleBackColor = true; // // tabPage2 // - this.tabPage2.Location = new System.Drawing.Point(4, 32); + this.tabPage2.Location = new System.Drawing.Point(4, 33); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(1186, 558); + this.tabPage2.Size = new System.Drawing.Size(1186, 557); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "液体吸收量"; this.tabPage2.UseVisualStyleBackColor = true; // // tabPage3 // - this.tabPage3.Location = new System.Drawing.Point(4, 32); + this.tabPage3.Location = new System.Drawing.Point(4, 33); this.tabPage3.Name = "tabPage3"; this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(1186, 558); + this.tabPage3.Size = new System.Drawing.Size(1186, 557); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "液体芯吸速率"; this.tabPage3.UseVisualStyleBackColor = true; @@ -365,7 +366,7 @@ namespace WindowsFormsApp6 this.buttonToggleLayout.Visible = false; this.buttonToggleLayout.Click += new System.EventHandler(this.ButtonToggleLayout_Click); // - // button5 (模拟数据 - 暂时隐藏) + // button5 // this.button5.Anchor = System.Windows.Forms.AnchorStyles.None; this.button5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(89)))), ((int)(((byte)(182))))); @@ -398,7 +399,7 @@ namespace WindowsFormsApp6 this.buttonExport.UseVisualStyleBackColor = false; this.buttonExport.Click += new System.EventHandler(this.ButtonExport_Click); // - // buttonPrint (打印 - 暂时隐藏) + // buttonPrint // this.buttonPrint.Anchor = System.Windows.Forms.AnchorStyles.None; this.buttonPrint.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(152)))), ((int)(((byte)(219))))); @@ -435,6 +436,7 @@ namespace WindowsFormsApp6 this.tabControl1.ResumeLayout(false); this.panelBottom.ResumeLayout(false); this.ResumeLayout(false); + } #endregion diff --git a/WindowsFormsApp6/MainForm.cs b/WindowsFormsApp6/MainForm.cs index f3fcae5..756b564 100644 --- a/WindowsFormsApp6/MainForm.cs +++ b/WindowsFormsApp6/MainForm.cs @@ -86,7 +86,7 @@ namespace WindowsFormsApp6 _readTimer.Tick += ReadTimer_Tick; // 尝试打开默认串口 - if (!TryOpenSerialPort("COM3")) + if (!TryOpenSerialPort("COM5")) { // 如果默认串口失败，弹出端口选择对话框 ShowPortSelectionDialog(); @@ -1933,9 +1933,9 @@ namespace WindowsFormsApp6 string sampleName = textBox1.Text.Trim(); string materialCode = textBox2.Text.Trim(); string batchNumber = textBox3.Text.Trim(); - string operatorName = textBox4.Text.Trim(); - string instrument = textBox5.Text.Trim(); - string deviceNumber = textBox6.Text.Trim(); + string operatorName = textBox6.Text.Trim(); + string instrument = textBox4.Text.Trim(); + string deviceNumber = textBox5.Text.Trim(); string testTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); // 第一行信息 @@ -2527,5 +2527,10 @@ namespace WindowsFormsApp6 style.BorderLeft = NPOIBorderStyle.Thin; style.BorderRight = NPOIBorderStyle.Thin; } + + private void textBox5_TextChanged(object sender, EventArgs e) + { + + } } } diff --git a/WindowsFormsApp6/WindowsFormsApp6.csproj b/WindowsFormsApp6/WindowsFormsApp6.csproj index 9892743..a22e62f 100644 --- a/WindowsFormsApp6/WindowsFormsApp6.csproj +++ b/WindowsFormsApp6/WindowsFormsApp6.csproj @@ -8,10 +8,11 @@ WinExe WindowsFormsApp6 WindowsFormsApp6 - v4.8 + v4.7.2 512 true true + AnyCPU @@ -63,17 +64,17 @@ ..\packages\NModbus4.2.1.0\lib\net40\NModbus4.dll - - ..\packages\NPOI.2.7.5\lib\net472\NPOI.Core.dll + + ..\packages\NPOI.2.6.2\lib\net472\NPOI.Core.dll - - ..\packages\NPOI.2.7.5\lib\net472\NPOI.OOXML.dll + + ..\packages\NPOI.2.6.2\lib\net472\NPOI.OOXML.dll - - ..\packages\NPOI.2.7.5\lib\net472\NPOI.OpenXml4Net.dll + + ..\packages\NPOI.2.6.2\lib\net472\NPOI.OpenXml4Net.dll - - ..\packages\NPOI.2.7.5\lib\net472\NPOI.OpenXmlFormats.dll + + ..\packages\NPOI.2.6.2\lib\net472\NPOI.OpenXmlFormats.dll ..\packages\NSax.1.0.2\lib\net472\NSax.dll @@ -196,10 +197,12 @@ True Resources.resx + True AbsorbTestReportControl1.cs + SettingsSingleFileGenerator diff --git a/WindowsFormsApp6/packages.config b/WindowsFormsApp6/packages.config index b8446d8..915a603 100644 --- a/WindowsFormsApp6/packages.config +++ b/WindowsFormsApp6/packages.config @@ -5,21 +5,21 @@ - - + + - + - + - +