diff --git a/Models/PlcConfiguration.cs b/Models/PlcConfiguration.cs
index bcbb863..9bd2159 100644
--- a/Models/PlcConfiguration.cs
+++ b/Models/PlcConfiguration.cs
@@ -38,7 +38,7 @@ namespace AciTester.Models
public ushort PumpCoil { get; set; } = 6; // 高压超限 M180
- public ushort FlowRegister { get; set; } // 高压超限 M180
+ public ushort FlowRegister { get; set; } = 1330; // 高压超限 M180
diff --git a/Views/MainWindow.xaml b/Views/MainWindow.xaml
index 864ca0f..a31505e 100644
--- a/Views/MainWindow.xaml
+++ b/Views/MainWindow.xaml
@@ -4,18 +4,19 @@
xmlns:local="clr-namespace:AciTester.ViewModels"
Title="ACI测试系统 - 中国药典2025装置3"
Height="768" Width="1024"
- WindowStartupLocation="CenterScreen"
+ WindowStartupLocation="CenterScreen" WindowState="Maximized"
Background="#F0F2F5">
-
+
-
-
-
-
+
@@ -90,231 +91,296 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Views/MainWindow.xaml.cs b/Views/MainWindow.xaml.cs
index 62d61e8..3b9dc9b 100644
--- a/Views/MainWindow.xaml.cs
+++ b/Views/MainWindow.xaml.cs
@@ -41,7 +41,21 @@ namespace AciTester.Views
}
+ private void StagesDataGrid_Loaded(object sender, RoutedEventArgs e)
+ {
+ var dataGrid = sender as DataGrid;
+ if (dataGrid == null) return;
+ this.Dispatcher.BeginInvoke(new Action(() =>
+ {
+ double availableHeight = dataGrid.ActualHeight - 25 - 8; // 表头约28px,边框约8px
+ if (dataGrid.Items.Count > 0)
+ {
+ double rowHeight = availableHeight / dataGrid.Items.Count;
+ dataGrid.RowHeight = Math.Max(rowHeight, 25); // 最小行高设为28px
+ }
+ }), System.Windows.Threading.DispatcherPriority.Loaded);
+ }
}
}
\ No newline at end of file
diff --git a/Z173药用撞击器吸入粉雾剂粒径测定仪说明书.docx b/Z173药用撞击器吸入粉雾剂粒径测定仪说明书.docx
new file mode 100644
index 0000000..76b6f9d
Binary files /dev/null and b/Z173药用撞击器吸入粉雾剂粒径测定仪说明书.docx differ