From 98d01115603a2c04567bb2a1b52a8efec61d1ee2 Mon Sep 17 00:00:00 2001
From: xyy <544939200@qq.com>
Date: Sat, 14 Mar 2026 19:21:11 +0800
Subject: [PATCH]

---
 MainWindow.xaml    | 6 +++---
 MainWindow.xaml.cs | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index b3bdd1f..278679f 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:local="clr-namespace:自救器呼吸器综合检验仪"
-        Title="自救器呼吸器综合检验仪" Height="768" Width="1024"
+        Title="自救器呼吸器综合检验仪" Height="730" Width="1024"
         WindowStartupLocation="CenterScreen"
         Background="Transparent"
         FontFamily="Microsoft YaHeui" Loaded="Window_Loaded" Closed="Window_Closed" Closing="Window_Closing">
@@ -72,7 +72,7 @@
                                    FontSize="14" Foreground="#CCFFFFFF" Margin="0,5,0,0"/>-->
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Margin="2" HorizontalAlignment="Center">
-                        <TextBlock Text="样品编号：" FontSize="26" FontWeight="Bold" Foreground="White" Style="{StaticResource LabelStyle}"/>
+                        <TextBlock Text="样品编号：" FontSize="26" FontWeight="Bold" Foreground="White" Margin="200 0 0 0" Style="{StaticResource LabelStyle}"/>
                         <TextBox x:Name="pressureDiff2" Text="" Width="180" Style="{StaticResource TextBoxStyle}" LostFocus="pressureDiff2_GotFocus"/>
 
                     </StackPanel>
@@ -142,7 +142,7 @@
 
                                 <Button x:Name="btn_flow3" Content="自动/手动补给供氧(L/min)" Click="BtnWrite400_Click1"
                 Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold"
-                Width="168" Height="38" BorderThickness="0" Margin="-20,0,25,0"
+                Width="157" Height="38" BorderThickness="0" Margin="-20,0,25,0"
                 Cursor="Hand"/>
 
 
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 2094c2d..2b76aee 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -282,6 +282,7 @@ namespace 自救器呼吸器综合检验仪
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             string plcIp = "192.168.1.10";
+            //string plcIp = "127.0.0.1";
             bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
             if (!initSuccess)
             {