Compare commits

...

6 Commits

Author SHA1 Message Date
bf4b491d0f 删除文案 2026-05-18 16:15:53 +08:00
7dde55f6fc test 2026-05-18 16:07:46 +08:00
ef3805c127 1 2026-05-18 16:03:40 +08:00
de3d259f2a 1 2026-05-18 16:02:31 +08:00
GukSang.Jin
8f9031ec75 更新 2026-05-18 15:20:13 +08:00
bbd0533506 test 2026-05-18 14:57:15 +08:00
2 changed files with 10 additions and 5 deletions

View File

@@ -107,6 +107,7 @@ namespace TabletTester2025.ViewModels
[ObservableProperty] private int _hardnessIntervalSec = 2;
[ObservableProperty] private int _hardnessCurrentCount;
[ObservableProperty] private double _hardnessMax;
[ObservableProperty] private double _hardnessMin;
@@ -243,6 +244,7 @@ namespace TabletTester2025.ViewModels
await _plc.WriteCoilAsync(_plcConfig.HardnessStartReset, false);
_hardnessResults.Clear();
HardnessMax = 0;
HardnessMin= 0;
HardnessShishilizhi = 0;
Phase = TestPhase.Idle;

View File

@@ -259,7 +259,7 @@
</TextBlock>
<TabControl Grid.Row="1" FontSize="13" BorderThickness="0">
<TabItem Header="硬度测试">
<TabItem Header="硬度">
<Grid Margin="4,14,4,4">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -326,14 +326,15 @@
</GroupBox>
</Grid>
<WrapPanel Grid.Row="2" Style="{StaticResource CommandBar}">
<Button Command="{Binding HardnessResetCommand}" Content="复位" Style="{StaticResource ResetButton}"/>
<Button Command="{Binding StartHardnessCommand}" Content="启动测试" Style="{StaticResource StartButton}"/>
<Button Command="{Binding StopHardnessCommand}" Content="测试停止" Style="{StaticResource StopButton}"/>
<Button Command="{Binding HardnessResetCommand}" Content="复位" Style="{StaticResource ResetButton}"/>
</WrapPanel>
</Grid>
</TabItem>
<TabItem Header="脆碎度测试">
<TabItem Header="脆碎度">
<Grid Margin="4,14,4,4">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -523,7 +524,7 @@
</Grid>
</TabItem>
<TabItem Header="崩解时限">
<TabItem Header="崩解">
<Grid Margin="4,14,4,4">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -534,8 +535,10 @@
<GroupBox Header="当前参数" Grid.Row="0">
<WrapPanel>
<StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="剂型规则:" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="剂型规格:" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding DisintegrationDosageForm}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="崩解速度(r/min)" Style="{StaticResource ParamLabel}"/>