页面数据

This commit is contained in:
2026-05-18 10:31:59 +08:00
parent 625eb4cda5
commit a2f95ee043
2 changed files with 5 additions and 41 deletions

View File

@@ -67,8 +67,8 @@ namespace TabletTester2025.ViewModels
//[ObservableProperty] private int _hardnessStartOver = 92;// 硬复位完成 //[ObservableProperty] private int _hardnessStartOver = 92;// 硬复位完成
//[ObservableProperty] private int _hardnessLimit = 298;// 硬度电机极限输入 //[ObservableProperty] private int _hardnessLimit = 298;// 硬度电机极限输入
[ObservableProperty] private double _hardnessSudu = 300;// 硬度速度输入mm/min [ObservableProperty] private double _hardnessSudu = 300;// 硬度速度输入mm/min
[ObservableProperty] private double _hardnessWeiyi = 310; // 硬度位移输入mm/min [ObservableProperty] private double _hardnessWeiyi = 100; // 硬度位移输入mm
[ObservableProperty] private double _hardnessPoSun = 400; // 硬度破损判定输入N //[ObservableProperty] private double _hardnessPoSun = 400; // 硬度破损判定输入N
//[ObservableProperty] private int _hardnessMaxN = 72; //最大力采集 //[ObservableProperty] private int _hardnessMaxN = 72; //最大力采集

View File

@@ -269,10 +269,7 @@
<GroupBox Header="测试参数设置" Grid.Row="0" Margin="0,5"> <GroupBox Header="测试参数设置" Grid.Row="0" Margin="0,5">
<UniformGrid Columns="2" Rows="2" Margin="10"> <UniformGrid Columns="2" Rows="2" Margin="10">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0" >
<TextBlock Text="测试次数" Width="180" VerticalAlignment="Center"/>
<TextBox Text="{Binding HardnessTestCount, UpdateSourceTrigger=PropertyChanged}" Width="120" />
</StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0" > <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0" >
<TextBlock Text="硬度速度输入(mm/min)" Width="180" VerticalAlignment="Center"/> <TextBlock Text="硬度速度输入(mm/min)" Width="180" VerticalAlignment="Center"/>
<TextBox Text="{Binding HardnessSudu, UpdateSourceTrigger=PropertyChanged}" Width="120" /> <TextBox Text="{Binding HardnessSudu, UpdateSourceTrigger=PropertyChanged}" Width="120" />
@@ -281,10 +278,7 @@
<TextBlock Text="硬度位移输入(mm)" Width="180" VerticalAlignment="Center"/> <TextBlock Text="硬度位移输入(mm)" Width="180" VerticalAlignment="Center"/>
<TextBox Text="{Binding HardnessWeiyi, UpdateSourceTrigger=PropertyChanged}" Width="120" /> <TextBox Text="{Binding HardnessWeiyi, UpdateSourceTrigger=PropertyChanged}" Width="120" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0">
<TextBlock Text="硬度破损判定输入(N)" Width="180" VerticalAlignment="Center"/>
<TextBox Text="{Binding HardnessPoSun, UpdateSourceTrigger=PropertyChanged}" Width="120" />
</StackPanel>
</UniformGrid> </UniformGrid>
</GroupBox> </GroupBox>
@@ -298,43 +292,13 @@
<UniformGrid Columns="3"> <UniformGrid Columns="3">
<Border Style="{StaticResource MetricCard}"> <Border Style="{StaticResource MetricCard}">
<StackPanel> <StackPanel>
<TextBlock Text="最大值(N)" Style="{StaticResource MetricLabel}"/> <TextBlock Text="最大值(N)" Style="{StaticResource MetricLabel}"/>
<TextBlock Text="{Binding HardnessMax, StringFormat=F1}" Foreground="#1565C0" Style="{StaticResource MetricValue}"/> <TextBlock Text="{Binding HardnessMax, StringFormat=F1}" Foreground="#1565C0" Style="{StaticResource MetricValue}"/>
</StackPanel> </StackPanel>
</Border> </Border>
<Border Style="{StaticResource MetricCard}">
<StackPanel>
<TextBlock Text="最小值(N)" Style="{StaticResource MetricLabel}"/>
<TextBlock Text="{Binding HardnessMin, StringFormat=F1}" Foreground="#1565C0" Style="{StaticResource MetricValue}"/>
</StackPanel>
</Border>
<Border Style="{StaticResource MetricCard}">
<StackPanel>
<TextBlock Text="平均值(N)" Style="{StaticResource MetricLabel}"/>
<TextBlock Text="{Binding HardnessAvg, StringFormat=F1}" Foreground="#2E7D32" Style="{StaticResource MetricValue}"/>
</StackPanel>
</Border>
</UniformGrid>
</GroupBox>
<GroupBox Header="参数状态显示" Grid.Row="1">
<UniformGrid Columns="2">
<Border Style="{StaticResource MetricCard}">
<StackPanel>
<TextBlock Text="试验次数" Style="{StaticResource MetricLabel}"/>
<TextBlock Text="{Binding HardnessCurrentCount, StringFormat=F0}" Style="{StaticResource MetricValue}"/>
</StackPanel>
</Border>
<Border Style="{StaticResource MetricCard}">
<StackPanel>
<TextBlock Text="测试力值(N)" Style="{StaticResource MetricLabel}"/>
<TextBlock Text="{Binding HardnessValue, StringFormat=F1}" Foreground="#D98200" Style="{StaticResource MetricValue}"/>
</StackPanel>
</Border>
</UniformGrid> </UniformGrid>
</GroupBox> </GroupBox>
</Grid> </Grid>
<WrapPanel Grid.Row="2" Style="{StaticResource CommandBar}"> <WrapPanel Grid.Row="2" Style="{StaticResource CommandBar}">
<Button Command="{Binding HardnessResetCommand}" Content="复位" Style="{StaticResource ResetButton}"/> <Button Command="{Binding HardnessResetCommand}" Content="复位" Style="{StaticResource ResetButton}"/>
<Button Command="{Binding HardnessForward}" Content="前进" Style="{StaticResource ActionButton}" Background="#607D8B"/> <Button Command="{Binding HardnessForward}" Content="前进" Style="{StaticResource ActionButton}" Background="#607D8B"/>