cgx/NonWovenFabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat： 更新UI

Browse Source
This commit is contained in:
GukSang.Jin
2026-03-04 14:47:31 +08:00
parent 816c6a23da
commit 93bd7f683a
7 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
WindowsFormsApp6/App.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -25,6 +25,7 @@
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>

5
WindowsFormsApp6/Form1.Designer.cs generated
View File

@@ -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);

5
WindowsFormsApp6/Form1.cs
View File

@@ -1004,6 +1004,11 @@ namespace WindowsFormsApp6
sampleCount = 0;
UpdateDisplay();
}
private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
{
}
}
}

24
WindowsFormsApp6/MainForm.Designer.cs generated
View File

@@ -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

13
WindowsFormsApp6/MainForm.cs
View File

@@ -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)
{
}
}
}

21
WindowsFormsApp6/WindowsFormsApp6.csproj
View File

@@ -8,10 +8,11 @@
<OutputType>WinExe</OutputType>
<RootNamespace>WindowsFormsApp6</RootNamespace>
<AssemblyName>WindowsFormsApp6</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -63,17 +64,17 @@
<Reference Include="NModbus4, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NModbus4.2.1.0\lib\net40\NModbus4.dll</HintPath>
</Reference>
<Reference Include="NPOI.Core, Version=2.7.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.7.5\lib\net472\NPOI.Core.dll</HintPath>
<Reference Include="NPOI.Core, Version=2.6.2.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.6.2\lib\net472\NPOI.Core.dll</HintPath>
</Reference>
<Reference Include="NPOI.OOXML, Version=2.7.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.7.5\lib\net472\NPOI.OOXML.dll</HintPath>
<Reference Include="NPOI.OOXML, Version=2.6.2.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.6.2\lib\net472\NPOI.OOXML.dll</HintPath>
</Reference>
<Reference Include="NPOI.OpenXml4Net, Version=2.7.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.7.5\lib\net472\NPOI.OpenXml4Net.dll</HintPath>
<Reference Include="NPOI.OpenXml4Net, Version=2.6.2.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.6.2\lib\net472\NPOI.OpenXml4Net.dll</HintPath>
</Reference>
<Reference Include="NPOI.OpenXmlFormats, Version=2.7.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.7.5\lib\net472\NPOI.OpenXmlFormats.dll</HintPath>
<Reference Include="NPOI.OpenXmlFormats, Version=2.6.2.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.6.2\lib\net472\NPOI.OpenXmlFormats.dll</HintPath>
</Reference>
<Reference Include="NSax, Version=1.0.2.0, Culture=neutral, PublicKeyToken=0b3d9671cbd3c8d0, processorArchitecture=MSIL">
<HintPath>..\packages\NSax.1.0.2\lib\net472\NSax.dll</HintPath>
@@ -196,10 +197,12 @@
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="AbsorbTestReportControl1.resx">
<DependentUpon>AbsorbTestReportControl1.cs</DependentUpon>
</EmbeddedResource>
<None Include=".editorconfig" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>

10
WindowsFormsApp6/packages.config
View File

@@ -5,21 +5,21 @@
<package id="EPPlus" version="7.3.0" targetFramework="net48" />
<package id="EPPlus.Interfaces" version="6.1.1" targetFramework="net48" />
<package id="EPPlus.System.Drawing" version="6.1.1" targetFramework="net48" />
<package id="ExtendedNumerics.BigDecimal" version="2025.1001.2.129" targetFramework="net48" />
<package id="MathNet.Numerics.Signed" version="5.0.0" targetFramework="net48" />
<package id="ExtendedNumerics.BigDecimal" version="2025.1001.2.129" targetFramework="net48" requireReinstallation="true" />
<package id="MathNet.Numerics.Signed" version="5.0.0" targetFramework="net48" requireReinstallation="true" />
<package id="Microsoft.IO.RecyclableMemoryStream" version="3.0.1" targetFramework="net48" />
<package id="NModbus4" version="2.1.0" targetFramework="net48" />
<package id="NPOI" version="2.7.5" targetFramework="net48" />
<package id="NPOI" version="2.6.2" targetFramework="net472" />
<package id="NSax" version="1.0.2" targetFramework="net48" />
<package id="SharpZipLib" version="1.4.2" targetFramework="net48" />
<package id="SixLabors.Fonts" version="1.0.1" targetFramework="net48" />
<package id="SixLabors.ImageSharp" version="2.1.11" targetFramework="net48" />
<package id="SunnyUI" version="3.7.2" targetFramework="net48" />
<package id="SunnyUI.Common" version="3.7.2" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net48" />
<package id="System.IO.Ports" version="8.0.0" targetFramework="net48" />
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
<package id="System.Security.Cryptography.Xml" version="8.0.2" targetFramework="net48" />