页面

Views/HistoryWindow.xaml

@@ -153,8 +153,7 @@
             <!-- 查询栏 -->
             <Border Grid.Row="1" Background="White" Padding="16,12" Margin="0,0,0,8">
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                    <Button x:Name="RefreshButton" Content="🔍 查询" Style="{StaticResource ActionButton}" 
-                            Width="80" Click="RefreshButton_Click"/>
+                   
                 </StackPanel>
             </Border>
 

Views/MainWindow.xaml

@@ -266,17 +266,21 @@
                                     <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
 
-                                <GroupBox Header="测试参数设置" Grid.Row="0">
-                                    <WrapPanel>
-                                        <StackPanel Style="{StaticResource ParamRow}">
-                                            <TextBlock Text="试验次数设定：" Style="{StaticResource ParamLabel}"/>
-                                            <TextBox Text="{Binding HardnessTestCount, UpdateSourceTrigger=PropertyChanged}"/>
+                                <GroupBox Header="测试参数设置" Grid.Row="0" Margin="0,5">
+                                    <UniformGrid Columns="2" Rows="2" Margin="10">
+                                        <StackPanel  Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0" >
+                                            <TextBlock Text="硬度速度输入(mm/min)" Width="180" VerticalAlignment="Center"/>
+                                            <TextBox Text="{Binding HardnessSudu, UpdateSourceTrigger=PropertyChanged}" Width="120"  />
                                         </StackPanel>
-                                        <StackPanel Style="{StaticResource ParamRow}">
-                                            <TextBlock Text="试验次数间隔(秒)：" Style="{StaticResource ParamLabel}"/>
-                                            <TextBox Text="{Binding HardnessIntervalSec, UpdateSourceTrigger=PropertyChanged}"/>
+                                        <StackPanel  Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0">
+                                            <TextBlock Text="硬度位移输入(mm/min)" Width="180" VerticalAlignment="Center"/>
+                                            <TextBox Text="{Binding HardnessWeiyi, UpdateSourceTrigger=PropertyChanged}" Width="120"  />
                                         </StackPanel>
-                                    </WrapPanel>
+                                        <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>
                                 </GroupBox>
 
                                 <Grid Grid.Row="1">
@@ -328,7 +332,8 @@
 
                                 <WrapPanel Grid.Row="2" Style="{StaticResource CommandBar}">
                                     <Button Command="{Binding HardnessResetCommand}" Content="复位" Style="{StaticResource ResetButton}"/>
-                                    <Button Command="{Binding PrintHardnessCommand}" Content="打印" Style="{StaticResource SecondaryButton}"/>
+                                    <Button Command="{Binding HardnessForward}" Content="前进" Style="{StaticResource ActionButton}" Background="#607D8B"/>
+                                    <Button Command="{Binding HardnessBack}" Content="后退" Style="{StaticResource ActionButton}" Background="#607D8B"/>
                                     <Button Command="{Binding StartHardnessCommand}" Content="启动测试" Style="{StaticResource StartButton}"/>
                                     <Button Command="{Binding StopHardnessCommand}" Content="测试停止" Style="{StaticResource StopButton}"/>
                                 </WrapPanel>
@@ -560,7 +565,7 @@
                            VerticalAlignment="Center"/>
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
                     <Button Command="{Binding OpenHistoryCommand}" Content="历史记录" Style="{StaticResource ActionButton}"/>
-                    <Button Command="{Binding OpenCalibrationCommand}" Content="校准" Style="{StaticResource ActionButton}"/>
+              
                     <Button Command="{Binding ExportAllCommand}" Content="导出报告" Style="{StaticResource ActionButton}"/>
                 </StackPanel>
             </Grid>

appsettings.json

@@ -14,6 +14,22 @@
     "HardnessStartStop": 73, // 硬度停止
     "HardnessStartReset": 90, // 硬复位启动
 
+    "HardnessForward": 0, //硬前进
+    "HardnessBack": 1, //硬后退
+  
+    "HardnessOver": 72, //硬度完成
+
+    "HardnessStartOver": 92, // 硬复位启动
+    "HardnessLimit": 298, // 硬度电机极限输入
+    "HardnessSudu": 300, // 硬度速度输入mm/min
+    "HardnessWeiyi": 310, // 硬度位移输入mm/min
+    "HardnessPoSun": 310, // 硬度破损判定输入N
+    "HardnessMax": 310, //最大力采集
+
+
+
+
+
     "FriabilityStartCoil": 80, //脆碎工位1启动测试M70
     "FriabilityStartCoil2": 80, //脆碎工位1启动测试M70
     "FriabilityStartCoil3": 80, //脆碎工位1启动测试M70