实验次数

Services/ExcelExportService.cs

@@ -123,7 +123,7 @@ namespace TabletTester2025.Services
         {
             var data = batches.ToList();
             var sheet = package.Workbook.Worksheets.Add("崩解报表");
-            WriteHeader(sheet, "检测时间", "样品名称", "剂型规则", "时限(秒)", "崩解时间(秒)", "剩余未崩解管", "水浴温度(℃)", "判定");
+            WriteHeader(sheet, "检测时间", "样品名称", "剂型规格", "时限(秒)", "崩解时间(秒)", "剩余未崩解管", "水浴温度(℃)", "判定");
 
             if (data.Count == 0)
             {

Views/HistoryWindow.xaml

@@ -220,7 +220,7 @@
                             <DataGrid.Columns>
                                 <DataGridTextColumn Header="检测时间" Binding="{Binding TestTime, StringFormat=yyyy-MM-dd HH:mm:ss}" Width="160"/>
                                 <DataGridTextColumn Header="样品名称" Binding="{Binding SampleName}" Width="120"/>
-                                <DataGridTextColumn Header="剂型规则" Binding="{Binding DisintegrationDosageForm}" Width="100"/>
+                                <DataGridTextColumn Header="剂型规格" Binding="{Binding DisintegrationDosageForm}" Width="100"/>
                                 <DataGridTextColumn Header="时限(秒)" Binding="{Binding DisintegrationLimitSeconds}" Width="80"/>
                                 <DataGridTextColumn Header="崩解时间(秒)" Binding="{Binding DisintegrationTimeSec}" Width="100"/>
                                 <DataGridTextColumn Header="剩余未崩解管" Binding="{Binding RemainingTubesAtEnd}" Width="110"/>

Views/MainWindow.xaml

@@ -399,7 +399,7 @@
                                 <WrapPanel Grid.Row="2" Style="{StaticResource CommandBar}">
                                     <Button Command="{Binding StartFriabilityCommand}" Content="开始" Style="{StaticResource StartButton}"/>
                                     <Button Command="{Binding StopFriabilityCommand}" Content="停止" Style="{StaticResource StopButton}"/>
-                                    <Button Command="{Binding ResetFriabilityCommand}" Content="复位" Style="{StaticResource ResetButton}"/>
+                                    <!--<Button Command="{Binding ResetFriabilityCommand}" Content="复位" Style="{StaticResource ResetButton}"/>-->
                                 </WrapPanel>
                             </Grid>
                         </TabItem>
@@ -530,15 +530,15 @@
                                 <WrapPanel Grid.Row="1" Style="{StaticResource CommandBar}">
                                     <Button Command="{Binding StartDissolution1Command}" Content="溶出1开始" Style="{StaticResource StartButton}"/>
                                     <Button Command="{Binding StopDissolution1Command}" Content="溶出1停止" Style="{StaticResource StopButton}"/>
-                                    <Button Command="{Binding ResetDissolution1Command}" Content="溶出1复位" Style="{StaticResource ResetButton}"/>
+                                    <!--<Button Command="{Binding ResetDissolution1Command}" Content="溶出1复位" Style="{StaticResource ResetButton}"/>-->
                                     <Button Command="{Binding StartDissolution2Command}" Content="溶出2开始" Style="{StaticResource StartButton}"/>
                                     <Button Command="{Binding StopDissolution2Command}" Content="溶出2停止" Style="{StaticResource StopButton}"/>
-                                    <Button Command="{Binding ResetDissolution2Command}" Content="溶出2复位" Style="{StaticResource ResetButton}"/>
+                                    <!--<Button Command="{Binding ResetDissolution2Command}" Content="溶出2复位" Style="{StaticResource ResetButton}"/>-->
                                 </WrapPanel>
                             </Grid>
                         </TabItem>
 
-                        <TabItem Header="崩解">
+                        <TabItem Header="崩解时限">
                             <Grid Margin="4,14,4,4">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto"/>
@@ -589,7 +589,7 @@
                                 <WrapPanel Grid.Row="2" Style="{StaticResource CommandBar}">
                                     <Button Command="{Binding StartDisintegrationCommand}" Content="开始" Style="{StaticResource StartButton}"/>
                                     <Button Command="{Binding StopDisintegrationCommand}" Content="停止" Style="{StaticResource StopButton}"/>
-                                    <Button Command="{Binding ResetDisintegrationCommand}" Content="复位" Style="{StaticResource ResetButton}"/>
+                                    <!--<Button Command="{Binding ResetDisintegrationCommand}" Content="复位" Style="{StaticResource ResetButton}"/>-->
                                 </WrapPanel>
                             </Grid>
                         </TabItem>

Views/SettingsWindow.xaml

@@ -100,7 +100,7 @@
                                 <TextBox x:Name="FriabilityRpmBox" TextChanged="FriabilityCalculationBox_TextChanged"/>
                             </StackPanel>
                             <StackPanel Style="{StaticResource ParamRow}">
-                                <TextBlock Text="试验时间(min):" Style="{StaticResource ParamLabel}"/>
+                                <TextBlock Text="试验次数(次):" Style="{StaticResource ParamLabel}"/>
                                 <TextBox x:Name="FriabilityTimeBox" TextChanged="FriabilityCalculationBox_TextChanged"/>
                             </StackPanel>
                             <StackPanel Style="{StaticResource ParamRow}">
@@ -126,7 +126,7 @@
                     <StackPanel>
                         <WrapPanel>
                             <StackPanel Style="{StaticResource ParamRow}">
-                                <TextBlock Text="剂型规则:" Style="{StaticResource ParamLabel}"/>
+                                <TextBlock Text="剂型规格:" Style="{StaticResource ParamLabel}"/>
                                 <ComboBox x:Name="DisintegrationDosageFormBox"
                                           Width="180"
                                           Height="40"

Views/SettingsWindow.xaml.cs

@@ -48,7 +48,7 @@ namespace TabletTester2025
                 p.HardnessMax_N = double.Parse(HardnessMaxBox.Text);
                 p.HardnessTestCount = int.Parse(HardnessCountBox.Text);
                 p.FriabilityTargetRpm = double.Parse(FriabilityRpmBox.Text);
-                p.FriabilityTargetTimeMin = double.Parse(FriabilityTimeBox.Text);
+                p.FriabilityTargetTimeMin = int.Parse(FriabilityTimeBox.Text);
                 p.FriabilityTargetRounds = CalculateFriabilityRounds(p.FriabilityTargetTimeMin, p.FriabilityTargetRpm);
                 p.FriabilityMaxLossPercent = double.Parse(FriabilityMaxLossBox.Text);
                 p.DisintegrationDosageForm = GetSelectedDisintegrationDosageForm();
@@ -96,7 +96,7 @@ namespace TabletTester2025
             if (FriabilityRoundsBox == null)
                 return;
 
-            if (double.TryParse(FriabilityTimeBox?.Text, out double timeMin)
+            if (int.TryParse(FriabilityTimeBox?.Text, out int timeMin)
                 && double.TryParse(FriabilityRpmBox?.Text, out double rpm)
                 && timeMin > 0
                 && rpm > 0)

appsettings.json

@@ -35,7 +35,7 @@
     "FriabilityStartCoilReset": 95, // 脆碎复位启动
 
 
-    "FriabilityTestTime": 410, // 脆碎试验时间(min)
+    "FriabilityTestTime": 410, // 试验次数(次)
     "FriabilityWeightBefore": 412, // 脆碎前质量(g)
     "FriabilityWeightAfter": 414, // 脆碎后质量(g)
     "WeightBefore": 412,