diff --git a/Services/ExcelExportService.cs b/Services/ExcelExportService.cs index 2380ed5..5f01d21 100644 --- a/Services/ExcelExportService.cs +++ b/Services/ExcelExportService.cs @@ -60,7 +60,7 @@ namespace TabletTester2025.Services { var data = batches.ToList(); var sheet = package.Workbook.Worksheets.Add("硬度报表"); - WriteHeader(sheet, "检测时间", "样品名称", "平均值(N)", "平均偏差(N)", "RSD(%)", "最大值(N)", "测试次数", "单次数据(N)", "判定"); + WriteHeader(sheet, "检测时间", "样品名称", "平均值(N)", "平均偏差(N)", "RSD", "最大值(N)", "测试次数", "单次数据(N)", "判定"); if (data.Count == 0) { diff --git a/ViewModels/StationViewModel.cs b/ViewModels/StationViewModel.cs index 50f3c9b..0143b9a 100644 --- a/ViewModels/StationViewModel.cs +++ b/ViewModels/StationViewModel.cs @@ -2169,8 +2169,8 @@ namespace TabletTester2025.ViewModels private async Task SaveDisintegrationResultAsync() { - if (!CanSaveDisintegrationResult) - return; + //if (!CanSaveDisintegrationResult) + // return; if (!TryParseDisintegrationActualSeconds(out double seconds, out string message)) { diff --git a/Views/HistoryWindow.xaml b/Views/HistoryWindow.xaml index d11c38d..f3dd30c 100644 --- a/Views/HistoryWindow.xaml +++ b/Views/HistoryWindow.xaml @@ -199,7 +199,7 @@ - + diff --git a/Views/MainWindow.xaml b/Views/MainWindow.xaml index 81ca3ae..229f87c 100644 --- a/Views/MainWindow.xaml +++ b/Views/MainWindow.xaml @@ -332,7 +332,7 @@ - + @@ -442,8 +442,8 @@ - - + + @@ -763,7 +763,7 @@