From cabd0e5e376d8f4040da171023ebe3e23253cb34 Mon Sep 17 00:00:00 2001 From: wxt Date: Thu, 8 Jan 2026 15:17:02 +0800 Subject: [PATCH] --- .../Data/ConductividyClass.cs | 123 ++++++ .../Model/PrimaryIgnitionModel.cs | 10 +- .../PrimaryIgnitionForm.Designer.cs | 61 ++- .../外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs | 44 +- .../外科辅料和患者防护罩激光抗性测试仪/ReportForm.Designer.cs | 390 ++++++++++-------- .../外科辅料和患者防护罩激光抗性测试仪/ReportForm.cs | 14 + .../外科辅料和患者防护罩激光抗性测试仪/ReportForm.resx | 19 +- .../外科辅料和患者防护罩激光抗性测试仪.csproj | 2 + 8 files changed, 455 insertions(+), 208 deletions(-) create mode 100644 外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Data/ConductividyClass.cs diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Data/ConductividyClass.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Data/ConductividyClass.cs new file mode 100644 index 0000000..ba97539 --- /dev/null +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Data/ConductividyClass.cs @@ -0,0 +1,123 @@ +using Dapper; +using MySql.Data.MySqlClient; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using 外科辅料和患者防护罩激光抗性测试仪.Model; + +namespace 材料热传导系数 +{ + //public class ConductivityTestData + //{ + // public int Id { get; set; } + + // /// + // /// 条码 + // /// + // public string barcode { get; set; } + + // /// + // /// 条码 + // /// + // public double temperature { get; set; } + + // /// + // /// 初始压力 + // /// + // public double startpressure { get; set; } + + // /// + // /// 保压时间 + // /// + // public double dwelltime { get; set; } + + // /// + // /// 压差 + // /// + // public double diffpressure { get; set; } + + // /// + // /// 结束压力 + // /// + // public double endpressure { get; set; } + + // public DateTime CreateTime { get; set; } + + // /// + // /// 普通0高温1 + // /// + // public int Type { get; set; } + //} + + + public class ConductivityRepository + { + private readonly string _connectionString; + + public ConductivityRepository() + { + _connectionString = "Server=localhost;Database=f714;User=root;Password=123456;port=3306;charset=utf8;"; + } + + public void InsertReportItems(PrimaryIgnitionModel data) + { + using (var connection = new MySqlConnection(_connectionString)) + { + connection.Open(); + var sql = @"INSERT INTO primaryignition + (Id, O2, result, FireDate, + yuhui, yuyan, Iszixi, costTime,Testtime) + VALUES + (@Id , @O2,@result, @FireDate , + @yuhui,@yuyan,@Iszixi,@costTime,@Testtime)"; + connection.Execute(sql, data); + } + } + + public void InsertTestDataList(List dataList) + { + using (var connection = new MySqlConnection(_connectionString)) + { + connection.Open(); + var sql = @"INSERT INTO normaltemperature + (barcode, temperature, startpressure, dwelltime, + diffpressure, endpressure, CreateTime, type) + VALUES + (@barcode, @temperature, @startpressure, @dwelltime, @diffpressure,@endpressure,CURRENT_TIMESTAMP,@type)"; + connection.Execute(sql, dataList); + } + } + + public List GetTestData(DateTime startDate, DateTime endDate) + { + using (var connection = new MySqlConnection(_connectionString)) + { + connection.Open(); + var sql = @"SELECT * FROM primaryignition + WHERE Testtime BETWEEN @StartDate AND @EndDate + ORDER BY Testtime DESC"; + return connection.Query(sql, new { StartDate = startDate, EndDate = endDate }).ToList(); + } + } + + + public bool TestConnection() + { + try + { + using (var connection = new MySqlConnection(_connectionString)) + { + connection.Open(); + return connection.State == ConnectionState.Open; + } + } + catch + { + return false; + } + } + } +} diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs index b8d71f9..86062ff 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs @@ -9,14 +9,16 @@ namespace 外科辅料和患者防护罩激光抗性测试仪.Model public class PrimaryIgnitionModel { public int sampleType { get; set; } + public string Id { get; set; } public string result { get; set; } public string O2 { get; set; } - public double? FireDate { get; set; } - public double? yuhui { get; set; } - public double? yuyan { get; set; } + public float? FireDate { get; set; } + public float? yuhui { get; set; } + public float? yuyan { get; set; } public bool Iszixi { get; set; } public double? costTime { get; set; } + public DateTime? Testtime { get; set; } } public class PenetrationModel { @@ -29,6 +31,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪.Model public bool Isfire { get; set; } public double? costTime2 { get; set; } public float? penetime2 { get; set; } + public DateTime? Testtime2 { get; set; } } public class SecondaryIgnitionModel { @@ -39,6 +42,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪.Model public float? yuyan3 { get; set; } public bool Iszixi3 { get; set; } public bool Isdianhuo3 { get; set; } + public DateTime? Testtime3 { get; set; } } } diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs index 810d108..eedb99a 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs @@ -101,6 +101,8 @@ uiLabel17 = new Sunny.UI.UILabel(); uiGroupBox5 = new Sunny.UI.UIGroupBox(); uiLabel16 = new Sunny.UI.UILabel(); + uiLabel42 = new Sunny.UI.UILabel(); + uiLabel43 = new Sunny.UI.UILabel(); uiTableLayoutPanel1.SuspendLayout(); uiTableLayoutPanel2.SuspendLayout(); uiPanel3.SuspendLayout(); @@ -1028,6 +1030,8 @@ // uiGroupBox4 // uiGroupBox4.BackColor = Color.White; + uiGroupBox4.Controls.Add(uiLabel42); + uiGroupBox4.Controls.Add(uiLabel43); uiGroupBox4.Controls.Add(uiButton13); uiGroupBox4.Controls.Add(uiButton10); uiGroupBox4.Controls.Add(uiButton9); @@ -1074,7 +1078,7 @@ uiButton13.FillPressColor = Color.FromArgb(47, 144, 255); uiButton13.FillSelectedColor = Color.FromArgb(47, 144, 255); uiButton13.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiButton13.Location = new Point(126, 751); + uiButton13.Location = new Point(126, 787); uiButton13.MinimumSize = new Size(1, 1); uiButton13.Name = "uiButton13"; uiButton13.Radius = 6; @@ -1099,7 +1103,7 @@ uiButton10.FillPressColor = Color.FromArgb(212, 145, 47); uiButton10.FillSelectedColor = Color.FromArgb(212, 145, 47); uiButton10.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiButton10.Location = new Point(126, 656); + uiButton10.Location = new Point(126, 692); uiButton10.MinimumSize = new Size(1, 1); uiButton10.Name = "uiButton10"; uiButton10.Radius = 6; @@ -1124,7 +1128,7 @@ uiButton9.FillPressColor = Color.FromArgb(84, 178, 38); uiButton9.FillSelectedColor = Color.FromArgb(84, 178, 38); uiButton9.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiButton9.Location = new Point(126, 561); + uiButton9.Location = new Point(126, 597); uiButton9.MinimumSize = new Size(1, 1); uiButton9.Name = "uiButton9"; uiButton9.Radius = 6; @@ -1143,7 +1147,7 @@ // uiLabel21.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel21.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel21.Location = new Point(175, 146); + uiLabel21.Location = new Point(175, 144); uiLabel21.Name = "uiLabel21"; uiLabel21.Size = new Size(265, 31); uiLabel21.Style = Sunny.UI.UIStyle.Custom; @@ -1155,7 +1159,7 @@ // uiLabel27.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel27.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel27.Location = new Point(222, 305); + uiLabel27.Location = new Point(222, 306); uiLabel27.Name = "uiLabel27"; uiLabel27.Size = new Size(169, 31); uiLabel27.Style = Sunny.UI.UIStyle.Custom; @@ -1167,7 +1171,7 @@ // uiLabel18.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel18.ForeColor = Color.FromArgb(103, 194, 58); - uiLabel18.Location = new Point(222, 407); + uiLabel18.Location = new Point(222, 414); uiLabel18.Name = "uiLabel18"; uiLabel18.Size = new Size(169, 31); uiLabel18.Style = Sunny.UI.UIStyle.Custom; @@ -1179,7 +1183,7 @@ // uiLabel34.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel34.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel34.Location = new Point(222, 464); + uiLabel34.Location = new Point(222, 468); uiLabel34.Name = "uiLabel34"; uiLabel34.Size = new Size(169, 31); uiLabel34.Style = Sunny.UI.UIStyle.Custom; @@ -1191,7 +1195,7 @@ // uiLabel35.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel35.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel35.Location = new Point(52, 464); + uiLabel35.Location = new Point(52, 467); uiLabel35.Name = "uiLabel35"; uiLabel35.Size = new Size(169, 31); uiLabel35.Style = Sunny.UI.UIStyle.Custom; @@ -1204,7 +1208,7 @@ // uiLabel33.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel33.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel33.Location = new Point(52, 411); + uiLabel33.Location = new Point(52, 413); uiLabel33.Name = "uiLabel33"; uiLabel33.Size = new Size(136, 31); uiLabel33.Style = Sunny.UI.UIStyle.Custom; @@ -1249,7 +1253,7 @@ // uiLabel29.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel29.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel29.Location = new Point(222, 358); + uiLabel29.Location = new Point(222, 360); uiLabel29.Name = "uiLabel29"; uiLabel29.Size = new Size(169, 31); uiLabel29.Style = Sunny.UI.UIStyle.Custom; @@ -1261,7 +1265,7 @@ // uiLabel30.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel30.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel30.Location = new Point(52, 358); + uiLabel30.Location = new Point(52, 359); uiLabel30.Name = "uiLabel30"; uiLabel30.Size = new Size(136, 31); uiLabel30.Style = Sunny.UI.UIStyle.Custom; @@ -1286,7 +1290,7 @@ // uiLabel32.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel32.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel32.Location = new Point(52, 252); + uiLabel32.Location = new Point(52, 251); uiLabel32.Name = "uiLabel32"; uiLabel32.Size = new Size(136, 31); uiLabel32.Style = Sunny.UI.UIStyle.Custom; @@ -1299,7 +1303,7 @@ // uiLabel22.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel22.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel22.Location = new Point(52, 146); + uiLabel22.Location = new Point(52, 143); uiLabel22.Name = "uiLabel22"; uiLabel22.Size = new Size(136, 31); uiLabel22.Style = Sunny.UI.UIStyle.Custom; @@ -1312,7 +1316,7 @@ // uiLabel19.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel19.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel19.Location = new Point(222, 199); + uiLabel19.Location = new Point(222, 198); uiLabel19.Name = "uiLabel19"; uiLabel19.Size = new Size(169, 31); uiLabel19.Style = Sunny.UI.UIStyle.Custom; @@ -1324,7 +1328,7 @@ // uiLabel20.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel20.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel20.Location = new Point(52, 199); + uiLabel20.Location = new Point(52, 197); uiLabel20.Name = "uiLabel20"; uiLabel20.Size = new Size(136, 31); uiLabel20.Style = Sunny.UI.UIStyle.Custom; @@ -1380,6 +1384,31 @@ uiLabel16.TabIndex = 0; uiLabel16.Text = "I1: 未点火\r\nI2: 点火后自熄\r\nI3: 点火时间 > 4s 且不自熄\r\nI4: 点火时间 ≤ 4s 且不自熄\r\n\r\n根据 BS EN ISO 11810:2015 标准"; // + // uiLabel42 + // + uiLabel42.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); + uiLabel42.ForeColor = Color.FromArgb(64, 158, 255); + uiLabel42.Location = new Point(175, 522); + uiLabel42.Name = "uiLabel42"; + uiLabel42.Size = new Size(265, 31); + uiLabel42.Style = Sunny.UI.UIStyle.Custom; + uiLabel42.StyleCustomMode = true; + uiLabel42.TabIndex = 23; + uiLabel42.TextAlign = ContentAlignment.MiddleCenter; + // + // uiLabel43 + // + uiLabel43.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiLabel43.ForeColor = Color.FromArgb(96, 98, 102); + uiLabel43.Location = new Point(52, 521); + uiLabel43.Name = "uiLabel43"; + uiLabel43.Size = new Size(136, 31); + uiLabel43.Style = Sunny.UI.UIStyle.Custom; + uiLabel43.StyleCustomMode = true; + uiLabel43.TabIndex = 22; + uiLabel43.Text = "测试时间:"; + uiLabel43.TextAlign = ContentAlignment.MiddleLeft; + // // PrimaryIgnitionForm // AutoScaleMode = AutoScaleMode.None; @@ -1490,5 +1519,7 @@ private Sunny.UI.UILabel uiLabel41; private Sunny.UI.UILabel uiLabel48; private Sunny.UI.UILabel uiLabel49; + private Sunny.UI.UILabel uiLabel42; + private Sunny.UI.UILabel uiLabel43; } } \ No newline at end of file diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs index 4a6b145..fd27e7d 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs @@ -16,6 +16,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using 外科辅料和患者防护罩激光抗性测试仪.Data; using 外科辅料和患者防护罩激光抗性测试仪.Model; +using 材料热传导系数; using static System.Windows.Forms.VisualStyles.VisualStyleElement; namespace 外科辅料和患者防护罩激光抗性测试仪 @@ -32,10 +33,10 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 private System.Windows.Forms.Timer _readtimer; private readonly SemaphoreSlim _asyncLock = new SemaphoreSlim(1, 1); - private bool _isDisposed = false; // 添加释放标志 + public bool RunStatus = false; - + ConductivityRepository conductivityRepository; public PrimaryIgnitionForm() { @@ -45,7 +46,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 InitComboBox2Pattern(); InitTimer(); - + conductivityRepository = new ConductivityRepository(); } private void PrimaryIgnitionForm_Load(object sender, EventArgs e) @@ -294,7 +295,8 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 if (_lastRunStatus && !currentRunStatus && !_isReported) { - _ = InsertReportAsync(); + var model =await InsertReportAsync(); + conductivityRepository.InsertReportItems( model); _isReported = true; } @@ -325,7 +327,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 private float yh; private bool iszixi; private double costtime; - private async Task InsertReportAsync() + private async Task InsertReportAsync() { if (uiLabel10.Text != null && uiLabel10.Text.Trim() == "1") { @@ -416,7 +418,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 yy = 0; ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 314, 2); if (yhlocation != null && yhlocation.Length >= 1) - { + { yh = c.UshortToFloat(yhlocation[1], yhlocation[0]);//余辉 } bool[] fire1 = await ReadModbusCoilAsync(280, 1); @@ -859,27 +861,38 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 try { string selectedO2Text = uiComboBox1.Text; - reportList.Add(new PrimaryIgnitionModel + string id = uiLabel10.Text; + + var model = new PrimaryIgnitionModel { - costTime = costtime, - FireDate = firetime, - Iszixi = iszixi, + Id = id , O2 = selectedO2Text, result = classify, + FireDate = firetime, + yuhui = yh, + yuyan = yy, + Iszixi = iszixi, + costTime = costtime, + Testtime = DateTime.Now, + sampleType = uiLabel10.Text.Contains("1") ? 1 : uiLabel10.Text.Contains("2") ? 2 : uiLabel10.Text.Contains("3") ? 3 : uiLabel10.Text.Contains("4") ? 4 : uiLabel10.Text.Contains("5") ? 5 : 0, - yuhui = yh, - yuyan = yy - }); + }; + reportList.Add(model); + + await Task.Delay(100); + return model; } catch (Exception ex) { + Debug.WriteLine($"报表插入失败: {ex.Message}"); + return new PrimaryIgnitionModel(); } } @@ -1044,6 +1057,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 uiLabel29.Text = data?.yuhui.ToString() ?? string.Empty; uiLabel18.Text = data?.Iszixi.ToString() ?? string.Empty; uiLabel34.Text = data?.costTime.ToString() ?? string.Empty; + uiLabel42.Text = data?.Testtime.ToString() ?? string.Empty; break; } case "样品2": @@ -1056,6 +1070,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 uiLabel29.Text = data?.yuhui.ToString() ?? string.Empty; uiLabel18.Text = data?.Iszixi.ToString() ?? string.Empty; uiLabel34.Text = data?.costTime.ToString() ?? string.Empty; + uiLabel42.Text = data?.Testtime.ToString() ?? string.Empty; break; } case "样品3": @@ -1068,6 +1083,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 uiLabel29.Text = data?.yuhui.ToString() ?? string.Empty; uiLabel18.Text = data?.Iszixi.ToString() ?? string.Empty; uiLabel34.Text = data?.costTime.ToString() ?? string.Empty; + uiLabel42.Text = data?.Testtime.ToString() ?? string.Empty; break; } case "样品4": @@ -1080,6 +1096,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 uiLabel29.Text = data?.yuhui.ToString() ?? string.Empty; uiLabel18.Text = data?.Iszixi.ToString() ?? string.Empty; uiLabel34.Text = data?.costTime.ToString() ?? string.Empty; + uiLabel42.Text = data?.Testtime.ToString() ?? string.Empty; break; } case "样品5": @@ -1092,6 +1109,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 uiLabel29.Text = data?.yuhui.ToString() ?? string.Empty; uiLabel18.Text = data?.Iszixi.ToString() ?? string.Empty; uiLabel34.Text = data?.costTime.ToString() ?? string.Empty; + uiLabel42.Text = data?.Testtime.ToString() ?? string.Empty; break; } default: diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.Designer.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.Designer.cs index 4413707..df245d5 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.Designer.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.Designer.cs @@ -30,6 +30,19 @@ { DataGridViewCellStyle dataGridViewCellStyle1 = new DataGridViewCellStyle(); DataGridViewCellStyle dataGridViewCellStyle2 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle11 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle12 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle13 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle14 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle15 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle16 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle17 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle18 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle19 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle20 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle21 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle22 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle23 = new DataGridViewCellStyle(); DataGridViewCellStyle dataGridViewCellStyle3 = new DataGridViewCellStyle(); DataGridViewCellStyle dataGridViewCellStyle4 = new DataGridViewCellStyle(); DataGridViewCellStyle dataGridViewCellStyle5 = new DataGridViewCellStyle(); @@ -38,11 +51,6 @@ DataGridViewCellStyle dataGridViewCellStyle8 = new DataGridViewCellStyle(); DataGridViewCellStyle dataGridViewCellStyle9 = new DataGridViewCellStyle(); DataGridViewCellStyle dataGridViewCellStyle10 = new DataGridViewCellStyle(); - DataGridViewCellStyle dataGridViewCellStyle11 = new DataGridViewCellStyle(); - DataGridViewCellStyle dataGridViewCellStyle12 = new DataGridViewCellStyle(); - DataGridViewCellStyle dataGridViewCellStyle13 = new DataGridViewCellStyle(); - DataGridViewCellStyle dataGridViewCellStyle14 = new DataGridViewCellStyle(); - DataGridViewCellStyle dataGridViewCellStyle15 = new DataGridViewCellStyle(); uiTableLayoutPanel1 = new Sunny.UI.UITableLayoutPanel(); uiPanel2 = new Sunny.UI.UIPanel(); uiGroupBox2 = new Sunny.UI.UIGroupBox(); @@ -50,14 +58,6 @@ uiTabControl1 = new Sunny.UI.UITabControl(); tabPage1 = new TabPage(); uiDataGridView1 = new Sunny.UI.UIDataGridView(); - Column1 = new DataGridViewTextBoxColumn(); - Column2 = new DataGridViewTextBoxColumn(); - Column3 = new DataGridViewTextBoxColumn(); - Column4 = new DataGridViewTextBoxColumn(); - Column5 = new DataGridViewTextBoxColumn(); - Column6 = new DataGridViewTextBoxColumn(); - Column7 = new DataGridViewTextBoxColumn(); - Column8 = new DataGridViewTextBoxColumn(); tabPage2 = new TabPage(); uiDataGridView2 = new Sunny.UI.UIDataGridView(); dataGridViewTextBoxColumn1 = new DataGridViewTextBoxColumn(); @@ -95,6 +95,15 @@ dataGridViewTextBoxColumn13 = new DataGridViewTextBoxColumn(); dataGridViewTextBoxColumn14 = new DataGridViewTextBoxColumn(); dataGridViewTextBoxColumn15 = new DataGridViewTextBoxColumn(); + id = new DataGridViewTextBoxColumn(); + O2 = new DataGridViewTextBoxColumn(); + result = new DataGridViewTextBoxColumn(); + FireDate = new DataGridViewTextBoxColumn(); + yuyan = new DataGridViewTextBoxColumn(); + yuhui = new DataGridViewTextBoxColumn(); + iszixi = new DataGridViewTextBoxColumn(); + costtime = new DataGridViewTextBoxColumn(); + CreateTime = new DataGridViewTextBoxColumn(); uiTableLayoutPanel1.SuspendLayout(); uiPanel2.SuspendLayout(); uiGroupBox2.SuspendLayout(); @@ -238,15 +247,15 @@ uiDataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; uiDataGridView1.ColumnHeadersHeight = 42; uiDataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - uiDataGridView1.Columns.AddRange(new DataGridViewColumn[] { Column1, Column2, Column3, Column4, Column5, Column6, Column7, Column8 }); - dataGridViewCellStyle3.Alignment = DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = Color.White; - dataGridViewCellStyle3.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - dataGridViewCellStyle3.ForeColor = Color.FromArgb(48, 48, 48); - dataGridViewCellStyle3.SelectionBackColor = Color.FromArgb(240, 248, 255); - dataGridViewCellStyle3.SelectionForeColor = Color.FromArgb(48, 49, 51); - dataGridViewCellStyle3.WrapMode = DataGridViewTriState.False; - uiDataGridView1.DefaultCellStyle = dataGridViewCellStyle3; + uiDataGridView1.Columns.AddRange(new DataGridViewColumn[] { id, O2, result, FireDate, yuyan, yuhui, iszixi, costtime, CreateTime }); + dataGridViewCellStyle11.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = Color.White; + dataGridViewCellStyle11.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + dataGridViewCellStyle11.ForeColor = Color.FromArgb(48, 48, 48); + dataGridViewCellStyle11.SelectionBackColor = Color.FromArgb(240, 248, 255); + dataGridViewCellStyle11.SelectionForeColor = Color.FromArgb(48, 49, 51); + dataGridViewCellStyle11.WrapMode = DataGridViewTriState.False; + uiDataGridView1.DefaultCellStyle = dataGridViewCellStyle11; uiDataGridView1.Dock = DockStyle.Fill; uiDataGridView1.EnableHeadersVisualStyles = false; uiDataGridView1.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); @@ -254,122 +263,58 @@ uiDataGridView1.Location = new Point(0, 0); uiDataGridView1.Name = "uiDataGridView1"; uiDataGridView1.RowHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle4.Alignment = DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = Color.FromArgb(240, 248, 255); - dataGridViewCellStyle4.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - dataGridViewCellStyle4.ForeColor = Color.FromArgb(48, 49, 51); - dataGridViewCellStyle4.SelectionBackColor = Color.FromArgb(52, 152, 219); - dataGridViewCellStyle4.SelectionForeColor = Color.White; - dataGridViewCellStyle4.WrapMode = DataGridViewTriState.True; - uiDataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle12.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle12.BackColor = Color.FromArgb(240, 248, 255); + dataGridViewCellStyle12.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + dataGridViewCellStyle12.ForeColor = Color.FromArgb(48, 49, 51); + dataGridViewCellStyle12.SelectionBackColor = Color.FromArgb(52, 152, 219); + dataGridViewCellStyle12.SelectionForeColor = Color.White; + dataGridViewCellStyle12.WrapMode = DataGridViewTriState.True; + uiDataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; uiDataGridView1.RowHeadersWidth = 62; - dataGridViewCellStyle5.BackColor = Color.White; - dataGridViewCellStyle5.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiDataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle13.BackColor = Color.White; + dataGridViewCellStyle13.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiDataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle13; uiDataGridView1.SelectedIndex = -1; uiDataGridView1.Size = new Size(1375, 802); uiDataGridView1.StripeOddColor = Color.FromArgb(240, 248, 255); uiDataGridView1.TabIndex = 0; // - // Column1 - // - Column1.HeaderText = "测试项/样品"; - Column1.MinimumWidth = 8; - Column1.Name = "Column1"; - Column1.ReadOnly = true; - Column1.Width = 150; - // - // Column2 - // - Column2.HeaderText = "氧浓度（%）"; - Column2.MinimumWidth = 8; - Column2.Name = "Column2"; - Column2.ReadOnly = true; - Column2.Width = 150; - // - // Column3 - // - Column3.HeaderText = "分类结果"; - Column3.MinimumWidth = 8; - Column3.Name = "Column3"; - Column3.ReadOnly = true; - Column3.Width = 150; - // - // Column4 - // - Column4.HeaderText = "点火时间(s)"; - Column4.MinimumWidth = 8; - Column4.Name = "Column4"; - Column4.ReadOnly = true; - Column4.Width = 150; - // - // Column5 - // - Column5.HeaderText = "余焰时间(s)"; - Column5.MinimumWidth = 8; - Column5.Name = "Column5"; - Column5.ReadOnly = true; - Column5.Width = 150; - // - // Column6 - // - Column6.HeaderText = "余辉时间(s)"; - Column6.MinimumWidth = 8; - Column6.Name = "Column6"; - Column6.ReadOnly = true; - Column6.Width = 150; - // - // Column7 - // - Column7.HeaderText = "是否自熄"; - Column7.MinimumWidth = 8; - Column7.Name = "Column7"; - Column7.ReadOnly = true; - Column7.Width = 150; - // - // Column8 - // - Column8.HeaderText = "总测试时长(s)"; - Column8.MinimumWidth = 8; - Column8.Name = "Column8"; - Column8.ReadOnly = true; - Column8.Width = 200; - // // tabPage2 // tabPage2.BackColor = Color.White; tabPage2.Controls.Add(uiDataGridView2); - tabPage2.Location = new Point(0, 45); + tabPage2.Location = new Point(0, 40); tabPage2.Name = "tabPage2"; - tabPage2.Size = new Size(1375, 802); + tabPage2.Size = new Size(200, 60); tabPage2.TabIndex = 1; tabPage2.Text = "📈 穿透性测试报告"; // // uiDataGridView2 // - dataGridViewCellStyle6.BackColor = Color.FromArgb(240, 248, 255); - uiDataGridView2.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle14.BackColor = Color.FromArgb(240, 248, 255); + uiDataGridView2.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14; uiDataGridView2.BackgroundColor = Color.White; uiDataGridView2.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle7.Alignment = DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = Color.FromArgb(52, 152, 219); - dataGridViewCellStyle7.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - dataGridViewCellStyle7.ForeColor = Color.White; - dataGridViewCellStyle7.SelectionBackColor = Color.FromArgb(52, 152, 219); - dataGridViewCellStyle7.SelectionForeColor = Color.White; - dataGridViewCellStyle7.WrapMode = DataGridViewTriState.True; - uiDataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle15.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle15.BackColor = Color.FromArgb(52, 152, 219); + dataGridViewCellStyle15.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + dataGridViewCellStyle15.ForeColor = Color.White; + dataGridViewCellStyle15.SelectionBackColor = Color.FromArgb(52, 152, 219); + dataGridViewCellStyle15.SelectionForeColor = Color.White; + dataGridViewCellStyle15.WrapMode = DataGridViewTriState.True; + uiDataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15; uiDataGridView2.ColumnHeadersHeight = 42; uiDataGridView2.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing; uiDataGridView2.Columns.AddRange(new DataGridViewColumn[] { dataGridViewTextBoxColumn1, dataGridViewTextBoxColumn2, dataGridViewTextBoxColumn3, dataGridViewTextBoxColumn4, dataGridViewTextBoxColumn5, dataGridViewTextBoxColumn6, dataGridViewTextBoxColumn7, dataGridViewTextBoxColumn8, Column9 }); - dataGridViewCellStyle8.Alignment = DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle8.BackColor = Color.White; - dataGridViewCellStyle8.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - dataGridViewCellStyle8.ForeColor = Color.FromArgb(48, 48, 48); - dataGridViewCellStyle8.SelectionBackColor = Color.FromArgb(240, 248, 255); - dataGridViewCellStyle8.SelectionForeColor = Color.FromArgb(48, 49, 51); - dataGridViewCellStyle8.WrapMode = DataGridViewTriState.False; - uiDataGridView2.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle16.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle16.BackColor = Color.White; + dataGridViewCellStyle16.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + dataGridViewCellStyle16.ForeColor = Color.FromArgb(48, 48, 48); + dataGridViewCellStyle16.SelectionBackColor = Color.FromArgb(240, 248, 255); + dataGridViewCellStyle16.SelectionForeColor = Color.FromArgb(48, 49, 51); + dataGridViewCellStyle16.WrapMode = DataGridViewTriState.False; + uiDataGridView2.DefaultCellStyle = dataGridViewCellStyle16; uiDataGridView2.Dock = DockStyle.Fill; uiDataGridView2.EnableHeadersVisualStyles = false; uiDataGridView2.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); @@ -377,20 +322,20 @@ uiDataGridView2.Location = new Point(0, 0); uiDataGridView2.Name = "uiDataGridView2"; uiDataGridView2.RowHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle9.Alignment = DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle9.BackColor = Color.FromArgb(240, 248, 255); - dataGridViewCellStyle9.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - dataGridViewCellStyle9.ForeColor = Color.FromArgb(48, 49, 51); - dataGridViewCellStyle9.SelectionBackColor = Color.FromArgb(52, 152, 219); - dataGridViewCellStyle9.SelectionForeColor = Color.White; - dataGridViewCellStyle9.WrapMode = DataGridViewTriState.True; - uiDataGridView2.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle17.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle17.BackColor = Color.FromArgb(240, 248, 255); + dataGridViewCellStyle17.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + dataGridViewCellStyle17.ForeColor = Color.FromArgb(48, 49, 51); + dataGridViewCellStyle17.SelectionBackColor = Color.FromArgb(52, 152, 219); + dataGridViewCellStyle17.SelectionForeColor = Color.White; + dataGridViewCellStyle17.WrapMode = DataGridViewTriState.True; + uiDataGridView2.RowHeadersDefaultCellStyle = dataGridViewCellStyle17; uiDataGridView2.RowHeadersWidth = 62; - dataGridViewCellStyle10.BackColor = Color.White; - dataGridViewCellStyle10.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiDataGridView2.RowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle18.BackColor = Color.White; + dataGridViewCellStyle18.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiDataGridView2.RowsDefaultCellStyle = dataGridViewCellStyle18; uiDataGridView2.SelectedIndex = -1; - uiDataGridView2.Size = new Size(1375, 802); + uiDataGridView2.Size = new Size(200, 60); uiDataGridView2.StripeOddColor = Color.FromArgb(240, 248, 255); uiDataGridView2.TabIndex = 1; // @@ -470,37 +415,37 @@ // tabPage3.BackColor = Color.White; tabPage3.Controls.Add(uiDataGridView3); - tabPage3.Location = new Point(0, 45); + tabPage3.Location = new Point(0, 40); tabPage3.Name = "tabPage3"; - tabPage3.Size = new Size(1375, 802); + tabPage3.Size = new Size(200, 60); tabPage3.TabIndex = 2; tabPage3.Text = "🔥 二次点火测试报告"; // // uiDataGridView3 // - dataGridViewCellStyle11.BackColor = Color.FromArgb(240, 248, 255); - uiDataGridView3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle19.BackColor = Color.FromArgb(240, 248, 255); + uiDataGridView3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19; uiDataGridView3.BackgroundColor = Color.White; uiDataGridView3.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle12.Alignment = DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = Color.FromArgb(52, 152, 219); - dataGridViewCellStyle12.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - dataGridViewCellStyle12.ForeColor = Color.White; - dataGridViewCellStyle12.SelectionBackColor = Color.FromArgb(52, 152, 219); - dataGridViewCellStyle12.SelectionForeColor = Color.White; - dataGridViewCellStyle12.WrapMode = DataGridViewTriState.True; - uiDataGridView3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle20.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle20.BackColor = Color.FromArgb(52, 152, 219); + dataGridViewCellStyle20.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + dataGridViewCellStyle20.ForeColor = Color.White; + dataGridViewCellStyle20.SelectionBackColor = Color.FromArgb(52, 152, 219); + dataGridViewCellStyle20.SelectionForeColor = Color.White; + dataGridViewCellStyle20.WrapMode = DataGridViewTriState.True; + uiDataGridView3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20; uiDataGridView3.ColumnHeadersHeight = 42; uiDataGridView3.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing; uiDataGridView3.Columns.AddRange(new DataGridViewColumn[] { dataGridViewTextBoxColumn16, dataGridViewTextBoxColumn17, dataGridViewTextBoxColumn18, dataGridViewTextBoxColumn20, dataGridViewTextBoxColumn21, dataGridViewTextBoxColumn22, dataGridViewTextBoxColumn23 }); - dataGridViewCellStyle13.Alignment = DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle13.BackColor = Color.White; - dataGridViewCellStyle13.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - dataGridViewCellStyle13.ForeColor = Color.FromArgb(48, 48, 48); - dataGridViewCellStyle13.SelectionBackColor = Color.FromArgb(240, 248, 255); - dataGridViewCellStyle13.SelectionForeColor = Color.FromArgb(48, 49, 51); - dataGridViewCellStyle13.WrapMode = DataGridViewTriState.False; - uiDataGridView3.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle21.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle21.BackColor = Color.White; + dataGridViewCellStyle21.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + dataGridViewCellStyle21.ForeColor = Color.FromArgb(48, 48, 48); + dataGridViewCellStyle21.SelectionBackColor = Color.FromArgb(240, 248, 255); + dataGridViewCellStyle21.SelectionForeColor = Color.FromArgb(48, 49, 51); + dataGridViewCellStyle21.WrapMode = DataGridViewTriState.False; + uiDataGridView3.DefaultCellStyle = dataGridViewCellStyle21; uiDataGridView3.Dock = DockStyle.Fill; uiDataGridView3.EnableHeadersVisualStyles = false; uiDataGridView3.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); @@ -508,20 +453,20 @@ uiDataGridView3.Location = new Point(0, 0); uiDataGridView3.Name = "uiDataGridView3"; uiDataGridView3.RowHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle14.Alignment = DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle14.BackColor = Color.FromArgb(240, 248, 255); - dataGridViewCellStyle14.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - dataGridViewCellStyle14.ForeColor = Color.FromArgb(48, 49, 51); - dataGridViewCellStyle14.SelectionBackColor = Color.FromArgb(52, 152, 219); - dataGridViewCellStyle14.SelectionForeColor = Color.White; - dataGridViewCellStyle14.WrapMode = DataGridViewTriState.True; - uiDataGridView3.RowHeadersDefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle22.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle22.BackColor = Color.FromArgb(240, 248, 255); + dataGridViewCellStyle22.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + dataGridViewCellStyle22.ForeColor = Color.FromArgb(48, 49, 51); + dataGridViewCellStyle22.SelectionBackColor = Color.FromArgb(52, 152, 219); + dataGridViewCellStyle22.SelectionForeColor = Color.White; + dataGridViewCellStyle22.WrapMode = DataGridViewTriState.True; + uiDataGridView3.RowHeadersDefaultCellStyle = dataGridViewCellStyle22; uiDataGridView3.RowHeadersWidth = 62; - dataGridViewCellStyle15.BackColor = Color.White; - dataGridViewCellStyle15.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiDataGridView3.RowsDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle23.BackColor = Color.White; + dataGridViewCellStyle23.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiDataGridView3.RowsDefaultCellStyle = dataGridViewCellStyle23; uiDataGridView3.SelectedIndex = -1; - uiDataGridView3.Size = new Size(1375, 802); + uiDataGridView3.Size = new Size(200, 60); uiDataGridView3.StripeOddColor = Color.FromArgb(240, 248, 255); uiDataGridView3.TabIndex = 1; // @@ -705,6 +650,7 @@ uiButton1.TabIndex = 6; uiButton1.Text = "🔍 查询"; uiButton1.TipsFont = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton1.Click += uiButton1_Click; // // uiDatetimePicker2 // @@ -824,6 +770,111 @@ dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15"; dataGridViewTextBoxColumn15.Width = 150; // + // id + // + id.DataPropertyName = "Id"; + dataGridViewCellStyle3.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + id.DefaultCellStyle = dataGridViewCellStyle3; + id.HeaderText = "测试项/样品"; + id.MinimumWidth = 8; + id.Name = "id"; + id.ReadOnly = true; + id.Width = 150; + // + // O2 + // + O2.DataPropertyName = "O2"; + dataGridViewCellStyle4.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + O2.DefaultCellStyle = dataGridViewCellStyle4; + O2.HeaderText = "氧浓度（%）"; + O2.MinimumWidth = 8; + O2.Name = "O2"; + O2.ReadOnly = true; + O2.Width = 220; + // + // result + // + result.DataPropertyName = "result"; + result.HeaderText = "分类结果"; + result.MinimumWidth = 8; + result.Name = "result"; + result.ReadOnly = true; + result.Width = 150; + // + // FireDate + // + FireDate.DataPropertyName = "FireDate"; + dataGridViewCellStyle5.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + FireDate.DefaultCellStyle = dataGridViewCellStyle5; + FireDate.HeaderText = "点火时间(s)"; + FireDate.MinimumWidth = 8; + FireDate.Name = "FireDate"; + FireDate.ReadOnly = true; + FireDate.Width = 150; + // + // yuyan + // + yuyan.DataPropertyName = "yuyan"; + dataGridViewCellStyle6.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle6.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + yuyan.DefaultCellStyle = dataGridViewCellStyle6; + yuyan.HeaderText = "余焰时间(s)"; + yuyan.MinimumWidth = 8; + yuyan.Name = "yuyan"; + yuyan.ReadOnly = true; + yuyan.Width = 150; + // + // yuhui + // + yuhui.DataPropertyName = "yuhui"; + dataGridViewCellStyle7.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + yuhui.DefaultCellStyle = dataGridViewCellStyle7; + yuhui.HeaderText = "余辉时间(s)"; + yuhui.MinimumWidth = 8; + yuhui.Name = "yuhui"; + yuhui.ReadOnly = true; + yuhui.Width = 150; + // + // iszixi + // + iszixi.DataPropertyName = "Iszixi"; + dataGridViewCellStyle8.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + iszixi.DefaultCellStyle = dataGridViewCellStyle8; + iszixi.HeaderText = "是否自熄"; + iszixi.MinimumWidth = 8; + iszixi.Name = "iszixi"; + iszixi.ReadOnly = true; + iszixi.Width = 150; + // + // costtime + // + costtime.DataPropertyName = "costTime"; + dataGridViewCellStyle9.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + costtime.DefaultCellStyle = dataGridViewCellStyle9; + costtime.HeaderText = "总测试时长(s)"; + costtime.MinimumWidth = 8; + costtime.Name = "costtime"; + costtime.ReadOnly = true; + costtime.Width = 200; + // + // CreateTime + // + CreateTime.DataPropertyName = "Testtime"; + dataGridViewCellStyle10.Alignment = DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + CreateTime.DefaultCellStyle = dataGridViewCellStyle10; + CreateTime.HeaderText = "测试时间"; + CreateTime.MinimumWidth = 8; + CreateTime.Name = "CreateTime"; + CreateTime.ReadOnly = true; + CreateTime.Width = 150; + // // ReportForm // AutoScaleMode = AutoScaleMode.None; @@ -877,14 +928,6 @@ private TabPage tabPage2; private TabPage tabPage3; private Sunny.UI.UIDataGridView uiDataGridView1; - private DataGridViewTextBoxColumn Column1; - private DataGridViewTextBoxColumn Column2; - private DataGridViewTextBoxColumn Column3; - private DataGridViewTextBoxColumn Column4; - private DataGridViewTextBoxColumn Column5; - private DataGridViewTextBoxColumn Column6; - private DataGridViewTextBoxColumn Column7; - private DataGridViewTextBoxColumn Column8; private DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; private DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; private DataGridViewTextBoxColumn dataGridViewTextBoxColumn11; @@ -910,5 +953,14 @@ private DataGridViewTextBoxColumn dataGridViewTextBoxColumn21; private DataGridViewTextBoxColumn dataGridViewTextBoxColumn22; private DataGridViewTextBoxColumn dataGridViewTextBoxColumn23; + private DataGridViewTextBoxColumn id; + private DataGridViewTextBoxColumn O2; + private DataGridViewTextBoxColumn result; + private DataGridViewTextBoxColumn FireDate; + private DataGridViewTextBoxColumn yuyan; + private DataGridViewTextBoxColumn yuhui; + private DataGridViewTextBoxColumn iszixi; + private DataGridViewTextBoxColumn costtime; + private DataGridViewTextBoxColumn CreateTime; } } \ No newline at end of file diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.cs index 8dfd1c1..42ce05d 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.cs @@ -8,14 +8,17 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using 材料热传导系数; namespace 外科辅料和患者防护罩激光抗性测试仪 { public partial class ReportForm : UIForm { + ConductivityRepository conductivityRepository; public ReportForm() { InitializeComponent(); + conductivityRepository = new ConductivityRepository(); } private void ReportForm_Load(object sender, EventArgs e) @@ -44,5 +47,16 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 { this.Close();//返回主页面 } + + private void uiButton1_Click(object sender, EventArgs e) + { + + var data= conductivityRepository.GetTestData(uiDatetimePicker1.Text.ToDateTime(), + uiDatetimePicker2.Text.ToDateTime()); + + uiDataGridView1.DataSource = data; + uiDataGridView1.Refresh(); + + } } } diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.resx b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.resx index ba3af5e..1858b35 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.resx +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.resx @@ -117,28 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - + True - + True - + True - + True - + True - + + True + + True diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪.csproj b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪.csproj index 4b256f2..874d712 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪.csproj +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪.csproj @@ -9,6 +9,8 @@ + +