From 0146a6acad951e551c8b0f17c6369d8c669540ca Mon Sep 17 00:00:00 2001 From: wxt Date: Mon, 5 Jan 2026 16:19:39 +0800 Subject: [PATCH] --- .../外科辅料和患者防护罩激光抗性测试仪/ManualDebugForm.cs | 6 +- .../Model/PrimaryIgnitionModel.cs | 4 +- .../PenetrationForm.Designer.cs | 134 ++++++++++++++---- .../外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs | 5 + .../PrimaryIgnitionForm.Designer.cs | 102 +++++++++---- .../外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs | 4 +- 6 files changed, 194 insertions(+), 61 deletions(-) diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ManualDebugForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ManualDebugForm.cs index 53fa74c..eaecb81 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ManualDebugForm.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ManualDebugForm.cs @@ -73,8 +73,8 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 if (Ray != null && Ray.Length >= 2) { - int Value = Ray[0]; - this.Invoke(new Action(() => uiTextBox1.Text = Value.ToString("F0"))); + float Value = c.UshortToFloat(Ray[1],Ray[0]); + this.Invoke(new Action(() => uiTextBox1.Text = Value.ToString("F1"))); } } catch (Exception ex) @@ -212,7 +212,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 private void uiTextBox1_Click(object sender, EventArgs e) { - ma?.WriteToPLCForNew(uiTextBox1.Text.Trim(), 250, Function.DataType.整形); + ma?.WriteToPLCForNew(uiTextBox1.Text.Trim(), 250, Function.DataType.浮点型); } private void ManualDebugForm_FormClosing(object sender, FormClosingEventArgs e) diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs index c5a8130..6306a60 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs @@ -12,8 +12,8 @@ namespace 外科辅料和患者防护罩激光抗性测试仪.Model public string result { get; set; } public string O2 { get; set; } public DateTime? FireDate { get; set; } - public double? yuhui { get; set; } - public double? yuyan { get; set; } + public int? yuhui { get; set; } + public int? yuyan { get; set; } public bool Iszixi { get; set; } public double? costTime { get; set; } diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs index 9b003c8..d5cbd94 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.Designer.cs @@ -104,6 +104,10 @@ uiLabel43 = new Sunny.UI.UILabel(); uiGroupBox5 = new Sunny.UI.UIGroupBox(); uiLabel16 = new Sunny.UI.UILabel(); + uiLabel46 = new Sunny.UI.UILabel(); + uiLabel47 = new Sunny.UI.UILabel(); + uiComboBox3 = new Sunny.UI.UIComboBox(); + uiLabel48 = new Sunny.UI.UILabel(); uiTableLayoutPanel1.SuspendLayout(); uiTableLayoutPanel2.SuspendLayout(); uiPanel3.SuspendLayout(); @@ -356,6 +360,8 @@ // uiGroupBox1 // uiGroupBox1.BackColor = Color.White; + uiGroupBox1.Controls.Add(uiComboBox3); + uiGroupBox1.Controls.Add(uiLabel48); uiGroupBox1.Controls.Add(uiLabel28); uiGroupBox1.Controls.Add(uiLight3); uiGroupBox1.Controls.Add(uiTextBox2); @@ -415,7 +421,7 @@ uiTextBox2.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiTextBox2.ForeColor = Color.FromArgb(64, 158, 255); uiTextBox2.IntValue = 2; - uiTextBox2.Location = new Point(220, 105); + uiTextBox2.Location = new Point(220, 85); uiTextBox2.Margin = new Padding(4, 5, 4, 5); uiTextBox2.MinimumSize = new Size(1, 16); uiTextBox2.Name = "uiTextBox2"; @@ -434,7 +440,7 @@ uiTextBox1.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiTextBox1.ForeColor = Color.FromArgb(64, 158, 255); uiTextBox1.IntValue = 20; - uiTextBox1.Location = new Point(220, 49); + uiTextBox1.Location = new Point(220, 43); uiTextBox1.Margin = new Padding(4, 5, 4, 5); uiTextBox1.MinimumSize = new Size(1, 16); uiTextBox1.Name = "uiTextBox1"; @@ -454,7 +460,7 @@ uiComboBox1.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiComboBox1.ItemHoverColor = Color.FromArgb(245, 247, 250); uiComboBox1.ItemSelectForeColor = Color.FromArgb(64, 158, 255); - uiComboBox1.Location = new Point(220, 155); + uiComboBox1.Location = new Point(220, 125); uiComboBox1.Margin = new Padding(4, 5, 4, 5); uiComboBox1.MinimumSize = new Size(63, 0); uiComboBox1.Name = "uiComboBox1"; @@ -475,7 +481,7 @@ // uiLabel6.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel6.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel6.Location = new Point(40, 165); + uiLabel6.Location = new Point(40, 131); uiLabel6.Name = "uiLabel6"; uiLabel6.Size = new Size(173, 34); uiLabel6.Style = Sunny.UI.UIStyle.Custom; @@ -488,7 +494,7 @@ // uiLabel4.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel4.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel4.Location = new Point(40, 105); + uiLabel4.Location = new Point(40, 86); uiLabel4.Name = "uiLabel4"; uiLabel4.Size = new Size(173, 34); uiLabel4.Style = Sunny.UI.UIStyle.Custom; @@ -501,7 +507,7 @@ // uiLabel1.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel1.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel1.Location = new Point(40, 49); + uiLabel1.Location = new Point(40, 43); uiLabel1.Name = "uiLabel1"; uiLabel1.Size = new Size(163, 34); uiLabel1.Style = Sunny.UI.UIStyle.Custom; @@ -699,9 +705,9 @@ // statusStrip1.ImageScalingSize = new Size(24, 24); statusStrip1.Items.AddRange(new ToolStripItem[] { toolStripStatusLabel1 }); - statusStrip1.Location = new Point(0, 387); + statusStrip1.Location = new Point(0, 382); statusStrip1.Name = "statusStrip1"; - statusStrip1.Size = new Size(924, 26); + statusStrip1.Size = new Size(924, 31); statusStrip1.TabIndex = 22; statusStrip1.Text = "statusStrip1"; // @@ -709,7 +715,7 @@ // toolStripStatusLabel1.BackColor = Color.Red; toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - toolStripStatusLabel1.Size = new Size(99, 20); + toolStripStatusLabel1.Size = new Size(118, 24); toolStripStatusLabel1.Text = "功率计未连接"; // // uiLabel25 @@ -1068,6 +1074,8 @@ // uiGroupBox4 // uiGroupBox4.BackColor = Color.White; + uiGroupBox4.Controls.Add(uiLabel46); + uiGroupBox4.Controls.Add(uiLabel47); uiGroupBox4.Controls.Add(uiLabel44); uiGroupBox4.Controls.Add(uiLabel45); uiGroupBox4.Controls.Add(uiLabel21); @@ -1109,7 +1117,7 @@ // uiLabel44.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel44.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel44.Location = new Point(260, 185); + uiLabel44.Location = new Point(254, 185); uiLabel44.Name = "uiLabel44"; uiLabel44.Size = new Size(169, 31); uiLabel44.Style = Sunny.UI.UIStyle.Custom; @@ -1121,7 +1129,7 @@ // uiLabel45.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel45.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel45.Location = new Point(90, 185); + uiLabel45.Location = new Point(84, 185); uiLabel45.Name = "uiLabel45"; uiLabel45.Size = new Size(136, 31); uiLabel45.Style = Sunny.UI.UIStyle.Custom; @@ -1134,7 +1142,7 @@ // uiLabel21.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel21.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel21.Location = new Point(213, 135); + uiLabel21.Location = new Point(207, 135); uiLabel21.Name = "uiLabel21"; uiLabel21.Size = new Size(265, 31); uiLabel21.Style = Sunny.UI.UIStyle.Custom; @@ -1146,7 +1154,7 @@ // uiLabel17.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel17.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel17.Location = new Point(260, 347); + uiLabel17.Location = new Point(254, 347); uiLabel17.Name = "uiLabel17"; uiLabel17.Size = new Size(169, 31); uiLabel17.Style = Sunny.UI.UIStyle.Custom; @@ -1158,7 +1166,7 @@ // uiLabel18.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel18.ForeColor = Color.FromArgb(103, 194, 58); - uiLabel18.Location = new Point(260, 449); + uiLabel18.Location = new Point(254, 449); uiLabel18.Name = "uiLabel18"; uiLabel18.Size = new Size(169, 31); uiLabel18.Style = Sunny.UI.UIStyle.Custom; @@ -1170,7 +1178,7 @@ // uiLabel19.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel19.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel19.Location = new Point(260, 506); + uiLabel19.Location = new Point(254, 506); uiLabel19.Name = "uiLabel19"; uiLabel19.Size = new Size(169, 31); uiLabel19.Style = Sunny.UI.UIStyle.Custom; @@ -1182,7 +1190,7 @@ // uiLabel35.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel35.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel35.Location = new Point(90, 506); + uiLabel35.Location = new Point(84, 506); uiLabel35.Name = "uiLabel35"; uiLabel35.Size = new Size(169, 31); uiLabel35.Style = Sunny.UI.UIStyle.Custom; @@ -1195,13 +1203,13 @@ // uiLabel20.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel20.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel20.Location = new Point(90, 453); + uiLabel20.Location = new Point(84, 453); uiLabel20.Name = "uiLabel20"; uiLabel20.Size = new Size(136, 31); uiLabel20.Style = Sunny.UI.UIStyle.Custom; uiLabel20.StyleCustomMode = true; uiLabel20.TabIndex = 13; - uiLabel20.Text = "是否自熄:"; + uiLabel20.Text = "是否起火:"; uiLabel20.TextAlign = ContentAlignment.MiddleLeft; // // uiComboBox2 @@ -1211,7 +1219,7 @@ uiComboBox2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); uiComboBox2.ItemHoverColor = Color.FromArgb(155, 200, 255); uiComboBox2.ItemSelectForeColor = Color.FromArgb(235, 243, 255); - uiComboBox2.Location = new Point(260, 74); + uiComboBox2.Location = new Point(254, 74); uiComboBox2.Margin = new Padding(4, 5, 4, 5); uiComboBox2.MinimumSize = new Size(63, 0); uiComboBox2.Name = "uiComboBox2"; @@ -1226,7 +1234,7 @@ // uiLabel22.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel22.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel22.Location = new Point(90, 347); + uiLabel22.Location = new Point(84, 347); uiLabel22.Name = "uiLabel22"; uiLabel22.Size = new Size(136, 31); uiLabel22.Style = Sunny.UI.UIStyle.Custom; @@ -1239,7 +1247,7 @@ // uiLabel36.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel36.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel36.Location = new Point(260, 400); + uiLabel36.Location = new Point(254, 400); uiLabel36.Name = "uiLabel36"; uiLabel36.Size = new Size(169, 31); uiLabel36.Style = Sunny.UI.UIStyle.Custom; @@ -1251,7 +1259,7 @@ // uiLabel37.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel37.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel37.Location = new Point(90, 400); + uiLabel37.Location = new Point(84, 400); uiLabel37.Name = "uiLabel37"; uiLabel37.Size = new Size(136, 31); uiLabel37.Style = Sunny.UI.UIStyle.Custom; @@ -1264,7 +1272,7 @@ // uiLabel38.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel38.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel38.Location = new Point(232, 294); + uiLabel38.Location = new Point(226, 294); uiLabel38.Name = "uiLabel38"; uiLabel38.Size = new Size(246, 31); uiLabel38.Style = Sunny.UI.UIStyle.Custom; @@ -1276,7 +1284,7 @@ // uiLabel39.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel39.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel39.Location = new Point(90, 294); + uiLabel39.Location = new Point(84, 294); uiLabel39.Name = "uiLabel39"; uiLabel39.Size = new Size(136, 31); uiLabel39.Style = Sunny.UI.UIStyle.Custom; @@ -1289,7 +1297,7 @@ // uiLabel40.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel40.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel40.Location = new Point(90, 135); + uiLabel40.Location = new Point(84, 135); uiLabel40.Name = "uiLabel40"; uiLabel40.Size = new Size(136, 31); uiLabel40.Style = Sunny.UI.UIStyle.Custom; @@ -1302,7 +1310,7 @@ // uiLabel41.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); uiLabel41.ForeColor = Color.FromArgb(64, 158, 255); - uiLabel41.Location = new Point(260, 241); + uiLabel41.Location = new Point(254, 241); uiLabel41.Name = "uiLabel41"; uiLabel41.Size = new Size(169, 31); uiLabel41.Style = Sunny.UI.UIStyle.Custom; @@ -1314,20 +1322,20 @@ // uiLabel42.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel42.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel42.Location = new Point(90, 241); + uiLabel42.Location = new Point(84, 241); uiLabel42.Name = "uiLabel42"; - uiLabel42.Size = new Size(144, 31); + uiLabel42.Size = new Size(164, 31); uiLabel42.Style = Sunny.UI.UIStyle.Custom; uiLabel42.StyleCustomMode = true; uiLabel42.TabIndex = 2; - uiLabel42.Text = "背面温度(°C):"; + uiLabel42.Text = "P1背面温度(°C):"; uiLabel42.TextAlign = ContentAlignment.MiddleLeft; // // uiLabel43 // uiLabel43.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); uiLabel43.ForeColor = Color.FromArgb(96, 98, 102); - uiLabel43.Location = new Point(90, 78); + uiLabel43.Location = new Point(84, 78); uiLabel43.Name = "uiLabel43"; uiLabel43.Size = new Size(124, 31); uiLabel43.Style = Sunny.UI.UIStyle.Custom; @@ -1370,6 +1378,68 @@ 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材料需测量背面温度"; // + // uiLabel46 + // + uiLabel46.Font = new Font("微软雅黑", 12F, FontStyle.Bold, GraphicsUnit.Point, 134); + uiLabel46.ForeColor = Color.FromArgb(64, 158, 255); + uiLabel46.Location = new Point(254, 560); + uiLabel46.Name = "uiLabel46"; + uiLabel46.Size = new Size(169, 31); + uiLabel46.Style = Sunny.UI.UIStyle.Custom; + uiLabel46.StyleCustomMode = true; + uiLabel46.TabIndex = 23; + uiLabel46.TextAlign = ContentAlignment.MiddleCenter; + // + // uiLabel47 + // + uiLabel47.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiLabel47.ForeColor = Color.FromArgb(96, 98, 102); + uiLabel47.Location = new Point(84, 560); + uiLabel47.Name = "uiLabel47"; + uiLabel47.Size = new Size(144, 31); + uiLabel47.Style = Sunny.UI.UIStyle.Custom; + uiLabel47.StyleCustomMode = true; + uiLabel47.TabIndex = 22; + uiLabel47.Text = "穿透时间(s):"; + uiLabel47.TextAlign = ContentAlignment.MiddleLeft; + // + // uiComboBox3 + // + uiComboBox3.DataSource = null; + uiComboBox3.FillColor = Color.White; + uiComboBox3.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiComboBox3.ItemHoverColor = Color.FromArgb(245, 247, 250); + uiComboBox3.Items.AddRange(new object[] { "样品1", "样品2", "样品3", "样品4", "样品5" }); + uiComboBox3.ItemSelectForeColor = Color.FromArgb(64, 158, 255); + uiComboBox3.Location = new Point(220, 175); + uiComboBox3.Margin = new Padding(4, 5, 4, 5); + uiComboBox3.MinimumSize = new Size(63, 0); + uiComboBox3.Name = "uiComboBox3"; + uiComboBox3.Padding = new Padding(0, 0, 30, 2); + uiComboBox3.Radius = 4; + uiComboBox3.RectColor = Color.FromArgb(220, 223, 230); + uiComboBox3.Size = new Size(225, 44); + uiComboBox3.Style = Sunny.UI.UIStyle.Custom; + uiComboBox3.StyleCustomMode = true; + uiComboBox3.SymbolSize = 24; + uiComboBox3.TabIndex = 21; + uiComboBox3.Text = "选择样品"; + uiComboBox3.TextAlignment = ContentAlignment.MiddleLeft; + uiComboBox3.Watermark = "请选择氧浓度"; + // + // uiLabel48 + // + uiLabel48.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiLabel48.ForeColor = Color.FromArgb(96, 98, 102); + uiLabel48.Location = new Point(40, 177); + uiLabel48.Name = "uiLabel48"; + uiLabel48.Size = new Size(173, 34); + uiLabel48.Style = Sunny.UI.UIStyle.Custom; + uiLabel48.StyleCustomMode = true; + uiLabel48.TabIndex = 20; + uiLabel48.Text = "样品:"; + uiLabel48.TextAlign = ContentAlignment.MiddleLeft; + // // PenetrationForm // AutoScaleMode = AutoScaleMode.None; @@ -1481,5 +1551,9 @@ private Sunny.UI.UILabel uiLabel41; private Sunny.UI.UILabel uiLabel42; private Sunny.UI.UILabel uiLabel43; + private Sunny.UI.UILabel uiLabel46; + private Sunny.UI.UILabel uiLabel47; + private Sunny.UI.UIComboBox uiComboBox3; + private Sunny.UI.UILabel uiLabel48; } } \ No newline at end of file diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs index a49875e..7553f42 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs @@ -542,5 +542,10 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 { } + + private void uiLabel46_Click(object sender, EventArgs e) + { + + } } } diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs index 42ab16c..0d1aed6 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.Designer.cs @@ -32,6 +32,7 @@ uiTableLayoutPanel2 = new Sunny.UI.UITableLayoutPanel(); uiPanel3 = new Sunny.UI.UIPanel(); uiGroupBox2 = new Sunny.UI.UIGroupBox(); + uiButton8 = new Sunny.UI.UIButton(); uiLabel25 = new Sunny.UI.UILabel(); uiLabel26 = new Sunny.UI.UILabel(); uiLabel23 = new Sunny.UI.UILabel(); @@ -91,7 +92,8 @@ uiLabel17 = new Sunny.UI.UILabel(); uiGroupBox5 = new Sunny.UI.UIGroupBox(); uiLabel16 = new Sunny.UI.UILabel(); - uiButton8 = new Sunny.UI.UIButton(); + uiButton12 = new Sunny.UI.UIButton(); + uiButton11 = new Sunny.UI.UIButton(); uiTableLayoutPanel1.SuspendLayout(); uiTableLayoutPanel2.SuspendLayout(); uiPanel3.SuspendLayout(); @@ -193,6 +195,31 @@ uiGroupBox2.Text = "测试控制"; uiGroupBox2.TextAlignment = ContentAlignment.MiddleLeft; // + // uiButton8 + // + uiButton8.Cursor = Cursors.Hand; + uiButton8.FillColor = Color.FromArgb(230, 162, 60); + uiButton8.FillColor2 = Color.FromArgb(230, 162, 60); + uiButton8.FillHoverColor = Color.FromArgb(235, 181, 99); + uiButton8.FillPressColor = Color.FromArgb(212, 145, 47); + uiButton8.FillSelectedColor = Color.FromArgb(212, 145, 47); + uiButton8.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton8.Location = new Point(586, 64); + uiButton8.MinimumSize = new Size(1, 1); + uiButton8.Name = "uiButton8"; + uiButton8.Radius = 8; + uiButton8.RectColor = Color.FromArgb(230, 162, 60); + uiButton8.RectHoverColor = Color.FromArgb(235, 181, 99); + uiButton8.RectPressColor = Color.FromArgb(212, 145, 47); + uiButton8.RectSelectedColor = Color.FromArgb(212, 145, 47); + uiButton8.Size = new Size(111, 85); + uiButton8.Style = Sunny.UI.UIStyle.Custom; + uiButton8.StyleCustomMode = true; + uiButton8.TabIndex = 8; + uiButton8.Text = "查看相机"; + uiButton8.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton8.Click += uiButton8_Click; + // // uiLabel25 // uiLabel25.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); @@ -557,6 +584,8 @@ // uiPanel6 // uiPanel6.BackColor = Color.White; + uiPanel6.Controls.Add(uiButton12); + uiPanel6.Controls.Add(uiButton11); uiPanel6.Controls.Add(uiLabel37); uiPanel6.Controls.Add(uiLabel38); uiPanel6.Controls.Add(uiLabel14); @@ -1169,30 +1198,53 @@ uiLabel16.TabIndex = 0; uiLabel16.Text = "I1: 未点火\r\nI2: 点火后自熄\r\nI3: 点火时间 > 4s 且不自熄\r\nI4: 点火时间 ≤ 4s 且不自熄\r\n\r\n根据 BS EN ISO 11810:2015 标准"; // - // uiButton8 + // uiButton12 // - uiButton8.Cursor = Cursors.Hand; - uiButton8.FillColor = Color.FromArgb(230, 162, 60); - uiButton8.FillColor2 = Color.FromArgb(230, 162, 60); - uiButton8.FillHoverColor = Color.FromArgb(235, 181, 99); - uiButton8.FillPressColor = Color.FromArgb(212, 145, 47); - uiButton8.FillSelectedColor = Color.FromArgb(212, 145, 47); - uiButton8.Font = new Font("微软雅黑", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiButton8.Location = new Point(586, 64); - uiButton8.MinimumSize = new Size(1, 1); - uiButton8.Name = "uiButton8"; - uiButton8.Radius = 8; - uiButton8.RectColor = Color.FromArgb(230, 162, 60); - uiButton8.RectHoverColor = Color.FromArgb(235, 181, 99); - uiButton8.RectPressColor = Color.FromArgb(212, 145, 47); - uiButton8.RectSelectedColor = Color.FromArgb(212, 145, 47); - uiButton8.Size = new Size(111, 85); - uiButton8.Style = Sunny.UI.UIStyle.Custom; - uiButton8.StyleCustomMode = true; - uiButton8.TabIndex = 8; - uiButton8.Text = "查看相机"; - uiButton8.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiButton8.Click += uiButton8_Click; + 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.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton12.Location = new Point(426, 204); + 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.Size = new Size(115, 45); + uiButton12.Style = Sunny.UI.UIStyle.Custom; + uiButton12.StyleCustomMode = true; + uiButton12.TabIndex = 19; + uiButton12.Text = "确认自熄"; + uiButton12.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + // + // 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.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); + uiButton11.Location = new Point(426, 135); + 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.Size = new Size(115, 45); + uiButton11.Style = Sunny.UI.UIStyle.Custom; + uiButton11.StyleCustomMode = true; + uiButton11.TabIndex = 18; + uiButton11.Text = "确认未自熄"; + uiButton11.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); // // PrimaryIgnitionForm // @@ -1294,5 +1346,7 @@ private Sunny.UI.UILabel uiLabel21; private Sunny.UI.UILabel uiLabel27; private Sunny.UI.UIButton uiButton8; + private Sunny.UI.UIButton uiButton12; + private Sunny.UI.UIButton uiButton11; } } \ No newline at end of file diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs index 9674f5d..71c8fb8 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs @@ -309,8 +309,8 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 List reportList = new List(); private string classify; - private double yh; - private double yy; + private int yh; + private int yy; private double costtime; private async Task InsertReportAsync() {