diff --git a/ViewModels/StationViewModel.cs b/ViewModels/StationViewModel.cs index 337d32c..cca3a41 100644 --- a/ViewModels/StationViewModel.cs +++ b/ViewModels/StationViewModel.cs @@ -67,8 +67,8 @@ namespace TabletTester2025.ViewModels //[ObservableProperty] private int _hardnessStartOver = 92;// 硬复位完成 //[ObservableProperty] private int _hardnessLimit = 298;// 硬度电机极限输入 [ObservableProperty] private double _hardnessSudu = 300;// 硬度速度输入mm/min - [ObservableProperty] private double _hardnessWeiyi = 310; // 硬度位移输入mm/min - [ObservableProperty] private double _hardnessPoSun = 400; // 硬度破损判定输入N + [ObservableProperty] private double _hardnessWeiyi = 100; // 硬度位移输入mm + //[ObservableProperty] private double _hardnessPoSun = 400; // 硬度破损判定输入N //[ObservableProperty] private int _hardnessMaxN = 72; //最大力采集 diff --git a/Views/MainWindow.xaml b/Views/MainWindow.xaml index 907a70c..1daeade 100644 --- a/Views/MainWindow.xaml +++ b/Views/MainWindow.xaml @@ -269,10 +269,7 @@ - - - - + @@ -281,10 +278,7 @@ - - - - + @@ -298,43 +292,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -