csi_team/CSI-Z420-Tablet-Multi-Function-Tester
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新202680

Browse Source
This commit is contained in:
GukSang.Jin
2026-05-21 08:57:19 +08:00
parent b2da230e24
commit df36b65b30
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Services/ExcelExportService.cs
View File

@@ -60,7 +60,7 @@ namespace TabletTester2025.Services
{ {
var data = batches.ToList(); var data = batches.ToList();
var sheet = package.Workbook.Worksheets.Add("硬度报表"); var sheet = package.Workbook.Worksheets.Add("硬度报表");
WriteHeader(sheet, "检测时间", "样品名称", "平均值(N)", "平均偏差(N)", "RSD(%)", "最大值(N)", "测试次数", "单次数据(N)", "判定"); WriteHeader(sheet, "检测时间", "样品名称", "平均值(N)", "平均偏差(N)", "RSD", "最大值(N)", "测试次数", "单次数据(N)", "判定");
if (data.Count == 0) if (data.Count == 0)
{ {

4
ViewModels/StationViewModel.cs
View File

@@ -2169,8 +2169,8 @@ namespace TabletTester2025.ViewModels
private async Task SaveDisintegrationResultAsync() private async Task SaveDisintegrationResultAsync()
{ {
if (!CanSaveDisintegrationResult) //if (!CanSaveDisintegrationResult)
return; // return;
if (!TryParseDisintegrationActualSeconds(out double seconds, out string message)) if (!TryParseDisintegrationActualSeconds(out double seconds, out string message))
{ {

2
Views/HistoryWindow.xaml
View File

@@ -199,7 +199,7 @@
<DataGridTextColumn Header="样品名称" Binding="{Binding SampleName}" Width="120"/> <DataGridTextColumn Header="样品名称" Binding="{Binding SampleName}" Width="120"/>
<DataGridTextColumn Header="平均值(N)" Binding="{Binding HardnessAvg, StringFormat=F1}" Width="90"/> <DataGridTextColumn Header="平均值(N)" Binding="{Binding HardnessAvg, StringFormat=F1}" Width="90"/>
<DataGridTextColumn Header="平均偏差(N)" Binding="{Binding HardnessAverageDeviation, StringFormat=F2}" Width="110"/> <DataGridTextColumn Header="平均偏差(N)" Binding="{Binding HardnessAverageDeviation, StringFormat=F2}" Width="110"/>
<DataGridTextColumn Header="RSD(%)" Binding="{Binding HardnessRSD, StringFormat=F1}" Width="80"/> <DataGridTextColumn Header="RSD" Binding="{Binding HardnessRSD, StringFormat=F1}" Width="80"/>
<DataGridTextColumn Header="最大值(N)" Binding="{Binding HardnessMax, StringFormat=F1}" Width="90"/> <DataGridTextColumn Header="最大值(N)" Binding="{Binding HardnessMax, StringFormat=F1}" Width="90"/>
<DataGridTextColumn Header="测试次数" Binding="{Binding HardnessTestCount}" Width="70"/> <DataGridTextColumn Header="测试次数" Binding="{Binding HardnessTestCount}" Width="70"/>
<DataGridTextColumn Header="单次数据(N)" Binding="{Binding HardnessSampleSummary}" Width="220"/> <DataGridTextColumn Header="单次数据(N)" Binding="{Binding HardnessSampleSummary}" Width="220"/>

8
Views/MainWindow.xaml
View File

@@ -332,7 +332,7 @@
</Border> </Border>
<Border Style="{StaticResource MetricCard}"> <Border Style="{StaticResource MetricCard}">
<StackPanel> <StackPanel>
<TextBlock Text="RSD(%)" Style="{StaticResource MetricLabel}"/> <TextBlock Text="RSD" Style="{StaticResource MetricLabel}"/>
<TextBlock Text="{Binding HardnessRSD, StringFormat=F2}" Style="{StaticResource MetricValue}"/> <TextBlock Text="{Binding HardnessRSD, StringFormat=F2}" Style="{StaticResource MetricValue}"/>
</StackPanel> </StackPanel>
</Border> </Border>
@@ -442,8 +442,8 @@
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTextColumn Header="组平均值(N)" Binding="{Binding GroupAverage, StringFormat=F1}" Width="105"/> <DataGridTextColumn Header="组平均值(N)" Binding="{Binding GroupAverage, StringFormat=F1}" Width="105"/>
<DataGridTextColumn Header="组平均偏差(N)" Binding="{Binding GroupAverageDeviation, StringFormat=F2}" Width="120"/> <!--<DataGridTextColumn Header="组平均偏差(N)" Binding="{Binding GroupAverageDeviation, StringFormat=F2}" Width="120"/>-->
<DataGridTextColumn Header="组RSD(%)" Binding="{Binding GroupRSD, StringFormat=F2}" Width="95"/> <DataGridTextColumn Header="组RSD" Binding="{Binding GroupRSD, StringFormat=F2}" Width="95"/>
<DataGridTemplateColumn Header="记录时间" Width="105"> <DataGridTemplateColumn Header="记录时间" Width="105">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
@@ -763,7 +763,7 @@
<WrapPanel Grid.Row="2" Style="{StaticResource CommandBar}"> <WrapPanel Grid.Row="2" Style="{StaticResource CommandBar}">
<Button Command="{Binding StartDisintegrationCommand}" Content="开始" Style="{StaticResource StartButton}"/> <Button Command="{Binding StartDisintegrationCommand}" Content="开始" Style="{StaticResource StartButton}"/>
<Button Command="{Binding StopDisintegrationCommand}" Content="停止" Style="{StaticResource StopButton}"/> <Button Command="{Binding StopDisintegrationCommand}" Content="停止" Style="{StaticResource StopButton}"/>
<Button Command="{Binding SaveDisintegrationResultCommand}" Content="保存记录" Style="{StaticResource SecondaryButton}" IsEnabled="{Binding CanSaveDisintegrationResult}"/> <Button Command="{Binding SaveDisintegrationResultCommand}" Content="保存记录" Style="{StaticResource SecondaryButton}" />
<!--<Button Command="{Binding ResetDisintegrationCommand}" Content="复位" Style="{StaticResource ResetButton}"/>--> <!--<Button Command="{Binding ResetDisintegrationCommand}" Content="复位" Style="{StaticResource ResetButton}"/>-->
</WrapPanel> </WrapPanel>
</Grid> </Grid>