diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Data/ConductividyClass.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Data/ConductividyClass.cs index dd874d1..572c328 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Data/ConductividyClass.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Data/ConductividyClass.cs @@ -149,12 +149,12 @@ namespace 材料热传导系数 using (var connection = new MySqlConnection(_connectionString)) { connection.Open(); - var sql = @"INSERT INTO SecondaryIgnitionModel + var sql = @"INSERT INTO secondaryignition (Id3, O23, result3, yuhui3, yuyan3, Isdianhuo3, Iszixi3,Testtime3) VALUES (@Id3 , @O23,@result3, - @yuhui3,@yuyan3,@Isdianhuo3,,@Iszixi3,@Testtime3)"; + @yuhui3,@yuyan3,@Isdianhuo3,@Iszixi3,@Testtime3)"; connection.Execute(sql, data); } } diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs index 09497b2..d71b49b 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs @@ -328,7 +328,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 private bool iszixi = false; private double costtime = 0; - private bool _isCurrentRecordAdded = false;//重复添加标记 + private bool _isCurrentRecordAdded = true;//重复添加标记 private async Task InsertReportAsync() { if (!_isCurrentRecordAdded) @@ -981,7 +981,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 } else { - _isCurrentRecordAdded = false; + //_isCurrentRecordAdded = false; return new PrimaryIgnitionModel(); ; } } @@ -1091,6 +1091,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 private void uiButton1_Click(object sender, EventArgs e) { ma?.BtnClickFunctionForNew(Function.ButtonType.复归型, 50);//开始 + _isReported = false; } private void uiButton2_Click(object sender, EventArgs e) diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.cs index d908b88..914d189 100644 --- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.cs +++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/ReportForm.cs @@ -347,7 +347,8 @@ namespace 外科辅料和患者防护罩激光抗性测试仪 MessageBox.Show($"导出失败:{ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - } + }//导出 + private void ExportToExcel(DataGridView dataGridView, string filePath, string reportTitle) { // 检查是否有数据