This commit is contained in:
GukSang.Jin
2026-05-20 14:27:16 +08:00
parent 17d9904898
commit df5c7566fb
9 changed files with 97 additions and 27 deletions

View File

@@ -235,22 +235,22 @@
<DataTrigger Binding="{Binding LocalAlarm}" Value="">
<Setter Property="Visibility" Value="Collapsed"/>
</DataTrigger>
<DataTrigger Binding="{Binding LocalAlarm}" Value="硬度测试完成">
<DataTrigger Binding="{Binding LocalAlarm}" Value="硬度测试完成,已保存">
<Setter Property="Foreground" Value="#1565C0"/>
</DataTrigger>
<DataTrigger Binding="{Binding LocalAlarm}" Value="脆碎度测试完成">
<DataTrigger Binding="{Binding LocalAlarm}" Value="脆碎度测试完成,已保存">
<Setter Property="Foreground" Value="#1565C0"/>
</DataTrigger>
<DataTrigger Binding="{Binding LocalAlarm}" Value="崩解测试完成">
<DataTrigger Binding="{Binding LocalAlarm}" Value="崩解测试完成,已保存">
<Setter Property="Foreground" Value="#1565C0"/>
</DataTrigger>
<DataTrigger Binding="{Binding LocalAlarm}" Value="溶出测试完成">
<DataTrigger Binding="{Binding LocalAlarm}" Value="溶出测试完成,已保存">
<Setter Property="Foreground" Value="#1565C0"/>
</DataTrigger>
<DataTrigger Binding="{Binding LocalAlarm}" Value="溶出1测试完成">
<DataTrigger Binding="{Binding LocalAlarm}" Value="溶出1测试完成,已保存">
<Setter Property="Foreground" Value="#1565C0"/>
</DataTrigger>
<DataTrigger Binding="{Binding LocalAlarm}" Value="溶出2测试完成">
<DataTrigger Binding="{Binding LocalAlarm}" Value="溶出2测试完成,已保存">
<Setter Property="Foreground" Value="#1565C0"/>
</DataTrigger>
</Style.Triggers>
@@ -260,6 +260,8 @@
<TabControl Grid.Row="1" FontSize="13" BorderThickness="0">
<TabItem Header="硬度">
<ScrollViewer VerticalScrollBarVisibility="Auto"
HorizontalScrollBarVisibility="Disabled">
<Grid Margin="4,14,4,4">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -304,12 +306,6 @@
<TextBlock Text="{Binding HardnessMax, StringFormat=F1}" Foreground="#1565C0" Style="{StaticResource MetricValue}"/>
</StackPanel>
</Border>
<Border Style="{StaticResource MetricCard}">
<StackPanel>
<TextBlock Text="最小力值(N)" Style="{StaticResource MetricLabel}"/>
<TextBlock Text="{Binding HardnessMin, StringFormat=F1}" Foreground="#2E7D32" Style="{StaticResource MetricValue}"/>
</StackPanel>
</Border>
<Border Style="{StaticResource MetricCard}">
<StackPanel>
<TextBlock Text="平均值(N)" Style="{StaticResource MetricLabel}"/>
@@ -465,6 +461,7 @@
<Button Command="{Binding ClearHardnessRecordsCommand}" Content="清空记录" Style="{StaticResource SecondaryButton}"/>
</WrapPanel>
</Grid>
</ScrollViewer>
</TabItem>
<TabItem Header="脆碎度">