外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs

@@ -23,6 +23,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪.Model
     public class PenetrationModel
     {
         public int sampleType2 { get; set; }
+        public string Id2 { get; set; }
         public string result2 { get; set; }
         public float? temperature2 { get; set; }
         public string O22 { get; set; }
@@ -36,6 +37,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪.Model
     public class SecondaryIgnitionModel
     {
         public int sampleType3 { get; set; }
+        public string Id3 { get; set; }
         public string result3 { get; set; }
         public string O23 { get; set; }
         public float? yuhui3 { get; set; }

外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs

@@ -91,7 +91,6 @@
             uiGroupBox4 = new Sunny.UI.UIGroupBox();
             uiButton13 = new Sunny.UI.UIButton();
             uiButton10 = new Sunny.UI.UIButton();
-            uiButton9 = new Sunny.UI.UIButton();
             uiLabel46 = new Sunny.UI.UILabel();
             uiLabel47 = new Sunny.UI.UILabel();
             uiLabel44 = new Sunny.UI.UILabel();
@@ -112,6 +111,8 @@
             uiLabel43 = new Sunny.UI.UILabel();
             uiGroupBox5 = new Sunny.UI.UIGroupBox();
             uiLabel16 = new Sunny.UI.UILabel();
+            uiLabel50 = new Sunny.UI.UILabel();
+            uiLabel51 = new Sunny.UI.UILabel();
             uiTableLayoutPanel1.SuspendLayout();
             uiTableLayoutPanel2.SuspendLayout();
             uiPanel3.SuspendLayout();
@@ -1160,9 +1161,10 @@
             // uiGroupBox4
             // 
             uiGroupBox4.BackColor = Color.White;
+            uiGroupBox4.Controls.Add(uiLabel50);
+            uiGroupBox4.Controls.Add(uiLabel51);
             uiGroupBox4.Controls.Add(uiButton13);
             uiGroupBox4.Controls.Add(uiButton10);
-            uiGroupBox4.Controls.Add(uiButton9);
             uiGroupBox4.Controls.Add(uiLabel46);
             uiGroupBox4.Controls.Add(uiLabel47);
             uiGroupBox4.Controls.Add(uiLabel44);
@@ -1208,7 +1210,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(116, 779);
+            uiButton13.Location = new Point(116, 780);
             uiButton13.MinimumSize = new Size(1, 1);
             uiButton13.Name = "uiButton13";
             uiButton13.Radius = 6;
@@ -1233,7 +1235,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(116, 684);
+            uiButton10.Location = new Point(116, 685);
             uiButton10.MinimumSize = new Size(1, 1);
             uiButton10.Name = "uiButton10";
             uiButton10.Radius = 6;
@@ -1249,30 +1251,6 @@
             uiButton10.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiButton10.Click += uiButton10_Click;
             // 
-            // uiButton9
-            // 
-            uiButton9.Cursor = Cursors.Hand;
-            uiButton9.FillColor = Color.FromArgb(103, 194, 58);
-            uiButton9.FillColor2 = Color.FromArgb(103, 194, 58);
-            uiButton9.FillHoverColor = Color.FromArgb(133, 206, 97);
-            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(116, 589);
-            uiButton9.MinimumSize = new Size(1, 1);
-            uiButton9.Name = "uiButton9";
-            uiButton9.Radius = 6;
-            uiButton9.RectColor = Color.FromArgb(103, 194, 58);
-            uiButton9.RectHoverColor = Color.FromArgb(133, 206, 97);
-            uiButton9.RectPressColor = Color.FromArgb(84, 178, 38);
-            uiButton9.RectSelectedColor = Color.FromArgb(84, 178, 38);
-            uiButton9.Size = new Size(208, 56);
-            uiButton9.Style = Sunny.UI.UIStyle.Custom;
-            uiButton9.StyleCustomMode = true;
-            uiButton9.TabIndex = 25;
-            uiButton9.Text = "保存结果";
-            uiButton9.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            // 
             // uiLabel46
             // 
             uiLabel46.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134);
@@ -1539,6 +1517,31 @@
             uiLabel16.TabIndex = 0;
             uiLabel16.Text = "P1:t ≥ 10 s\r\nP2:3 s ≤ t≤ 10 s\r\nP3:1 s ≤ t ≤3 s\r\nP4:t≤1 s\r\n\r\n注: P1材料需测量背面温度";
             // 
+            // uiLabel50
+            // 
+            uiLabel50.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134);
+            uiLabel50.ForeColor = Color.FromArgb(64, 158, 255);
+            uiLabel50.Location = new Point(161, 565);
+            uiLabel50.Name = "uiLabel50";
+            uiLabel50.Size = new Size(265, 31);
+            uiLabel50.Style = Sunny.UI.UIStyle.Custom;
+            uiLabel50.StyleCustomMode = true;
+            uiLabel50.TabIndex = 28;
+            uiLabel50.TextAlign = ContentAlignment.MiddleCenter;
+            // 
+            // uiLabel51
+            // 
+            uiLabel51.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel51.ForeColor = Color.FromArgb(96, 98, 102);
+            uiLabel51.Location = new Point(38, 564);
+            uiLabel51.Name = "uiLabel51";
+            uiLabel51.Size = new Size(136, 31);
+            uiLabel51.Style = Sunny.UI.UIStyle.Custom;
+            uiLabel51.StyleCustomMode = true;
+            uiLabel51.TabIndex = 27;
+            uiLabel51.Text = "测试时间:";
+            uiLabel51.TextAlign = ContentAlignment.MiddleLeft;
+            // 
             // PenetrationForm
             // 
             AutoScaleMode = AutoScaleMode.None;
@@ -1652,12 +1655,13 @@
         private Sunny.UI.UIButton uiButton8;
         private Sunny.UI.UIButton uiButton13;
         private Sunny.UI.UIButton uiButton10;
-        private Sunny.UI.UIButton uiButton9;
         private Sunny.UI.UILabel uiLabel33;
         private Sunny.UI.UILabel uiLabel34;
         private Sunny.UI.UILabel uiLabel38;
         private Sunny.UI.UILabel uiLabel39;
         private Sunny.UI.UILabel uiLabel48;
         private Sunny.UI.UILabel uiLabel49;
+        private Sunny.UI.UILabel uiLabel50;
+        private Sunny.UI.UILabel uiLabel51;
     }
 }

外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs

@@ -447,9 +447,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
             try
             {
                 string selectedO2Text = uiComboBox1.Text;
+                string id= uiLabel10.Text;
                 reportList.Add(new PenetrationModel
                 {
                     sampleType2 = sampleIndex,
+                    Id2 = id, 
                     O22 = selectedO2Text,
                     result2 = classify,
                     temperature2 = temperature,
@@ -457,7 +459,9 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                     yuyan2 = yy,
                     Isfire = isfire,
                     costTime2 = costtime,
-                    penetime2 = penetime
+                    penetime2 = penetime,
+                    Testtime2 = DateTime.Now
+
                 });
                 await Task.Delay(100);
             }
@@ -1068,8 +1072,6 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
         }
 
 
-
-
         #region 串口功率计
         private string _serialBuffer = "";
         private bool _waitingResponse = false;
@@ -1467,8 +1469,6 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
 
         #endregion
 
-
-
         private void uiComboBox2_SelectedIndexChanged(object sender, EventArgs e)
         {
             string value = uiComboBox2.SelectedItem.ToString();
@@ -1477,7 +1477,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
             {
                 case "样品1":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType2 == 1);
+                        var data = reportList?.OrderByDescending(s => s.Testtime2).FirstOrDefault(x => x.sampleType2 == 1);
                         uiLabel21.Text = data?.O22.ToString() ?? string.Empty;
                         uiLabel44.Text = data?.result2.ToString() ?? string.Empty;
                         uiLabel41.Text = data?.temperature2.ToString() ?? string.Empty;
@@ -1486,11 +1486,12 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         uiLabel18.Text = data?.Isfire.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.costTime2.ToString() ?? string.Empty;
                         uiLabel46.Text = data?.penetime2.ToString() ?? string.Empty;
+                        uiLabel50.Text = data?.Testtime2.ToString() ?? string.Empty;
                         break;
                     }
                 case "样品2":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType2 == 2);
+                        var data = reportList?.OrderByDescending(s => s.Testtime2).FirstOrDefault(x => x.sampleType2 == 2);
                         uiLabel21.Text = data?.O22.ToString() ?? string.Empty;
                         uiLabel44.Text = data?.result2.ToString() ?? string.Empty;
                         uiLabel41.Text = data?.temperature2.ToString() ?? string.Empty;
@@ -1499,11 +1500,12 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         uiLabel18.Text = data?.Isfire.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.costTime2.ToString() ?? string.Empty;
                         uiLabel46.Text = data?.penetime2.ToString() ?? string.Empty;
+                        uiLabel50.Text = data?.Testtime2.ToString() ?? string.Empty;
                         break;
                     }
                 case "样品3":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType2 == 3);
+                        var data = reportList?.OrderByDescending(s => s.Testtime2).FirstOrDefault(x => x.sampleType2 == 3);
                         uiLabel21.Text = data?.O22.ToString() ?? string.Empty;
                         uiLabel44.Text = data?.result2.ToString() ?? string.Empty;
                         uiLabel41.Text = data?.temperature2.ToString() ?? string.Empty;
@@ -1512,11 +1514,12 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         uiLabel18.Text = data?.Isfire.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.costTime2.ToString() ?? string.Empty;
                         uiLabel46.Text = data?.penetime2.ToString() ?? string.Empty;
+                        uiLabel50.Text = data?.Testtime2.ToString() ?? string.Empty;
                         break;
                     }
                 case "样品4":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType2 == 4);
+                        var data = reportList?.OrderByDescending(s => s.Testtime2).FirstOrDefault(x => x.sampleType2 == 4);
                         uiLabel21.Text = data?.O22.ToString() ?? string.Empty;
                         uiLabel44.Text = data?.result2.ToString() ?? string.Empty;
                         uiLabel41.Text = data?.temperature2.ToString() ?? string.Empty;
@@ -1525,11 +1528,12 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         uiLabel18.Text = data?.Isfire.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.costTime2.ToString() ?? string.Empty;
                         uiLabel46.Text = data?.penetime2.ToString() ?? string.Empty;
+                        uiLabel50.Text = data?.Testtime2.ToString() ?? string.Empty;
                         break;
                     }
                 case "样品5":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType2 == 5);
+                        var data = reportList?.OrderByDescending(s => s.Testtime2).FirstOrDefault(x => x.sampleType2 == 5);
                         uiLabel21.Text = data?.O22.ToString() ?? string.Empty;
                         uiLabel44.Text = data?.result2.ToString() ?? string.Empty;
                         uiLabel41.Text = data?.temperature2.ToString() ?? string.Empty;
@@ -1538,6 +1542,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         uiLabel18.Text = data?.Isfire.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.costTime2.ToString() ?? string.Empty;
                         uiLabel46.Text = data?.penetime2.ToString() ?? string.Empty;
+                        uiLabel50.Text = data?.Testtime2.ToString() ?? string.Empty;
                         break;
                     }
                 default:

外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs

@@ -80,9 +80,10 @@
             uiTableLayoutPanel4 = new Sunny.UI.UITableLayoutPanel();
             uiTableLayoutPanel5 = new Sunny.UI.UITableLayoutPanel();
             uiGroupBox4 = new Sunny.UI.UIGroupBox();
+            uiLabel42 = new Sunny.UI.UILabel();
+            uiLabel43 = new Sunny.UI.UILabel();
             uiButton13 = new Sunny.UI.UIButton();
             uiButton10 = new Sunny.UI.UIButton();
-            uiButton9 = new Sunny.UI.UIButton();
             uiLabel21 = new Sunny.UI.UILabel();
             uiLabel27 = new Sunny.UI.UILabel();
             uiLabel18 = new Sunny.UI.UILabel();
@@ -101,8 +102,6 @@
             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();
@@ -706,24 +705,24 @@
             // uiButton12
             // 
             uiButton12.Cursor = Cursors.Hand;
-            uiButton12.FillColor = Color.FromArgb(64, 158, 255);
-            uiButton12.FillColor2 = Color.FromArgb(64, 158, 255);
-            uiButton12.FillHoverColor = Color.FromArgb(102, 177, 255);
-            uiButton12.FillPressColor = Color.FromArgb(47, 144, 255);
-            uiButton12.FillSelectedColor = Color.FromArgb(47, 144, 255);
+            uiButton12.FillColor = Color.FromArgb(80, 200, 220);
+            uiButton12.FillColor2 = Color.FromArgb(50, 150, 180);
+            uiButton12.FillHoverColor = Color.FromArgb(100, 220, 240);
+            uiButton12.FillPressColor = Color.FromArgb(40, 130, 160);
+            uiButton12.FillSelectedColor = Color.FromArgb(40, 130, 160);
             uiButton12.Font = new Font("微软雅黑", 10.5F, FontStyle.Bold | FontStyle.Italic, GraphicsUnit.Point, 134);
-            uiButton12.Location = new Point(777, 270);
+            uiButton12.Location = new Point(752, 246);
             uiButton12.MinimumSize = new Size(1, 1);
             uiButton12.Name = "uiButton12";
             uiButton12.Radius = 6;
-            uiButton12.RectColor = Color.FromArgb(64, 158, 255);
-            uiButton12.RectHoverColor = Color.FromArgb(102, 177, 255);
-            uiButton12.RectPressColor = Color.FromArgb(47, 144, 255);
-            uiButton12.RectSelectedColor = Color.FromArgb(47, 144, 255);
+            uiButton12.RectColor = Color.FromArgb(80, 200, 220);
+            uiButton12.RectHoverColor = Color.FromArgb(100, 220, 240);
+            uiButton12.RectPressColor = Color.FromArgb(40, 130, 160);
+            uiButton12.RectSelectedColor = Color.FromArgb(40, 130, 160);
             uiButton12.Size = new Size(130, 75);
             uiButton12.Style = Sunny.UI.UIStyle.Custom;
             uiButton12.StyleCustomMode = true;
-            uiButton12.TabIndex = 19;
+            uiButton12.TabIndex = 17;
             uiButton12.Text = "火焰自熄";
             uiButton12.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiButton12.Click += uiButton12_Click;
@@ -731,24 +730,24 @@
             // uiButton11
             // 
             uiButton11.Cursor = Cursors.Hand;
-            uiButton11.FillColor = Color.FromArgb(64, 158, 255);
-            uiButton11.FillColor2 = Color.FromArgb(64, 158, 255);
-            uiButton11.FillHoverColor = Color.FromArgb(102, 177, 255);
-            uiButton11.FillPressColor = Color.FromArgb(47, 144, 255);
-            uiButton11.FillSelectedColor = Color.FromArgb(47, 144, 255);
+            uiButton11.FillColor = Color.FromArgb(255, 80, 40);
+            uiButton11.FillColor2 = Color.FromArgb(220, 40, 10);
+            uiButton11.FillHoverColor = Color.FromArgb(255, 100, 60);
+            uiButton11.FillPressColor = Color.FromArgb(190, 30, 5);
+            uiButton11.FillSelectedColor = Color.FromArgb(190, 30, 5);
             uiButton11.Font = new Font("微软雅黑", 10.5F, FontStyle.Bold | FontStyle.Italic, GraphicsUnit.Point, 134);
-            uiButton11.Location = new Point(777, 165);
+            uiButton11.Location = new Point(752, 139);
             uiButton11.MinimumSize = new Size(1, 1);
             uiButton11.Name = "uiButton11";
             uiButton11.Radius = 6;
-            uiButton11.RectColor = Color.FromArgb(64, 158, 255);
-            uiButton11.RectHoverColor = Color.FromArgb(102, 177, 255);
-            uiButton11.RectPressColor = Color.FromArgb(47, 144, 255);
-            uiButton11.RectSelectedColor = Color.FromArgb(47, 144, 255);
+            uiButton11.RectColor = Color.FromArgb(255, 80, 40);
+            uiButton11.RectHoverColor = Color.FromArgb(255, 100, 60);
+            uiButton11.RectPressColor = Color.FromArgb(190, 30, 5);
+            uiButton11.RectSelectedColor = Color.FromArgb(190, 30, 5);
             uiButton11.Size = new Size(130, 75);
             uiButton11.Style = Sunny.UI.UIStyle.Custom;
             uiButton11.StyleCustomMode = true;
-            uiButton11.TabIndex = 18;
+            uiButton11.TabIndex = 16;
             uiButton11.Text = "火焰未自熄";
             uiButton11.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiButton11.Click += uiButton11_Click;
@@ -1034,7 +1033,6 @@
             uiGroupBox4.Controls.Add(uiLabel43);
             uiGroupBox4.Controls.Add(uiButton13);
             uiGroupBox4.Controls.Add(uiButton10);
-            uiGroupBox4.Controls.Add(uiButton9);
             uiGroupBox4.Controls.Add(uiLabel21);
             uiGroupBox4.Controls.Add(uiLabel27);
             uiGroupBox4.Controls.Add(uiLabel18);
@@ -1069,6 +1067,31 @@
             uiGroupBox4.Text = "测试结果";
             uiGroupBox4.TextAlignment = ContentAlignment.MiddleLeft;
             // 
+            // 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;
+            // 
             // uiButton13
             // 
             uiButton13.Cursor = Cursors.Hand;
@@ -1119,30 +1142,6 @@
             uiButton10.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiButton10.Click += uiButton10_Click_1;
             // 
-            // uiButton9
-            // 
-            uiButton9.Cursor = Cursors.Hand;
-            uiButton9.FillColor = Color.FromArgb(103, 194, 58);
-            uiButton9.FillColor2 = Color.FromArgb(103, 194, 58);
-            uiButton9.FillHoverColor = Color.FromArgb(133, 206, 97);
-            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, 597);
-            uiButton9.MinimumSize = new Size(1, 1);
-            uiButton9.Name = "uiButton9";
-            uiButton9.Radius = 6;
-            uiButton9.RectColor = Color.FromArgb(103, 194, 58);
-            uiButton9.RectHoverColor = Color.FromArgb(133, 206, 97);
-            uiButton9.RectPressColor = Color.FromArgb(84, 178, 38);
-            uiButton9.RectSelectedColor = Color.FromArgb(84, 178, 38);
-            uiButton9.Size = new Size(208, 56);
-            uiButton9.Style = Sunny.UI.UIStyle.Custom;
-            uiButton9.StyleCustomMode = true;
-            uiButton9.TabIndex = 20;
-            uiButton9.Text = "保存结果";
-            uiButton9.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            // 
             // uiLabel21
             // 
             uiLabel21.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134);
@@ -1384,31 +1383,6 @@
             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;
@@ -1512,7 +1486,6 @@
         private Sunny.UI.UIButton uiButton11;
         private Sunny.UI.UIButton uiButton13;
         private Sunny.UI.UIButton uiButton10;
-        private Sunny.UI.UIButton uiButton9;
         private Sunny.UI.UILabel uiLabel36;
         private Sunny.UI.UILabel uiLabel39;
         private Sunny.UI.UILabel uiLabel40;

外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs

@@ -321,12 +321,12 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
 
 
         List<PrimaryIgnitionModel> reportList = new List<PrimaryIgnitionModel>();
-        private string classify;
-        private float firetime;
-        private float yy;
-        private float yh;
-        private bool iszixi;
-        private double costtime;
+        private string classify = null;
+        private float firetime=0;
+        private float yy=0;
+        private float yh=0;
+        private bool iszixi=false;
+        private double costtime=0;
         private async Task<PrimaryIgnitionModel> InsertReportAsync()
         {
             if (uiLabel10.Text != null && uiLabel10.Text.Trim() == "1")
@@ -1049,7 +1049,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
             {
                 case "样品1":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType == 1);
+                        var data = reportList? .OrderByDescending(s => s.Testtime).FirstOrDefault(x => x.sampleType == 1);
                         uiLabel21.Text = data?.O2.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.result.ToString() ?? string.Empty;
                         uiLabel31.Text = data?.FireDate.ToString() ?? string.Empty;
@@ -1062,7 +1062,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                     }
                 case "样品2":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType == 2);
+                        var data = reportList?.OrderByDescending(s => s.Testtime).FirstOrDefault(x => x.sampleType == 2);
                         uiLabel21.Text = data?.O2.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.result.ToString() ?? string.Empty;
                         uiLabel31.Text = data?.FireDate.ToString() ?? string.Empty;
@@ -1075,7 +1075,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                     }
                 case "样品3":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType == 3);
+                        var data = reportList?.OrderByDescending(s => s.Testtime).FirstOrDefault(x => x.sampleType == 3);
                         uiLabel21.Text = data?.O2.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.result.ToString() ?? string.Empty;
                         uiLabel31.Text = data?.FireDate.ToString() ?? string.Empty;
@@ -1088,7 +1088,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                     }
                 case "样品4":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType == 4);
+                        var data = reportList?.OrderByDescending(s => s.Testtime).FirstOrDefault(x => x.sampleType == 4);
                         uiLabel21.Text = data?.O2.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.result.ToString() ?? string.Empty;
                         uiLabel31.Text = data?.FireDate.ToString() ?? string.Empty;
@@ -1101,7 +1101,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                     }
                 case "样品5":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType == 5);
+                        var data = reportList?.OrderByDescending(s => s.Testtime).FirstOrDefault(x => x.sampleType == 5);
                         uiLabel21.Text = data?.O2.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.result.ToString() ?? string.Empty;
                         uiLabel31.Text = data?.FireDate.ToString() ?? string.Empty;

外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.Designer.cs

@@ -33,6 +33,14 @@
             DataGridViewCellStyle dataGridViewCellStyle11 = new DataGridViewCellStyle();
             DataGridViewCellStyle dataGridViewCellStyle12 = new DataGridViewCellStyle();
             DataGridViewCellStyle dataGridViewCellStyle13 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle3 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle4 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle5 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle6 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle7 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle8 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle9 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle10 = new DataGridViewCellStyle();
             DataGridViewCellStyle dataGridViewCellStyle14 = new DataGridViewCellStyle();
             DataGridViewCellStyle dataGridViewCellStyle15 = new DataGridViewCellStyle();
             DataGridViewCellStyle dataGridViewCellStyle16 = new DataGridViewCellStyle();
@@ -43,14 +51,6 @@
             DataGridViewCellStyle dataGridViewCellStyle21 = new DataGridViewCellStyle();
             DataGridViewCellStyle dataGridViewCellStyle22 = new DataGridViewCellStyle();
             DataGridViewCellStyle dataGridViewCellStyle23 = new DataGridViewCellStyle();
-            DataGridViewCellStyle dataGridViewCellStyle3 = new DataGridViewCellStyle();
-            DataGridViewCellStyle dataGridViewCellStyle4 = new DataGridViewCellStyle();
-            DataGridViewCellStyle dataGridViewCellStyle5 = new DataGridViewCellStyle();
-            DataGridViewCellStyle dataGridViewCellStyle6 = new DataGridViewCellStyle();
-            DataGridViewCellStyle dataGridViewCellStyle7 = new DataGridViewCellStyle();
-            DataGridViewCellStyle dataGridViewCellStyle8 = new DataGridViewCellStyle();
-            DataGridViewCellStyle dataGridViewCellStyle9 = new DataGridViewCellStyle();
-            DataGridViewCellStyle dataGridViewCellStyle10 = new DataGridViewCellStyle();
             uiTableLayoutPanel1 = new Sunny.UI.UITableLayoutPanel();
             uiPanel2 = new Sunny.UI.UIPanel();
             uiGroupBox2 = new Sunny.UI.UIGroupBox();
@@ -58,6 +58,15 @@
             uiTabControl1 = new Sunny.UI.UITabControl();
             tabPage1 = new TabPage();
             uiDataGridView1 = new Sunny.UI.UIDataGridView();
+            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();
             tabPage2 = new TabPage();
             uiDataGridView2 = new Sunny.UI.UIDataGridView();
             dataGridViewTextBoxColumn1 = new DataGridViewTextBoxColumn();
@@ -95,15 +104,6 @@
             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();
@@ -280,13 +280,118 @@
             uiDataGridView1.StripeOddColor = Color.FromArgb(240, 248, 255);
             uiDataGridView1.TabIndex = 0;
             // 
+            // 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;
+            // 
             // tabPage2
             // 
             tabPage2.BackColor = Color.White;
             tabPage2.Controls.Add(uiDataGridView2);
-            tabPage2.Location = new Point(0, 40);
+            tabPage2.Location = new Point(0, 45);
             tabPage2.Name = "tabPage2";
-            tabPage2.Size = new Size(200, 60);
+            tabPage2.Size = new Size(1375, 802);
             tabPage2.TabIndex = 1;
             tabPage2.Text = "📈 穿透性测试报告";
             // 
@@ -335,7 +440,7 @@
             dataGridViewCellStyle18.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiDataGridView2.RowsDefaultCellStyle = dataGridViewCellStyle18;
             uiDataGridView2.SelectedIndex = -1;
-            uiDataGridView2.Size = new Size(200, 60);
+            uiDataGridView2.Size = new Size(1375, 802);
             uiDataGridView2.StripeOddColor = Color.FromArgb(240, 248, 255);
             uiDataGridView2.TabIndex = 1;
             // 
@@ -415,9 +520,9 @@
             // 
             tabPage3.BackColor = Color.White;
             tabPage3.Controls.Add(uiDataGridView3);
-            tabPage3.Location = new Point(0, 40);
+            tabPage3.Location = new Point(0, 45);
             tabPage3.Name = "tabPage3";
-            tabPage3.Size = new Size(200, 60);
+            tabPage3.Size = new Size(1375, 802);
             tabPage3.TabIndex = 2;
             tabPage3.Text = "🔥 二次点火测试报告";
             // 
@@ -466,7 +571,7 @@
             dataGridViewCellStyle23.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiDataGridView3.RowsDefaultCellStyle = dataGridViewCellStyle23;
             uiDataGridView3.SelectedIndex = -1;
-            uiDataGridView3.Size = new Size(200, 60);
+            uiDataGridView3.Size = new Size(1375, 802);
             uiDataGridView3.StripeOddColor = Color.FromArgb(240, 248, 255);
             uiDataGridView3.TabIndex = 1;
             // 
@@ -770,111 +875,6 @@
             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;

外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.Designer.cs

@@ -84,7 +84,6 @@
             uiLabel11 = new Sunny.UI.UILabel();
             uiButton13 = new Sunny.UI.UIButton();
             uiButton10 = new Sunny.UI.UIButton();
-            uiButton9 = new Sunny.UI.UIButton();
             uiLabel21 = new Sunny.UI.UILabel();
             uiLabel27 = new Sunny.UI.UILabel();
             uiLabel18 = new Sunny.UI.UILabel();
@@ -97,6 +96,8 @@
             uiLabel20 = new Sunny.UI.UILabel();
             uiComboBox3 = new Sunny.UI.UIComboBox();
             uiLabel17 = new Sunny.UI.UILabel();
+            uiLabel42 = new Sunny.UI.UILabel();
+            uiLabel43 = new Sunny.UI.UILabel();
             uiTableLayoutPanel1.SuspendLayout();
             uiTableLayoutPanel2.SuspendLayout();
             uiPanel3.SuspendLayout();
@@ -734,20 +735,20 @@
             // uiButton12
             // 
             uiButton12.Cursor = Cursors.Hand;
-            uiButton12.FillColor = Color.FromArgb(64, 158, 255);
-            uiButton12.FillColor2 = Color.FromArgb(64, 158, 255);
-            uiButton12.FillHoverColor = Color.FromArgb(102, 177, 255);
-            uiButton12.FillPressColor = Color.FromArgb(47, 144, 255);
-            uiButton12.FillSelectedColor = Color.FromArgb(47, 144, 255);
+            uiButton12.FillColor = Color.FromArgb(80, 200, 220);
+            uiButton12.FillColor2 = Color.FromArgb(50, 150, 180);
+            uiButton12.FillHoverColor = Color.FromArgb(100, 220, 240);
+            uiButton12.FillPressColor = Color.FromArgb(40, 130, 160);
+            uiButton12.FillSelectedColor = Color.FromArgb(40, 130, 160);
             uiButton12.Font = new Font("微软雅黑", 10.5F, FontStyle.Bold | FontStyle.Italic, GraphicsUnit.Point, 134);
             uiButton12.Location = new Point(752, 246);
             uiButton12.MinimumSize = new Size(1, 1);
             uiButton12.Name = "uiButton12";
             uiButton12.Radius = 6;
-            uiButton12.RectColor = Color.FromArgb(64, 158, 255);
-            uiButton12.RectHoverColor = Color.FromArgb(102, 177, 255);
-            uiButton12.RectPressColor = Color.FromArgb(47, 144, 255);
-            uiButton12.RectSelectedColor = Color.FromArgb(47, 144, 255);
+            uiButton12.RectColor = Color.FromArgb(80, 200, 220);
+            uiButton12.RectHoverColor = Color.FromArgb(100, 220, 240);
+            uiButton12.RectPressColor = Color.FromArgb(40, 130, 160);
+            uiButton12.RectSelectedColor = Color.FromArgb(40, 130, 160);
             uiButton12.Size = new Size(130, 75);
             uiButton12.Style = Sunny.UI.UIStyle.Custom;
             uiButton12.StyleCustomMode = true;
@@ -759,20 +760,20 @@
             // uiButton11
             // 
             uiButton11.Cursor = Cursors.Hand;
-            uiButton11.FillColor = Color.FromArgb(64, 158, 255);
-            uiButton11.FillColor2 = Color.FromArgb(64, 158, 255);
-            uiButton11.FillHoverColor = Color.FromArgb(102, 177, 255);
-            uiButton11.FillPressColor = Color.FromArgb(47, 144, 255);
-            uiButton11.FillSelectedColor = Color.FromArgb(47, 144, 255);
+            uiButton11.FillColor = Color.FromArgb(255, 80, 40);
+            uiButton11.FillColor2 = Color.FromArgb(220, 40, 10);
+            uiButton11.FillHoverColor = Color.FromArgb(255, 100, 60);
+            uiButton11.FillPressColor = Color.FromArgb(190, 30, 5);
+            uiButton11.FillSelectedColor = Color.FromArgb(190, 30, 5);
             uiButton11.Font = new Font("微软雅黑", 10.5F, FontStyle.Bold | FontStyle.Italic, GraphicsUnit.Point, 134);
             uiButton11.Location = new Point(752, 139);
             uiButton11.MinimumSize = new Size(1, 1);
             uiButton11.Name = "uiButton11";
             uiButton11.Radius = 6;
-            uiButton11.RectColor = Color.FromArgb(64, 158, 255);
-            uiButton11.RectHoverColor = Color.FromArgb(102, 177, 255);
-            uiButton11.RectPressColor = Color.FromArgb(47, 144, 255);
-            uiButton11.RectSelectedColor = Color.FromArgb(47, 144, 255);
+            uiButton11.RectColor = Color.FromArgb(255, 80, 40);
+            uiButton11.RectHoverColor = Color.FromArgb(255, 100, 60);
+            uiButton11.RectPressColor = Color.FromArgb(190, 30, 5);
+            uiButton11.RectSelectedColor = Color.FromArgb(190, 30, 5);
             uiButton11.Size = new Size(130, 75);
             uiButton11.Style = Sunny.UI.UIStyle.Custom;
             uiButton11.StyleCustomMode = true;
@@ -822,20 +823,20 @@
             // uiButton6
             // 
             uiButton6.Cursor = Cursors.Hand;
-            uiButton6.FillColor = Color.FromArgb(64, 158, 255);
-            uiButton6.FillColor2 = Color.FromArgb(64, 158, 255);
-            uiButton6.FillHoverColor = Color.FromArgb(102, 177, 255);
-            uiButton6.FillPressColor = Color.FromArgb(47, 144, 255);
-            uiButton6.FillSelectedColor = Color.FromArgb(47, 144, 255);
+            uiButton6.FillColor = Color.FromArgb(255, 120, 40);
+            uiButton6.FillColor2 = Color.FromArgb(200, 60, 20);
+            uiButton6.FillHoverColor = Color.FromArgb(255, 140, 60);
+            uiButton6.FillPressColor = Color.FromArgb(180, 50, 15);
+            uiButton6.FillSelectedColor = Color.FromArgb(180, 50, 15);
             uiButton6.Font = new Font("微软雅黑", 10.5F, FontStyle.Bold | FontStyle.Italic, GraphicsUnit.Point, 134);
             uiButton6.Location = new Point(752, 32);
             uiButton6.MinimumSize = new Size(1, 1);
             uiButton6.Name = "uiButton6";
             uiButton6.Radius = 6;
-            uiButton6.RectColor = Color.FromArgb(64, 158, 255);
-            uiButton6.RectHoverColor = Color.FromArgb(102, 177, 255);
-            uiButton6.RectPressColor = Color.FromArgb(47, 144, 255);
-            uiButton6.RectSelectedColor = Color.FromArgb(47, 144, 255);
+            uiButton6.RectColor = Color.FromArgb(255, 120, 40);
+            uiButton6.RectHoverColor = Color.FromArgb(255, 140, 60);
+            uiButton6.RectPressColor = Color.FromArgb(180, 50, 15);
+            uiButton6.RectSelectedColor = Color.FromArgb(180, 50, 15);
             uiButton6.Size = new Size(130, 75);
             uiButton6.Style = Sunny.UI.UIStyle.Custom;
             uiButton6.StyleCustomMode = true;
@@ -1040,11 +1041,12 @@
             // uiGroupBox4
             // 
             uiGroupBox4.BackColor = Color.White;
+            uiGroupBox4.Controls.Add(uiLabel42);
+            uiGroupBox4.Controls.Add(uiLabel43);
             uiGroupBox4.Controls.Add(uiLabel10);
             uiGroupBox4.Controls.Add(uiLabel11);
             uiGroupBox4.Controls.Add(uiButton13);
             uiGroupBox4.Controls.Add(uiButton10);
-            uiGroupBox4.Controls.Add(uiButton9);
             uiGroupBox4.Controls.Add(uiLabel21);
             uiGroupBox4.Controls.Add(uiLabel27);
             uiGroupBox4.Controls.Add(uiLabel18);
@@ -1150,30 +1152,6 @@
             uiButton10.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiButton10.Click += uiButton10_Click_1;
             // 
-            // uiButton9
-            // 
-            uiButton9.Cursor = Cursors.Hand;
-            uiButton9.FillColor = Color.FromArgb(103, 194, 58);
-            uiButton9.FillColor2 = Color.FromArgb(103, 194, 58);
-            uiButton9.FillHoverColor = Color.FromArgb(133, 206, 97);
-            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(138, 483);
-            uiButton9.MinimumSize = new Size(1, 1);
-            uiButton9.Name = "uiButton9";
-            uiButton9.Radius = 6;
-            uiButton9.RectColor = Color.FromArgb(103, 194, 58);
-            uiButton9.RectHoverColor = Color.FromArgb(133, 206, 97);
-            uiButton9.RectPressColor = Color.FromArgb(84, 178, 38);
-            uiButton9.RectSelectedColor = Color.FromArgb(84, 178, 38);
-            uiButton9.Size = new Size(208, 56);
-            uiButton9.Style = Sunny.UI.UIStyle.Custom;
-            uiButton9.StyleCustomMode = true;
-            uiButton9.TabIndex = 36;
-            uiButton9.Text = "保存结果";
-            uiButton9.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            // 
             // uiLabel21
             // 
             uiLabel21.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134);
@@ -1336,6 +1314,31 @@
             uiLabel17.Text = "测试样品项:";
             uiLabel17.TextAlign = ContentAlignment.MiddleLeft;
             // 
+            // uiLabel42
+            // 
+            uiLabel42.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134);
+            uiLabel42.ForeColor = Color.FromArgb(64, 158, 255);
+            uiLabel42.Location = new Point(171, 433);
+            uiLabel42.Name = "uiLabel42";
+            uiLabel42.Size = new Size(265, 31);
+            uiLabel42.Style = Sunny.UI.UIStyle.Custom;
+            uiLabel42.StyleCustomMode = true;
+            uiLabel42.TabIndex = 41;
+            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(48, 432);
+            uiLabel43.Name = "uiLabel43";
+            uiLabel43.Size = new Size(136, 31);
+            uiLabel43.Style = Sunny.UI.UIStyle.Custom;
+            uiLabel43.StyleCustomMode = true;
+            uiLabel43.TabIndex = 40;
+            uiLabel43.Text = "测试时间:";
+            uiLabel43.TextAlign = ContentAlignment.MiddleLeft;
+            // 
             // SecondaryIgnitionForm
             // 
             AutoScaleMode = AutoScaleMode.None;
@@ -1429,7 +1432,6 @@
         private Sunny.UI.UIButton uiButton8;
         private Sunny.UI.UIButton uiButton13;
         private Sunny.UI.UIButton uiButton10;
-        private Sunny.UI.UIButton uiButton9;
         private Sunny.UI.UILabel uiLabel10;
         private Sunny.UI.UILabel uiLabel11;
         private Sunny.UI.UILabel uiLabel36;
@@ -1439,5 +1441,7 @@
         private Sunny.UI.UILabel uiLabel48;
         private Sunny.UI.UILabel uiLabel49;
         private Sunny.UI.UILabel uiLabel15;
+        private Sunny.UI.UILabel uiLabel42;
+        private Sunny.UI.UILabel uiLabel43;
     }
 }

外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/SecondaryIgnitionForm.cs

@@ -293,11 +293,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
 
 
         List<SecondaryIgnitionModel> reportList = new List<SecondaryIgnitionModel>();
-        private string classify;
-        private float yy;
-        private float yh;
-        private bool iszixi;
-        private bool isdianhuo;
+        private string classify=null;
+        private float yy=0;
+        private float yh=0;
+        private bool iszixi=false;
+        private bool isdianhuo=false;
         private async Task InsertReportAsync()
         {
             if (uiComboBox2.Text != null && uiComboBox2.Text.Trim() == "样品1")
@@ -311,12 +311,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                 {
                     classify = "SI3";//分类
 
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                     if (value2[0])
                     {
                         iszixi = true;  //自熄
@@ -339,12 +340,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                 {
                     classify = "SI2";//分类
 
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                     if (value2[0])
                     {
                         iszixi = true;  //自熄
@@ -367,12 +369,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                     classify = "SI1";//分类
                     iszixi = false;
                     isdianhuo = false;
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                 }
 
             }
@@ -389,12 +392,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                 {
                     classify = "SI3";//分类
 
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                     if (value2[0])
                     {
                         iszixi = true;  //自熄
@@ -416,13 +420,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                 else if (value1 != null && value1.Length > 0 && value1[0] && value2 != null && value2.Length > 0 && value2[0])
                 {
                     classify = "SI2";//分类
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
 
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                     if (value2[0])
                     {
                         iszixi = true;  //自熄
@@ -445,12 +449,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                     classify = "SI1";//分类
                     iszixi = false;
                     isdianhuo = false;
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                 }
             }
 
@@ -466,12 +471,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                 {
                     classify = "SI3";//分类
 
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                     if (value2[0])
                     {
                         iszixi = true;  //自熄
@@ -494,12 +500,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                 {
                     classify = "SI2";//分类
 
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                     if (value2[0])
                     {
                         iszixi = true;  //自熄
@@ -522,12 +529,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                     classify = "SI1";//分类
                     iszixi = false;
                     isdianhuo = false;
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                 }
             }
 
@@ -542,12 +550,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                 {
                     classify = "SI3";//分类
 
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                     if (value2[0])
                     {
                         iszixi = true;  //自熄
@@ -570,12 +579,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                 {
                     classify = "SI2";//分类
 
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                     if (value2[0])
                     {
                         iszixi = true;  //自熄
@@ -598,12 +608,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                     classify = "SI1";//分类
                     iszixi = false;
                     isdianhuo = false;
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                 }
             }
 
@@ -618,12 +629,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                 {
                     classify = "SI3";//分类
 
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                     if (value2[0])
                     {
                         iszixi = true;  //自熄
@@ -646,12 +658,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                 {
                     classify = "SI2";//分类
 
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                     if (value2[0])
                     {
                         iszixi = true;  //自熄
@@ -674,12 +687,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                     classify = "SI1";//分类
                     iszixi = false;
                     isdianhuo = false;
-                    ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
-                    if (yhlocation != null && yhlocation.Length >= 3)
-                    {
-                        yy = c.UshortToFloat(yhlocation[1], yhlocation[0]); //余焰
-                        yh = c.UshortToFloat(yhlocation[3], yhlocation[2]);//余辉
-                    }
+                    //ushort[] yhlocation = _modbusMaster?.ReadHoldingRegisters(1, 330, 4);
+                    //if (yhlocation != null && yhlocation.Length >= 3)
+                    //{
+                    yy = float.Parse(uiLabel8.Text);//余焰
+
+                    yh = float.Parse(uiLabel12.Text);
+                    //}
                 }
             }
 
@@ -687,8 +701,10 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
             try
             {
                 string selectedO2Text = uiComboBox1.Text;
+                string id = uiComboBox2.Text;
                 reportList.Add(new SecondaryIgnitionModel
                 {
+                    Id3 = id,
                     Iszixi3 = iszixi,
                     Isdianhuo3 = isdianhuo,
                     O23 = selectedO2Text,
@@ -699,7 +715,8 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                     : uiComboBox2.Text.Contains("4") ? 4
                     : uiComboBox2.Text.Contains("5") ? 5 : 0,
                     yuhui3 = yh,
-                    yuyan3 = yy
+                    yuyan3 = yy,
+                    Testtime3 = DateTime.Now
                 });
                 await Task.Delay(100);
 
@@ -917,57 +934,62 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
             {
                 case "样品1":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType3 == 1);
+                        var data = reportList?.OrderByDescending(s => s.Testtime3).FirstOrDefault(x => x.sampleType3 == 1);
                         uiLabel21.Text = data?.O23.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.result3.ToString() ?? string.Empty;
                         uiLabel27.Text = data?.yuyan3.ToString() ?? string.Empty;
                         uiLabel29.Text = data?.yuhui3.ToString() ?? string.Empty;
                         uiLabel18.Text = data?.Iszixi3.ToString() ?? string.Empty;
                         uiLabel10.Text = data?.Isdianhuo3.ToString() ?? string.Empty;
+                        uiLabel42.Text = data?.Testtime3.ToString() ?? string.Empty;
                         break;
                     }
                 case "样品2":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType3 == 2);
+                        var data = reportList?.OrderByDescending(s => s.Testtime3).FirstOrDefault(x => x.sampleType3 == 2);
                         uiLabel21.Text = data?.O23.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.result3.ToString() ?? string.Empty;
                         uiLabel27.Text = data?.yuyan3.ToString() ?? string.Empty;
                         uiLabel29.Text = data?.yuhui3.ToString() ?? string.Empty;
                         uiLabel18.Text = data?.Iszixi3.ToString() ?? string.Empty;
                         uiLabel10.Text = data?.Isdianhuo3.ToString() ?? string.Empty;
+                        uiLabel42.Text = data?.Testtime3.ToString() ?? string.Empty;
                         break;
                     }
                 case "样品3":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType3 == 3);
+                        var data = reportList?.OrderByDescending(s => s.Testtime3).FirstOrDefault(x => x.sampleType3 == 3);
                         uiLabel21.Text = data?.O23.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.result3.ToString() ?? string.Empty;
                         uiLabel27.Text = data?.yuyan3.ToString() ?? string.Empty;
                         uiLabel29.Text = data?.yuhui3.ToString() ?? string.Empty;
                         uiLabel18.Text = data?.Iszixi3.ToString() ?? string.Empty;
                         uiLabel10.Text = data?.Isdianhuo3.ToString() ?? string.Empty;
+                        uiLabel42.Text = data?.Testtime3.ToString() ?? string.Empty;
                         break;
                     }
                 case "样品4":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType3 == 4);
+                        var data = reportList?.OrderByDescending(s => s.Testtime3).FirstOrDefault(x => x.sampleType3 == 4);
                         uiLabel21.Text = data?.O23.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.result3.ToString() ?? string.Empty;
                         uiLabel27.Text = data?.yuyan3.ToString() ?? string.Empty;
                         uiLabel29.Text = data?.yuhui3.ToString() ?? string.Empty;
                         uiLabel18.Text = data?.Iszixi3.ToString() ?? string.Empty;
                         uiLabel10.Text = data?.Isdianhuo3.ToString() ?? string.Empty;
+                        uiLabel42.Text = data?.Testtime3.ToString() ?? string.Empty;
                         break;
                     }
                 case "样品5":
                     {
-                        var data = reportList?.FirstOrDefault(x => x.sampleType3 == 5);
+                        var data = reportList?.OrderByDescending(s => s.Testtime3).FirstOrDefault(x => x.sampleType3 == 5);
                         uiLabel21.Text = data?.O23.ToString() ?? string.Empty;
                         uiLabel19.Text = data?.result3.ToString() ?? string.Empty;
                         uiLabel27.Text = data?.yuyan3.ToString() ?? string.Empty;
                         uiLabel29.Text = data?.yuhui3.ToString() ?? string.Empty;
                         uiLabel18.Text = data?.Iszixi3.ToString() ?? string.Empty;
                         uiLabel10.Text = data?.Isdianhuo3.ToString() ?? string.Empty;
+                        uiLabel42.Text = data?.Testtime3.ToString() ?? string.Empty;
                         break;
                     }
                 default: