diff --git a/App.config b/App.config
new file mode 100644
index 0000000..ce1a9f1
--- /dev/null
+++ b/App.config
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+
+	<appSettings>
+		<add key="No" value="1"/>
+	</appSettings>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+	</startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+
+	<connectionStrings>
+		<add name="MySqlConnection"
+             connectionString="Server=localhost;Database=oxygen_testsystem;Uid=root;Pwd=123456;Charset=utf8;"
+             providerName="MySql.Data.MySqlClient"/>
+	</connectionStrings>
+</configuration>
\ No newline at end of file
diff --git a/App.xaml b/App.xaml
new file mode 100644
index 0000000..98c8517
--- /dev/null
+++ b/App.xaml
@@ -0,0 +1,9 @@
+<Application x:Class="自救器呼吸器综合检验仪.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:自救器呼吸器综合检验仪"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/App.xaml.cs b/App.xaml.cs
new file mode 100644
index 0000000..c9d2066
--- /dev/null
+++ b/App.xaml.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Security.Principal;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace 自救器呼吸器综合检验仪
+{
+    /// <summary>
+    /// App.xaml 的交互逻辑
+    /// </summary>
+    public partial class App : Application
+    {
+        public App()
+        {
+            // 捕获UI线程异常
+            DispatcherUnhandledException += App_DispatcherUnhandledException;
+            // 捕获非UI线程异常
+            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+            // 捕获任务线程异常
+            System.Threading.Tasks.TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
+        }
+
+        private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
+        {
+            LogError(e.Exception, "UI线程异常");
+            e.Handled = true; // 标记为已处理，避免崩溃（仅用于调试）
+        }
+
+        private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
+            if (e.ExceptionObject is Exception ex)
+                LogError(ex, "应用域未处理异常");
+        }
+
+        private void TaskScheduler_UnobservedTaskException(object sender, System.Threading.Tasks.UnobservedTaskExceptionEventArgs e)
+        {
+            LogError(e.Exception, "任务线程异常");
+            e.SetObserved();
+        }
+
+        private void LogError(Exception ex, string type)
+        {
+            string logPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "error.log");
+            string logContent = $"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] {type}：\n{ex.ToString()}\n\n";
+            File.AppendAllText(logPath, logContent);
+            MessageBox.Show($"发生错误，详情已记录到 {logPath}", "错误");
+        }
+
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            base.OnStartup(e);
+
+            if (!IsRunAsAdmin())
+            {
+                RestartAsAdmin();
+                Shutdown();
+            }
+        }
+
+        private bool IsRunAsAdmin()
+        {
+            WindowsIdentity identity = WindowsIdentity.GetCurrent();
+            WindowsPrincipal principal = new WindowsPrincipal(identity);
+            return principal.IsInRole(WindowsBuiltInRole.Administrator);
+        }
+
+        private void RestartAsAdmin()
+        {
+            ProcessStartInfo startInfo = new ProcessStartInfo();
+            startInfo.UseShellExecute = true;
+            startInfo.WorkingDirectory = Environment.CurrentDirectory;
+            startInfo.FileName = Process.GetCurrentProcess().MainModule.FileName;
+            startInfo.Verb = "runas"; // Run as administrator
+
+            try
+            {
+                Process.Start(startInfo);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("Error: " + ex.Message);
+            }
+        }
+    }
+}
diff --git a/Data/BaseWindow.xaml b/Data/BaseWindow.xaml
new file mode 100644
index 0000000..33dabf5
--- /dev/null
+++ b/Data/BaseWindow.xaml
@@ -0,0 +1,12 @@
+<Window x:Class="自救器呼吸器综合检验仪.Data.BaseWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:自救器呼吸器综合检验仪.Data"
+        mc:Ignorable="d"
+        Title="BaseWindow" Height="450" Width="800">
+    <Grid>
+        
+    </Grid>
+</Window>
diff --git a/Data/BaseWindow.xaml.cs b/Data/BaseWindow.xaml.cs
new file mode 100644
index 0000000..0293a34
--- /dev/null
+++ b/Data/BaseWindow.xaml.cs
@@ -0,0 +1,34 @@
+using Modbus.Device;
+using System;
+using System.Net.Sockets;
+using System.Windows;
+
+namespace 自救器呼吸器综合检验仪.Data
+{
+    public partial class BaseWindow : Window
+    {
+        // 共享资源（从管理器获取，不自己创建）
+        protected TcpClient _tcpClient => ModbusResourceManager.Instance.TcpClient;
+        protected IModbusMaster _modbusMaster => ModbusResourceManager.Instance.ModbusMaster;
+        protected System.Timers.Timer _readTimer { get; set; } = new System.Timers.Timer();
+
+        // 窗口关闭时仅停止定时器，不释放资源（资源由管理器统一释放）
+        protected override void OnClosed(EventArgs e)
+        {
+            base.OnClosed(e);
+            _readTimer?.Stop();
+            _readTimer?.Dispose();
+        }
+
+        // 检查资源是否可用（避免空引用报错）
+        protected bool CheckResourceAvailable()
+        {
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                MessageBox.Show("TCP连接已断开，请重新初始化连接！", "提示");
+                return false;
+            }
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Data/BoolSign.cs b/Data/BoolSign.cs
new file mode 100644
index 0000000..c61ee82
--- /dev/null
+++ b/Data/BoolSign.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace 自救器呼吸器综合检验仪.Data
+{
+
+        public class BoolSignal
+        {
+            private bool _previousValue;
+
+            public event Action OnRisingEdge;
+      //  bool value = true;
+            public bool Value { get; set; }
+
+            public void CheckRisingEdge()
+            {
+                if (Value && !_previousValue)
+                {
+                    OnRisingEdge?.Invoke();
+                }
+                _previousValue = Value;
+            }
+        }
+    
+}
diff --git a/Data/DataChange.cs b/Data/DataChange.cs
new file mode 100644
index 0000000..685a948
--- /dev/null
+++ b/Data/DataChange.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace 自救器呼吸器综合检验仪
+{
+    public class DataChange
+    {
+        /// <summary>
+        /// ushort转为float类型
+        /// </summary>
+        /// <param name="P1"></param>
+        /// <param name="P2"></param>
+        /// <returns>float型数据</returns>
+        public float UshortToFloat(ushort P1, ushort P2)
+        {
+            int intSign, intSignRest, intExponent, intExponentRest;
+            float faResult, faDigit;
+            intSign = P1 / 32768;
+            intSignRest = P1 % 32768;
+            intExponent = intSignRest / 128;
+            intExponentRest = intSignRest % 128;
+            faDigit = (float)(intExponentRest * 65536 + P2) / 8388608;
+            faResult = (float)Math.Pow(-1, intSign) * (float)Math.Pow(2, intExponent - 127) * (faDigit + 1);
+            return faResult;
+        }
+        /// <summary>
+        /// ushort转为int类型
+        /// </summary>
+        /// <param name="u1"></param>
+        /// <param name="u2"></param>
+        /// <returns>返回int型数据</returns>
+        public int UshortToInt1(ushort u1, ushort u2)
+        {
+            ushort[] maidong = new ushort[2] { u1, u2 };
+            byte[] bytes = new byte[maidong.Length * 2];
+            Buffer.BlockCopy(maidong, 0, bytes, 0, bytes.Length);
+            int result = BitConverter.ToInt32(bytes, 0);
+            // 将字节数组转换为32位无符号整数
+            return result;
+
+        }
+        /// <summary>
+        /// Float转为Ushort数组发送
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns>返回ushort数组</returns>
+        public ushort[] SplitFloatToUShortArray(float value)
+        {
+            byte[] floatBytes = BitConverter.GetBytes(value);
+            ushort[] ushortArray = new ushort[floatBytes.Length / 2];
+
+            for (int i = 0, j = 0; i < floatBytes.Length; i += 2, j++)
+            {
+                ushortArray[j] = BitConverter.ToUInt16(floatBytes, i);
+            }
+
+            return ushortArray;
+        }
+        /// <summary>
+        /// Int转为ushort数组发送
+        /// </summary>
+        /// <param name="res"></param>
+        /// <returns>返回ushort数组</returns>
+        public ushort[] intToushorts(int res)
+        {
+            ushort ust1 = (ushort)(res >> 16);
+            ushort ust2 = (ushort)res;
+            return new ushort[] { ust2, ust1 };
+        }
+    }
+}
diff --git a/Data/ExperData.cs b/Data/ExperData.cs
new file mode 100644
index 0000000..33403a3
--- /dev/null
+++ b/Data/ExperData.cs
@@ -0,0 +1,151 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace 自救器呼吸器综合检验仪
+{
+    public  class ExperData: INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+        #region 实验属性
+        static string experName = "";
+        /// <summary>
+        /// 实验人员
+        /// </summary>
+        public string ExperName { get { return experName; } set { experName = value; } }
+       
+        static string experDate = "";
+        /// <summary>
+        /// 实验日期
+        /// </summary>
+        public string ExperDate { get { return experDate; } set { experDate = value; } }
+      
+        static string experNum = "";
+        /// <summary>
+        /// 实验编号
+        /// </summary>
+        public string ExperNum { get { return experNum; } set { experNum = value; } }
+     
+        static string experType = " ";
+        /// <summary>
+        /// 实验种类
+        /// </summary>
+        public string ExperType { get { return experType; } set { experType = value; } }
+        static float experMaskType = 2.0f;
+        /// <summary>
+        /// 口罩类型
+        /// </summary>
+        public float ExperMaskType { get { return experMaskType; } set { experMaskType = value; } }
+        /// <summary>
+        /// 面罩类型
+        /// </summary>
+        static string maskType;
+        public string MaskType { get { return maskType; } set { maskType = value; } }
+        static float _yangPinXiShu = 1.0f;
+        /// <summary>
+        /// 样品系数
+        /// </summary>
+        public float YangPinXiShu { get { return _yangPinXiShu; } set { _yangPinXiShu = value; } }
+        static string _testStatus = "";
+
+
+        /// <summary>
+        /// 实验状态
+        /// </summary>
+        public string TestStatus { get { return _testStatus; } set { _testStatus = value; } }
+        static float benDiNongDu = 0.00f;
+        /// <summary>
+        /// 本底浓度
+        /// </summary>
+        public float BenDiNongDu { get { return benDiNongDu; } set { benDiNongDu = value; } }
+    
+        static float huanJingWenDu = 0.00f;
+        /// <summary>
+        /// 环境温度
+        /// </summary>
+        public float HuanJingWenDu { get { return huanJingWenDu; } set { huanJingWenDu = value; } }
+            
+     
+        static float huanJingShiDu = 0.00f;
+        /// <summary>
+        /// 环境湿度
+        /// </summary>
+        public float HuanJingShiDu { get { return huanJingShiDu; } set { huanJingShiDu = value; } }
+     
+        static float o2NongDu = 0.00f;
+        /// <summary>
+        /// 环境氧浓度
+        /// </summary>
+        public float O2NongDu { get { return o2NongDu; } set { o2NongDu = value; } }
+        
+        static float cO2NongDu = 0.00f;
+        /// <summary>
+        /// 环境C02浓度
+        /// </summary>
+        public float CO2NongDu_Indoor { get { return cO2NongDu; } set { cO2NongDu = value; } }
+        
+        static float inDoor_TSINongDu = 0.00f;
+        /// <summary>
+        /// 环境气溶胶浓度
+        /// </summary>
+        public float InDoor_TSINongDu { get { return inDoor_TSINongDu; } set { inDoor_TSINongDu = value; } }
+        
+        static float mask_CO2NongDu = 0.00f;
+        /// <summary>
+        /// 口罩内CO2浓度
+        /// </summary>
+        public float Mask_CO2NongDu { get { return mask_CO2NongDu; } set { mask_CO2NongDu = value; } }
+       
+        static float mask_TSINongDu = 0.00f;
+        /// <summary>
+        /// 口罩内气溶胶浓度
+        /// </summary>
+        public float Mask_TSINongDu { get { return mask_TSINongDu; } set { mask_TSINongDu = value; } }
+
+        static float _liuLiang = 0.00f;
+        /// <summary>
+        /// 流量
+        /// </summary>
+        public float LiuLiang { get { return _liuLiang; } set { _liuLiang = value; } }
+        static float _xieloulv = 0.00f;
+        /// <summary>
+        /// 泄露率
+        /// </summary>
+        public float XieLouLv { get { return _xieloulv; } set { _xieloulv = value; } }
+
+
+        #endregion
+
+        #region 泄露率计算
+        //单独动作泄露率
+        public float CumulativeLeakageRate(List<float> inDoor_Tsi,List<float> out_Door_Tsi,float benDiNongdu,float xiShu)
+        {
+            if (inDoor_Tsi.Count != 0 && out_Door_Tsi.Count != 0&& benDiNongdu!=0.0f)
+            {         
+                //计算室内Tsi浓度平均值
+                float inDoor_Tsi_Avg = inDoor_Tsi.Average();
+                //计算室外Tsi浓度平均值
+                float out_Door_Tsi_Avg = out_Door_Tsi.Average();
+                //计算泄露率
+                float leakageRate = ((out_Door_Tsi_Avg - inDoor_Tsi_Avg) * xiShu) / benDiNongdu;
+                return leakageRate;
+            }
+            else
+            {
+                return 0.00f;
+            }
+   
+        }
+        //全部动作泄露率
+        public float CumulativeLeakageRate_All(List<float> All_Cv_List)
+
+        {
+             return All_Cv_List.Average();
+        }
+        #endregion
+
+    }
+}
diff --git a/Data/Function.cs b/Data/Function.cs
new file mode 100644
index 0000000..39806c0
--- /dev/null
+++ b/Data/Function.cs
@@ -0,0 +1,185 @@
+using Modbus.Device;
+using Modbus;
+using Sunny.UI;
+using System;
+using System.Threading;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace 自救器呼吸器综合检验仪
+{
+    public class Function
+    {
+        ModbusMaster master;
+        IModbusMaster modbusMaster;
+        DataChange dc = new DataChange();
+        public enum ButtonType
+        {
+            复归型,
+            切换型,
+            置位型,
+            复位型
+        }
+        public enum DataType
+        {
+            整形,
+            浮点型
+        }
+        public Function(ModbusMaster master_in)
+        {
+            this.master = master_in;
+        }
+
+        public Function(IModbusMaster modbusMaster)
+        {
+            this.modbusMaster = modbusMaster;
+        }
+
+        public void BtnClickFunction(ButtonType buttonType, ushort address)
+        {
+            try
+            {
+                switch (buttonType)
+                {
+                    case ButtonType.复归型:
+                        master.WriteSingleCoil(1, address, true);
+                        Thread.Sleep(100);
+                        master.WriteSingleCoil(1, address, false);
+                        Thread.Sleep(100);
+                        break;
+                    case ButtonType.切换型:
+                        if (master.ReadCoils(1, address, 1)[0])
+                        {
+                            master.WriteSingleCoil(1, address, false); Thread.Sleep(100);
+                        }
+                        else
+                        { master.WriteSingleCoil(1, address, true); Thread.Sleep(100); }
+                        break;
+                    case ButtonType.置位型:
+                        master.WriteSingleCoil(1, address, true);
+                        Thread.Sleep(100);
+                        break;
+                    case ButtonType.复位型:
+                        master.WriteSingleCoil(1, address, false);
+                        Thread.Sleep(100);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+
+            }
+
+        }
+
+        public void BtnClickFunctionForNew(ButtonType buttonType, ushort address)
+        {
+            try
+            {
+                switch (buttonType)
+                {
+                    case ButtonType.复归型:
+                        modbusMaster.WriteSingleCoil(1, address, true);
+                        Thread.Sleep(100);
+                        modbusMaster.WriteSingleCoil(1, address, false);
+                        Thread.Sleep(100);
+                        break;
+                    case ButtonType.切换型:
+                        if (modbusMaster.ReadCoils(1, address, 1)[0])
+                        {
+                            modbusMaster.WriteSingleCoil(1, address, false); Thread.Sleep(100);
+                        }
+                        else
+                        { modbusMaster.WriteSingleCoil(1, address, true); Thread.Sleep(100); }
+                        break;
+                    case ButtonType.置位型:
+                        modbusMaster.WriteSingleCoil(1, address, true);
+                        Thread.Sleep(100);
+                        break;
+                    case ButtonType.复位型:
+                        modbusMaster.WriteSingleCoil(1, address, false);
+                        Thread.Sleep(100);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+
+            }
+
+        }
+        public void WriteToPLC(string inPutValue, ushort address, DataType dataType)
+        {
+
+            try
+            {
+                switch (dataType)
+                {
+                    case DataType.浮点型:
+                        double value = inPutValue.ToDouble();
+                        if (UIInputDialog.ShowInputDoubleDialog(ref value, UIStyle.Inherited, desc: "请输入值", showMask: false))
+                        {
+
+                            master.WriteMultipleRegisters(1, address, dc.SplitFloatToUShortArray((float)value));
+                        }
+                        break;
+                    case DataType.整形:
+                        int value_int = inPutValue.ToInt();
+                        if (UIInputDialog.ShowInputIntegerDialog(ref value_int, UIStyle.Inherited, desc: "请输入数据："))
+                        {
+
+                            master.WriteMultipleRegisters(1, address, dc.intToushorts(value_int));
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("操作失败！" + "\n" + "\n" + ex.Message, "错误");
+            }
+
+        }
+
+        public void WriteToPLCForNew(string inPutValue, ushort address, DataType dataType)
+        {
+            try
+            {
+                //KeyboardHelper.ShowSoftKeyboard();
+                switch (dataType)
+                {
+                    case DataType.浮点型:
+                        double value = inPutValue.ToDouble();
+
+                        if (UIInputDialog.ShowInputDoubleDialog(ref value, UIStyle.Inherited, desc: "请输入值", showMask: false))
+                        {
+
+                            modbusMaster.WriteMultipleRegisters(1, address, dc.SplitFloatToUShortArray((float)value));
+                        }
+                        break;
+                    case DataType.整形:
+                        int value_int = inPutValue.ToInt();
+                        if (UIInputDialog.ShowInputIntegerDialog(ref value_int, UIStyle.Inherited, desc: "请输入数据："))
+                        {
+                            modbusMaster.WriteMultipleRegisters(1, address, dc.intToushorts(value_int));
+                        }
+                        break;
+                    default:
+                        break;
+                }
+
+                //KeyboardHelper.HideSoftKeyboard();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("操作失败！" + "\n" + "\n" + ex.Message, "错误");
+            }
+
+        }
+    }
+}
diff --git a/Data/LoginData.cs b/Data/LoginData.cs
new file mode 100644
index 0000000..961f951
--- /dev/null
+++ b/Data/LoginData.cs
@@ -0,0 +1,21 @@
+namespace 自救器呼吸器综合检验仪
+{
+    public class LoginData
+    {
+        static string _userName = "";
+        public string UserName
+        {
+            get { return _userName; }
+            set { _userName = value; }
+        }
+
+        //登陆权限
+        static int _userPower = 0;//0为普通用户，1为管理员
+        public int UserPower
+        {
+            get { return _userPower; }
+            set { _userPower = value; }
+        }
+
+    }
+}
diff --git a/Data/ModbusResourceManager.cs b/Data/ModbusResourceManager.cs
new file mode 100644
index 0000000..cbe6c56
--- /dev/null
+++ b/Data/ModbusResourceManager.cs
@@ -0,0 +1,76 @@
+using Modbus.Device;
+using System;
+using System.Net.Http;
+using System.Net.Sockets;
+
+namespace 自救器呼吸器综合检验仪.Data
+{
+    // 单例模式：全局唯一资源管理器
+    public class ModbusResourceManager
+    {
+        // 私有构造函数：禁止外部new
+        private ModbusResourceManager() { }
+
+        // 唯一实例
+        private static readonly Lazy<ModbusResourceManager> _instance = new Lazy<ModbusResourceManager>(() => new ModbusResourceManager());
+        public static ModbusResourceManager Instance => _instance.Value;
+
+        // 共享资源
+        public TcpClient TcpClient { get; private set; }
+        public IModbusMaster ModbusMaster { get; private set; }
+
+        // 初始化资源（在程序启动时调用，如MainWindow加载时）
+        public bool Init(string ip, int port)
+        {
+            try
+            {
+                // 先释放旧资源
+                ReleaseResource();
+
+                // 创建新连接
+                TcpClient = new TcpClient();
+                TcpClient.Connect(ip, port);
+                ModbusMaster = ModbusIpMaster.CreateIp(TcpClient);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"资源初始化失败：{ex.Message}");
+                ReleaseResource();
+                return false;
+            }
+        }
+
+        // 在 ModbusResourceManager 类中添加
+        public void Dispose()
+        {
+            try
+            {
+                ModbusMaster?.Dispose();
+                TcpClient?.Close();
+            }
+            catch
+            {
+                // 忽略清理时的异常
+            }
+        }
+
+        // 释放资源（统一释放，避免重复关闭）
+        public void ReleaseResource()
+        {
+            try
+            {
+                ModbusMaster?.Dispose();
+                ModbusMaster = null;
+
+                //if (TcpClient?.Connected ?? false)
+                //{
+                //    TcpClient.Close();
+                //}
+                TcpClient?.Dispose();
+                TcpClient = null;
+            }
+            catch { }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Data/PLC_Data.cs b/Data/PLC_Data.cs
new file mode 100644
index 0000000..64667bf
--- /dev/null
+++ b/Data/PLC_Data.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace 自救器呼吸器综合检验仪.Data
+{
+    internal class PLC_Data
+    {
+      
+    }
+}
diff --git a/Data/keyboard.cs b/Data/keyboard.cs
new file mode 100644
index 0000000..35c8adb
--- /dev/null
+++ b/Data/keyboard.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Security.Principal;
+using System.Windows;
+
+public class KeyboardHelper
+{
+    public static void ShowSoftKeyboard()
+    {
+        if (!IsRunAsAdmin())
+        {
+            RestartAsAdmin();
+            return;
+        }
+
+        // 替换原有的 Process.Start 代码
+        string oskPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "osk.exe");
+        if (File.Exists(oskPath))
+        {
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = oskPath,
+                UseShellExecute = true
+            });
+        }
+        else
+        {
+            //MessageBox.Show("未找到屏幕键盘程序（osk.exe），可能系统文件缺失或非Windows系统。", "错误");
+        }
+    }
+
+    public static void HideSoftKeyboard()
+    {
+        try
+        {
+            Process.Start("cmd.exe", "/C taskkill /IM osk.exe /F");
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine("Error: " + ex.Message);
+        }
+    }
+
+    private static bool IsRunAsAdmin()
+    {
+        WindowsIdentity identity = WindowsIdentity.GetCurrent();
+        WindowsPrincipal principal = new WindowsPrincipal(identity);
+        return principal.IsInRole(WindowsBuiltInRole.Administrator);
+    }
+
+    private static void RestartAsAdmin()
+    {
+        ProcessStartInfo startInfo = new ProcessStartInfo();
+        startInfo.UseShellExecute = true;
+        startInfo.WorkingDirectory = Environment.CurrentDirectory;
+        startInfo.FileName = Process.GetCurrentProcess().MainModule.FileName;
+        startInfo.Verb = "runas";
+
+        try
+        {
+            Process.Start(startInfo);
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine("Error: " + ex.Message);
+        }
+
+        Environment.Exit(0);
+    }
+}
diff --git a/DetectionMenuWindow.xaml b/DetectionMenuWindow.xaml
new file mode 100644
index 0000000..50b435e
--- /dev/null
+++ b/DetectionMenuWindow.xaml
@@ -0,0 +1,130 @@
+<Window x:Class="自救器呼吸器综合检验仪.DetectionMenuWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:自救器呼吸器综合检验仪"
+        Title="检验功能选择" Height="700" Width="1200"
+        WindowStartupLocation="CenterScreen"
+        FontFamily="Segoe UI"
+        Background="#F5F7FA">
+    <Window.DataContext>
+        <local:MainViewModel />
+    </Window.DataContext>
+    <Window.Resources>
+        <!-- 颜色定义 -->
+        <SolidColorBrush x:Key="PrimaryColor">#2C3E50</SolidColorBrush>
+        <SolidColorBrush x:Key="SecondaryColor">#3498DB</SolidColorBrush>
+        <SolidColorBrush x:Key="AccentColor">#E74C3C</SolidColorBrush>
+        <SolidColorBrush x:Key="White">White</SolidColorBrush>
+        <SolidColorBrush x:Key="BorderColor">#E1E8ED</SolidColorBrush>
+        <SolidColorBrush x:Key="TextGray">#7F8C8D</SolidColorBrush>
+
+        <!-- 卡片样式 -->
+        <Style x:Key="CardStyle" TargetType="Border">
+            <Setter Property="Background" Value="{StaticResource White}"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="BorderBrush" Value="{StaticResource BorderColor}"/>
+            <Setter Property="Margin" Value="15"/>
+            <Setter Property="Effect">
+                <Setter.Value>
+                    <DropShadowEffect BlurRadius="20" Opacity="0.1" ShadowDepth="4"/>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <!-- 标题样式 -->
+        <Style x:Key="TitleTextStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="24"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="Foreground" Value="{StaticResource PrimaryColor}"/>
+        </Style>
+
+        <!-- 检验按钮基础样式 -->
+        <Style x:Key="DetectionButtonBaseStyle" TargetType="Button">
+            <Setter Property="Background" Value="{StaticResource SecondaryColor}"/>
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="FontSize" Value="20"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="Padding" Value="20 12"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Cursor" Value="Hand"/>
+            <Setter Property="Margin" Value="10"/>
+            <Setter Property="Height" Value="70"/>
+            <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        </Style>
+
+        <!-- 返回按钮样式 -->
+        <Style x:Key="ReturnButtonStyle" TargetType="Button">
+            <Setter Property="Background" Value="{StaticResource AccentColor}"/>
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="FontSize" Value="16"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="Padding" Value="15 8"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Cursor" Value="Hand"/>
+            <Setter Property="Height" Value="50"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        </Style>
+    </Window.Resources>
+
+    <Grid Margin="20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- 顶部标题栏 -->
+        <Border Grid.Row="0" Background="{StaticResource White}" Margin="0 0 0 20" 
+                BorderThickness="1" BorderBrush="{StaticResource BorderColor}">
+            <Grid Margin="20 15">
+                <TextBlock Text="自救器呼吸器综合检验仪" Style="{StaticResource TitleTextStyle}"/>
+                <TextBlock Text="检验功能选择界面" FontSize="14" Foreground="{StaticResource TextGray}" Margin="0 30 0 0"/>
+            </Grid>
+        </Border>
+
+        <!-- 中间检验按钮区域 -->
+        <Border Grid.Row="1" Style="{StaticResource CardStyle}">
+            <Grid Margin="50 30">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <Button Grid.Row="0" Style="{StaticResource DetectionButtonBaseStyle}">
+                    <StackPanel Orientation="Vertical">
+                        <TextBlock Text="定量供氧检验"/>
+                        <TextBlock Text="TBK_0(M-61)" Foreground="Red" FontSize="12" Margin="0 3 0 0"/>
+                    </StackPanel>
+                </Button>
+
+                <Button Grid.Row="1" Style="{StaticResource DetectionButtonBaseStyle}">
+                    <StackPanel Orientation="Vertical">
+                        <TextBlock Text="负压气密性检验"/>
+                        <TextBlock Text="TBK_1(M-62)" Foreground="Red" FontSize="12" Margin="0 3 0 0"/>
+                    </StackPanel>
+                </Button>
+
+                <Button Grid.Row="2" Style="{StaticResource DetectionButtonBaseStyle}">
+                    <StackPanel Orientation="Vertical">
+                        <TextBlock Text="正压气密性检验"/>
+                        <TextBlock Text="TBK_2(M-63)" Foreground="Red" FontSize="12" Margin="0 3 0 0"/>
+                    </StackPanel>
+                </Button>
+
+                <Button Grid.Row="3" Style="{StaticResource DetectionButtonBaseStyle}">
+                    <StackPanel Orientation="Vertical">
+                        <TextBlock Text="排气阀开启压力检验"/>
+                        <TextBlock Text="TBK_3(M-64)" Foreground="Red" FontSize="12" Margin="0 3 0 0"/>
+                    </StackPanel>
+                </Button>
+            </Grid>
+        </Border>
+
+        <!-- 底部返回按钮 -->
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 10 20 0">
+            <Button Content="返回主页" Tag="FK_4" Style="{StaticResource ReturnButtonStyle}" Click="ReturnToMain_Click"/>
+        </StackPanel>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/DetectionMenuWindow.xaml.cs b/DetectionMenuWindow.xaml.cs
new file mode 100644
index 0000000..67ff878
--- /dev/null
+++ b/DetectionMenuWindow.xaml.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace 自救器呼吸器综合检验仪
+{
+    /// <summary>
+    /// Window1.xaml 的交互逻辑
+    /// </summary>
+    public partial class DetectionMenuWindow : Window
+    {
+        public DetectionMenuWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void ReturnToMain_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}
diff --git a/MainViewModel.cs b/MainViewModel.cs
new file mode 100644
index 0000000..45722f1
--- /dev/null
+++ b/MainViewModel.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Timers;
+using 自救器呼吸器综合检验仪;
+
+namespace 自救器呼吸器综合检验仪
+{
+    public class MainViewModel : NotifyPropertyChangedBase
+    {
+        private DateTime _currentTime;
+        private readonly Timer _timer;
+
+        // 可绑定的当前时间属性
+        public DateTime CurrentTime
+        {
+            get => _currentTime;
+            set => SetField(ref _currentTime, value);
+        }
+
+        public MainViewModel()
+        {
+            // 初始化当前时间
+            CurrentTime = DateTime.Now;
+
+            // 创建定时器，每隔1秒触发一次
+            _timer = new Timer(1000);
+            _timer.Elapsed += Timer_Elapsed;
+            _timer.Start();
+        }
+
+        private void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            // 检查应用程序是否还在运行
+            if (App.Current == null || App.Current.Dispatcher == null)
+            {
+                StopTimer();
+                return;
+            }
+
+            try
+            {
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    CurrentTime = DateTime.Now;
+                });
+            }
+            catch
+            {
+                // 应用程序关闭时忽略异常
+                StopTimer();
+            }
+        }
+
+        public void StopTimer()
+        {
+            if (_timer != null)
+            {
+                _timer.Stop();
+                _timer.Elapsed -= Timer_Elapsed;
+                _timer.Dispose();
+            }
+        }
+
+        // 释放定时器资源（避免内存泄漏）
+        public void Dispose()
+        {
+            _timer?.Stop();
+            _timer?.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/MainWindow.xaml b/MainWindow.xaml
new file mode 100644
index 0000000..759a98c
--- /dev/null
+++ b/MainWindow.xaml
@@ -0,0 +1,309 @@
+<Window x:Class="自救器呼吸器综合检验仪.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:自救器呼吸器综合检验仪"
+        Title="自救器呼吸器综合检验仪" Height="900" Width="1280"
+        WindowStartupLocation="CenterScreen"
+        Background="Transparent"
+        FontFamily="Microsoft YaHeui" Loaded="Window_Loaded" Closed="Window_Closed" Closing="Window_Closing">
+
+    <Window.DataContext>
+        <local:MainViewModel />
+    </Window.DataContext>
+
+    
+    <Window.Resources>
+
+        <Style x:Key="LabelStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="11"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="Margin" Value="3,2"/>
+        </Style>
+
+        <Style x:Key="TextBoxStyle" TargetType="TextBox">
+            <Setter Property="FontSize" Value="11"/>
+            <Setter Property="Height" Value="22"/>
+            <Setter Property="Width" Value="65"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="Margin" Value="3,2"/>
+            <Setter Property="BorderBrush" Value="#CCCCCC"/>
+            <Setter Property="BorderThickness" Value="1"/>
+        </Style>
+
+
+    </Window.Resources>
+    
+    <!-- 背景层 -->
+    <Grid>
+        <!-- 背景图片 -->
+        <Grid.Background>
+            <ImageBrush ImageSource="Resources/sleep2.jpg" Stretch="UniformToFill" Opacity="0.15"/>
+        </Grid.Background>
+
+        <!-- 背景遮罩层 -->
+        <Rectangle Fill="#1E3A5F" Opacity="0.85"/>
+
+        <!-- 主内容容器 -->
+        <Grid Margin="25">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <!-- 顶部标题栏 -->
+            <Border Grid.Row="0" Background="#2A4B6D" BorderBrush="#3A5B8C" BorderThickness="0,0,0,2" 
+                    Margin="0,0,0,20" Padding="25,15">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <!-- 主标题 -->
+                    <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                        <TextBlock Text="定量供应检验系统" 
+                                   FontSize="26" FontWeight="Bold" Foreground="White"/>
+                        <!--<TextBlock Text="定量供应检验系统" 
+                                   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}"/>
+                        <TextBox x:Name="pressureDiff2" Text="" Width="180" Style="{StaticResource TextBoxStyle}" LostFocus="pressureDiff2_GotFocus"/>
+
+                    </StackPanel>
+
+                    <!-- 状态指示 -->
+                    <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,30,0">
+                        <Border Background="#27AE60" Padding="12,6" Margin="0,0,15,0">
+                            <TextBlock Text="系统状态：" FontSize="12" Foreground="White" FontWeight="Bold"/>
+                        </Border>
+                        <Border x:Name="statusPanel" Background="#3498DB" Padding="12,6">
+                            <TextBlock x:Name="status" Text="空闲" FontSize="12" Foreground="White" FontWeight="Bold"/>
+                        </Border>
+                    </StackPanel>
+
+                    <!-- 系统时间 -->
+                    <Border Grid.Column="2" Background="White" Padding="15,8">
+                        <TextBlock Text="{Binding CurrentTime, StringFormat='yyyy-MM-dd HH:mm:ss'}" 
+                                   FontSize="12" FontWeight="Bold" Foreground="#2C3E50"/>
+                    </Border>
+                </Grid>
+            </Border>
+
+            <!-- 主内容区域 -->
+            <Grid Grid.Row="1" Margin="0,0,0,20">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+                <!-- 左侧：配置与监控区 -->
+                <Grid Grid.Column="0" Margin="0,0,20,0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+
+                    <!-- 参数配置区 -->
+                    <Border Grid.Row="0" Background="White" Margin="0,0,0,20" 
+                            BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="30,25">
+                            
+                            <TextBlock Text="⚙️ 参数配置" FontSize="20" FontWeight="Bold" 
+                                       Foreground="#2C3E50" Margin="0,0,0,20"/>
+                            
+
+                            <!-- 检验时间配置 -->
+                            <StackPanel Orientation="Horizontal" Margin="0,0,0,15">
+                                <TextBlock Text="检验时间：" Width="100" VerticalAlignment="Center" 
+                                           FontSize="14" FontWeight="SemiBold" Foreground="#2C3E50"/>
+                                <TextBox x:Name="settingtime" Text="0" Width="100" Height="35" 
+                                         VerticalContentAlignment="Center" TextAlignment="Center"
+                                         BorderBrush="#DCDFE6" BorderThickness="1" Background="#FAFBFC"
+                                         FontSize="14" TextChanged="settingtime_TextChanged"/>
+                                <TextBlock Text="秒" Margin="15,0,40,0" VerticalAlignment="Center" 
+                                           FontSize="14" Foreground="#7F8C8D"/>
+
+                                <Button Content="🔧 设置参数" Click="BtnWrite401_Click" 
+                                        Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold"
+                                        Width="120" Height="38" BorderThickness="0" Margin="0,0,25,0"
+                                        Cursor="Hand"/>
+
+                                <Button x:Name="btn_flow2" Content="定量供氧L/min" Click="BtnWrite400_Click"
+                                        Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold"
+                                        Width="120" Height="38" BorderThickness="0" Margin="0,0,25,0"
+                                        Cursor="Hand"/>
+
+                                <Button x:Name="btn_flow3" Content="自动/手动补给供氧(L/min)" Click="BtnWrite400_Click1"
+                Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold"
+                Width="174" Height="38" BorderThickness="0" Margin="0,0,25,0"
+                Cursor="Hand"/>
+
+
+
+                                <!--<Border Background="#F8F9FA" Padding="10,6" BorderBrush="#E1E8ED" BorderThickness="1">-->
+                                    <!--<TextBlock x:Name="label_flow" Text="0-100L/min" VerticalAlignment="Center"
+                                               FontSize="12" FontWeight="Bold" Foreground="#3498DB"/>-->
+                                    
+                                <!--</Border>-->
+                            </StackPanel>
+
+                            <!-- 试验时间显示 -->
+                            <!--<StackPanel Orientation="Horizontal">
+                                <TextBlock Text="试验时间：" Width="100" VerticalAlignment="Center" 
+                                           FontSize="14" FontWeight="SemiBold" Foreground="#2C3E50"/>
+                                <TextBox Text="0" Width="70" Height="35" VerticalContentAlignment="Center" 
+                                         TextAlignment="Center" BorderBrush="#DCDFE6" BorderThickness="1" 
+                                         Background="#FAFBFC" FontSize="14"/>
+                                <TextBlock Text="分" Margin="10,0,25,0" VerticalAlignment="Center" 
+                                           FontSize="14" Foreground="#7F8C8D"/>
+                                <TextBox Text="0" Width="70" Height="35" VerticalContentAlignment="Center" 
+                                         TextAlignment="Center" BorderBrush="#DCDFE6" BorderThickness="1" 
+                                         Background="#FAFBFC" FontSize="14"/>
+                                <TextBlock Text="秒" Margin="10,0,0,0" VerticalAlignment="Center" 
+                                           FontSize="14" Foreground="#7F8C8D"/>
+                            </StackPanel>-->
+                        </StackPanel>
+                    </Border>
+
+                    <!-- 实时数据监控 -->
+                    <Border Grid.Row="1" Background="White" BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="30,25">
+                            <TextBlock Text="📊 实时数据监控" FontSize="20" FontWeight="Bold" 
+                                       Foreground="#2C3E50" Margin="0,0,0,25"/>
+
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <!-- 当前流量 -->
+                                <Border Grid.Column="0" Background="#F8F9FA" Margin="15" Padding="25,20" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="当前流量" FontSize="13" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,12"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="min" Text="0.00" FontSize="24" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="L/min" FontSize="13" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="8,0,0,3"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+
+                                <!-- 试验时间 -->
+                                <Border Grid.Column="1" Background="#F8F9FA" Margin="15" Padding="25,20" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="试验时间" FontSize="13" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,12"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="second" Text="0.00" FontSize="24" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="秒" FontSize="13" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="8,0,0,3"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+
+                                <!-- 供氧流量 -->
+                                <Border Grid.Column="2" Background="#F8F9FA" Margin="15" Padding="25,20" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="供氧流量" FontSize="13" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,12"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="speed" Text="0.00" FontSize="24" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="L/min" FontSize="13" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="8,0,0,3"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+                                
+                            </Grid>
+                        </StackPanel>
+                    </Border>
+                </Grid>
+
+                <!-- 右侧：操作控制区 -->
+                <StackPanel Grid.Column="1">
+                    <!-- 数据管理 -->
+                    <Border Background="White" Margin="0,0,0,20" BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="25,20">
+                            <TextBlock Text="💾 数据管理" FontSize="18" FontWeight="Bold" Foreground="#2C3E50" 
+                                       HorizontalAlignment="Center" Margin="0,0,0,20"/>
+                            <Button Content="📝 记录数据" Click="Button_Click" 
+                                    Background="#3498DB" Foreground="White" FontSize="14" FontWeight="Bold"
+                                    Height="50" BorderThickness="0" Cursor="Hand"/>
+                        </StackPanel>
+                    </Border>
+
+                    <!-- 测试控制 -->
+                    <Border Background="White" BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="25,20">
+                            <TextBlock Text="🎛️ 测试控制" FontSize="18" FontWeight="Bold" Foreground="#2C3E50" 
+                                       HorizontalAlignment="Center" Margin="0,0,0,20"/>
+
+                            <Button Content="🚀 启动测试" Click="Button_Click_1" 
+                                    Background="#27AE60" Foreground="White" FontSize="14" FontWeight="Bold"
+                                    Height="50" BorderThickness="0" Margin="0,0,0,12" Cursor="Hand"/>
+
+                            <Button Content="🛑 停止测试" Click="Button_Click_2" 
+                                    Background="#E74C3C" Foreground="White" FontSize="14" FontWeight="Bold"
+                                    Height="50" BorderThickness="0" Margin="0,0,0,12" Cursor="Hand"/>
+
+                            <Button Content="📡 开始采集" Click="Button_Click_3" 
+                                    Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold"
+                                    Height="45" BorderThickness="0" Cursor="Hand"/>
+                        </StackPanel>
+                    </Border>
+                </StackPanel>
+            </Grid>
+
+            <!-- 底部导航 -->
+            <Border Grid.Row="2" Background="White" BorderBrush="#E1E8ED" BorderThickness="1,0,0,0">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="15,12">
+                    <Button x:Name="btn_setting"
+        Content=""
+        Click="btn_setting_Click"
+        Background="Transparent"
+        BorderBrush="Transparent"
+        Foreground="Transparent"
+        Opacity="0"
+        Width="140" Height="40"
+        Margin="8,5"
+        Cursor="Hand"/>
+
+
+                    <Button Content="🔬 定量供应检验" 
+                            Background="#3498DB" Foreground="White" FontSize="12" FontWeight="Bold"
+                            Width="140" Height="40" BorderThickness="0" Margin="8,5" Cursor="Hand"/>
+
+                    <Button Content="📉 负压气密性检验" Click="Button_Click_5"
+                            Background="White" Foreground="#2C3E50" FontSize="12" FontWeight="Bold"
+                            Width="140" Height="40" BorderBrush="#3498DB" BorderThickness="1" Margin="8,5"
+                            Cursor="Hand"/>
+
+                    <Button Content="📈 正压气密性检验" Click="Button_Click_6"
+                            Background="White" Foreground="#2C3E50" FontSize="12" FontWeight="Bold"
+                            Width="140" Height="40" BorderBrush="#3498DB" BorderThickness="1" Margin="8,5"
+                            Cursor="Hand"/>
+
+                    <Button Content="⚡ 排气阀压力测试" Click="Button_Click_7"
+                            Background="White" Foreground="#2C3E50" FontSize="12" FontWeight="Bold"
+                            Width="140" Height="40" BorderBrush="#3498DB" BorderThickness="1" Margin="8,5"
+                            Cursor="Hand"/>
+                </StackPanel>
+            </Border>
+        </Grid>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
new file mode 100644
index 0000000..2094c2d
--- /dev/null
+++ b/MainWindow.xaml.cs
@@ -0,0 +1,658 @@
+using Modbus.Device;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.IO.Ports;
+using System.Linq;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+using 自救器呼吸器综合检验仪.Data;
+
+namespace 自救器呼吸器综合检验仪
+{
+    /// <summary>
+    /// MainWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        private MainWindow _mainWindow;
+        private MainWindow2 _mainWindow2;
+        private MainWindow3 _mainWindow3;
+        private MainWindow4 _mainWindow4;
+        private ParameterSettingsWindow _mainWindow5;
+        private ReportWindow _reportWindow;
+
+        private bool _wasRunning = false; // 上次检验的运行状态
+        private bool _recordAdded = false;   // 本轮测试是否已插入记录
+        private DateTime _testStartTime; // 测试开始时间
+
+        int retryCount = 0; // 连接失败重试次数
+        private TcpClient _tcpClient => ModbusResourceManager.Instance.TcpClient;
+        private IModbusMaster _modbusMaster => ModbusResourceManager.Instance.ModbusMaster;
+
+
+        private const byte SlaveId = 1;        // PLC从站地址
+        private const ushort Address262 = 300;
+        private bool _isManualInput = false; // 手动输入标记：true=输入中（暂停读取），false=正常读取
+        private readonly DispatcherTimer _readTimer;
+
+        Function ma;
+        DataChange c = new DataChange();
+
+        public MainWindow()
+        {
+            InitializeComponent();
+            _readTimer = InitDispatcherTimer();
+            //InitializeModbusTcp();
+            BindInputFocusEvents();
+        }
+
+        private void BindInputFocusEvents()
+        {
+            // 地址400输入框（count）
+            settingtime.GotFocus += (s, e) => _isManualInput = true;  // 获得焦点→暂停读取
+            settingtime.LostFocus += (s, e) => _isManualInput = false; // 失去焦点→恢复读取
+
+        }
+
+        private DispatcherTimer InitDispatcherTimer()
+        {
+            var timer = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromMilliseconds(500)
+            };
+            timer.Tick += async (s, e) =>
+            {
+                if (!_isManualInput && _modbusMaster != null)
+                {
+
+                    try
+                    {
+                        await ReadAllPlcDataAsync();
+                    }
+                    catch { }
+                }
+            };
+            return timer;
+        }
+
+        private async System.Threading.Tasks.Task ReadAllPlcDataAsync()
+        {
+            try
+            {
+                // 检查连接状态
+                if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+                {
+                    return;
+                }
+                // 仅在非手动输入时读取设置地址（避免覆盖输入）
+                if (!_isManualInput)
+                {
+                    await ReadAddr262DataAsync();
+                    await System.Threading.Tasks.Task.Delay(50);
+
+                    await ReadAddr404DataAsync();
+                    await System.Threading.Tasks.Task.Delay(50);
+
+                    await ReadAddr406DataAsync();
+                    await System.Threading.Tasks.Task.Delay(50);
+                    await ReadAddr130DataAsync();
+                }
+
+                await ReadAddrStatusDataAsync();
+            }
+            catch (Exception ex)
+            {
+                retryCount++;
+                if (retryCount > 3)
+                {
+                    ShowErrorMsg($"读取PLC数据失败：{ex.Message}");
+                    retryCount = 0;
+                    return;
+                }
+                await System.Threading.Tasks.Task.Delay(500);
+                await ReadAllPlcDataAsync();
+            }
+        }
+
+        private async System.Threading.Tasks.Task ReadAddr262DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster.ReadHoldingRegisters(1, Address262, 2)
+                );
+
+                if (registers != null)
+                {
+                    int addr406Value = registers[0];
+                    Dispatcher.Invoke(() => settingtime.Text = addr406Value.ToString("F0"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+        private async System.Threading.Tasks.Task ReadAddr404DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster.ReadHoldingRegisters(1, 1330, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+
+                    Dispatcher.Invoke(() => min.Text = addr406Value.ToString("F2"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+        private async System.Threading.Tasks.Task ReadAddr406DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster.ReadHoldingRegisters(1, 72, 1)
+                );
+
+                if (registers != null)
+                {
+                    int addr406Value = registers[0];
+                    Dispatcher.Invoke(() => second.Text = addr406Value.ToString("F0"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+        private async System.Threading.Tasks.Task ReadAddr130DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster?.ReadHoldingRegisters(1, 76, 2)
+                );
+
+                if (registers != null)
+                {
+                    double addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    addr406Value = Math.Truncate(addr406Value * 100) / 100.0;
+                    Dispatcher.Invoke(() =>
+                    {
+
+                        speed.Text = addr406Value.ToString("F2");
+
+                    });
+
+
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+
+        bool isReset = false;
+        // 地址400写入（16位整数）
+        private async void BtnWrite400_Click(object sender, RoutedEventArgs e)
+        {
+            _modbusMaster.WriteSingleCoil(1, 75, true);
+            isReset = true;
+        }
+
+
+        private void ShowErrorMsg(string msg)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                MessageBox.Show(msg, "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+            });
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            //ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 170);
+            OpenQuantitativeSupplyWindow2();
+            // SwitchWindow(ref _reportWindow, () => new ReportWindow());
+        }
+
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 70);
+        }
+
+        private void Button_Click_2(object sender, RoutedEventArgs e)
+        {
+            //ma.BtnClickFunctionForNew(Function.ButtonType.复归型, 73);
+            ma.BtnClickFunctionForNew(Function.ButtonType.复归型, 73);
+        }
+
+        private void Button_Click_3(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.复归型, 74);
+        }
+
+        private void Button_Click_4(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow, () => new MainWindow());
+        }
+
+        private void Button_Click_5(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow2, () => new MainWindow2());
+        }
+
+        private void Button_Click_6(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow3, () => new MainWindow3());
+        }
+
+        private void Button_Click_7(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow4, () => new MainWindow4());
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            string plcIp = "192.168.1.10";
+            bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+            if (!initSuccess)
+            {
+                MessageBox.Show("连接Modbus服务器失败！", "错误");
+                this.Close();
+                return;
+            }
+
+            // 检查连接状态
+            if (_tcpClient == null || !_tcpClient.Connected)
+            {
+                MessageBox.Show("Modbus连接异常！", "错误");
+                this.Close();
+                return;
+            }
+
+            ma = new Function(_modbusMaster);
+
+            _modbusMaster.WriteSingleCoil(1, 61, true);
+            System.Threading.Tasks.Task.Delay(50);
+
+            _modbusMaster.WriteSingleCoil(1, 62, false);
+            System.Threading.Tasks.Task.Delay(50);
+
+            _modbusMaster.WriteSingleCoil(1, 63, false);
+            System.Threading.Tasks.Task.Delay(50);
+
+            _modbusMaster.WriteSingleCoil(1, 64, false);
+            System.Threading.Tasks.Task.Delay(50);
+            _modbusMaster.WriteSingleCoil(1, 75, true);
+            _readTimer.Start();
+
+
+
+
+            pressureDiff2.Text = ConfigurationManager.AppSettings["No"]?.ToString();
+
+
+            string imagePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources/sleep2.jpg");
+            ImageBrush brush = new ImageBrush();
+            brush.ImageSource = new BitmapImage(new Uri(imagePath, UriKind.Absolute));
+            this.Background = brush;
+        }
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            // 停止定时器
+            _readTimer?.Stop();
+
+            // 停止ViewModel的定时器
+            if (DataContext is MainViewModel viewModel)
+            {
+                viewModel.StopTimer();
+            }
+
+            // 释放Modbus资源
+            ModbusResourceManager.Instance?.Dispose();
+
+            // 确保应用程序完全退出
+            Application.Current.Shutdown();
+        }
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            // 清理其他窗口实例
+            //_mainWindow?.Close();
+            _mainWindow2?.Close();
+            _mainWindow3?.Close();
+            _mainWindow4?.Close();
+            _mainWindow5?.Close();
+            _reportWindow?.Close();
+        }
+        private void BtnWrite401_Click(object sender, RoutedEventArgs e)
+        {
+            if (!short.TryParse(settingtime.Text.Trim(), out short writeValue) ||
+                writeValue < short.MinValue || writeValue > short.MaxValue)
+            {
+                ShowErrorMsg($"需输入整数（范围：{short.MinValue} ~ {short.MaxValue}）");
+                settingtime.Focus();
+                return;
+            }
+
+            try
+            {
+                //await System.Threading.Tasks.Task.Run(() =>
+                //    _modbusMaster.WriteSingleRegister(SlaveId, Address262, (ushort)writeValue)
+                //);
+
+                ma.WriteToPLCForNew(settingtime.Text.Trim(), 300, Function.DataType.整形);
+
+                System.Threading.Tasks.Task.Delay(50);
+                _isManualInput = false; // 写入后恢复读取
+                //await ReadAddr400DataAsync(); // 刷新显示（确认写入成功）
+
+            }
+            catch (Exception ex)
+            {
+                ShowErrorMsg($"地址400写入失败：{ex.Message}");
+            }
+        }
+
+        private void SwitchWindow<T>(ref T windowInstance, Func<T> createFunc) where T : Window, new()
+        {
+            // 1. 停止当前窗口的定时器（不释放资源）
+            _readTimer?.Stop();
+
+            // 2. 检查资源是否可用（添加重连机制）
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                // 尝试重新连接
+                bool reconnectSuccess = TryReconnect();
+                if (!reconnectSuccess)
+                {
+                    MessageBox.Show("TCP连接已断开，请重新连接！", "提示");
+                    return;
+                }
+            }
+
+            // 3. 复用窗口实例：不存在则创建，存在则激活
+            if (windowInstance == null)
+            {
+                windowInstance = createFunc();
+                // 添加窗口关闭事件处理
+                windowInstance.Closed += (s, args) =>
+                {
+                    // 窗口关闭时重新启动定时器并显示当前窗口
+                    _readTimer?.Start();
+                    //this.Show();
+                    this.Activate();
+                };
+            }
+            else
+            {
+                // 激活已存在的窗口（前置显示）
+                windowInstance.Activate();
+                //return;
+            }
+
+            // 4. 切换窗口：隐藏当前窗口，显示目标窗口（非模态）
+            this.Hide();
+            windowInstance.Show(); // 使用 Show() 而不是 ShowDialog()
+        }
+
+        // 添加重连方法
+        private bool TryReconnect()
+        {
+            try
+            {
+                string plcIp = "192.168.1.10";
+                bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+                if (initSuccess)
+                {
+                    ma = new Function(_modbusMaster);
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                ShowErrorMsg($"重新连接失败：{ex.Message}");
+            }
+            return false;
+        }
+
+
+        private void OpenQuantitativeSupplyWindow()
+        {
+            try
+            {
+                SwitchWindow(ref _mainWindow5, () => new ParameterSettingsWindow());
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"打开定量供应检验窗口时出错：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void btn_setting_Click(object sender, RoutedEventArgs e)
+        {
+            OpenQuantitativeSupplyWindow();
+        }
+
+
+        private async System.Threading.Tasks.Task ReadAddrStatusDataAsync()
+        {
+            try
+            {
+                bool[] result = _modbusMaster?.ReadCoils(0x01, 71, 1);
+                bool isTestRunning = result != null && result.Length > 0 && result[0];
+
+                Dispatcher.Invoke(() =>
+                {
+                    if (isTestRunning)
+                    {
+                        status.Text = "正在运行";
+                        statusPanel.Background = Brushes.Green;
+                        if (!_wasRunning)
+                        {
+                            _testStartTime = DateTime.Now;
+                            _recordAdded = false; // 测试刚开始，允许插入记录
+                        }
+                    }
+                    else
+                    {
+                        status.Text = "空闲";
+                        statusPanel.Background = Brushes.Blue;
+                        // 状态从“运行”切换到“空闲”，且还没插入记录
+                        if (_wasRunning && !_recordAdded)
+                        {
+                            AddTestRecord();      // 插入记录
+                            _recordAdded = true;  // 标记已插入
+                        }
+                    }
+                    _wasRunning = isTestRunning; // 更新上一次状态
+                });
+            }
+            catch (Exception ex)
+            {
+                ShowErrorMsg($"读取运行状态失败：{ex.Message}");
+            }
+        }
+
+        private void OpenQuantitativeSupplyWindow2()
+        {
+            try
+            {
+                SwitchWindow(ref _reportWindow, () => new ReportWindow());
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"打开定量供应检验窗口时出错：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+
+        private void AddTestRecord()
+        {
+            try
+            {
+                // 计算测试时长
+                TimeSpan duration = DateTime.Now - _testStartTime;
+                string durationStr = $"{duration.Minutes:00}:{duration.Seconds:00}";
+
+                // 获取当前流量值
+                double currentFlowRate = 0;
+                if (!string.IsNullOrEmpty(speed.Text) && double.TryParse(speed.Text, out double flow))
+                {
+                    currentFlowRate = flow;
+                }
+
+                // 获取当前时间
+                string currentTime = DateTime.Now.ToString("HH:mm");
+                string currentDate = DateTime.Now.ToString("yy/MM/dd");
+
+                // 添加到报表窗口（如果存在或创建）
+                Dispatcher.Invoke(() =>
+                {
+                    // 如果窗口不存在，先创建但不显示
+                    if (_reportWindow == null)
+                    {
+                        _reportWindow = new ReportWindow();
+                    }
+
+                    double temprate = 0;
+                    if (!isReset)
+                    {
+                        temprate = currentFlowRate;
+                        currentFlowRate = 0;
+                    }
+                    else
+                    {
+
+                    }
+
+                    string No = ConfigurationManager.AppSettings["No"]?.ToString();
+                    // 添加记录到窗口（无论窗口是否显示）
+                    _reportWindow.AddRecord(currentTime, currentDate, currentFlowRate, durationStr, temprate, No);
+                });
+
+            }
+            catch (Exception ex)
+            {
+                ShowErrorMsg($"记录测试数据失败：{ex.Message}");
+            }
+        }
+
+        private async void BtnWrite400_Click1(object sender, RoutedEventArgs e)
+        {
+            _modbusMaster.WriteSingleCoil(1, 75, false);
+            isReset = false;
+        }
+
+        //private void pressureDiff2_GotFocus(object sender, RoutedEventArgs e)
+        //{
+
+        //}
+        private void pressureDiff2_GotFocus(object sender, RoutedEventArgs e)
+        {
+
+            SaveAppSetting("No", pressureDiff2.Text);
+
+        }
+
+
+        /// <summary>
+        /// 保存 AppSettings 配置到配置文件
+        /// </summary>
+        /// <param name="key">配置键名</param>
+        /// <param name="value">配置值</param>
+        /// <returns>是否保存成功</returns>
+        public bool SaveAppSetting(string key, string value)
+        {
+            try
+            {
+                // 1. 获取当前程序的配置文件路径（编译后的 exe.config）
+                string configPath = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
+
+                // 2. 加载配置文件（ExeConfigurationFileMap 指定配置路径）
+                ExeConfigurationFileMap configFileMap = new ExeConfigurationFileMap { ExeConfigFilename = configPath };
+                Configuration config = ConfigurationManager.OpenMappedExeConfiguration(configFileMap, ConfigurationUserLevel.None);
+
+                // 3. 处理 appSettings 节点
+                if (config.AppSettings.Settings[key] == null)
+                {
+                    // 键不存在 → 新增配置
+                    config.AppSettings.Settings.Add(key, value);
+                }
+                else
+                {
+                    // 键已存在 → 更新配置
+                    config.AppSettings.Settings[key].Value = value;
+                }
+
+                // 4. 保存配置（重要！否则修改不生效）
+                config.Save(ConfigurationSaveMode.Modified);
+
+                // 5. 刷新 ConfigurationManager 缓存（可选，让后续读取能立即获取新值）
+                ConfigurationManager.RefreshSection("appSettings");
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                // 捕获异常（如权限不足、文件被占用等）
+                MessageBox.Show($"保存配置失败：{ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+                return false;
+            }
+        }
+
+        private void settingtime_TextChanged(object sender, TextChangedEventArgs e)
+        {
+
+        }
+    }
+
+
+    public class TestRecord
+    {
+        public int Id { get; set; }
+        public string Time { get; set; }//时间
+        public string Date { get; set; }//日期
+        public double FlowRate { get; set; } // 供氧流量L/min
+        public string Duration { get; set; } // 测试时长
+        public DateTime CreateTime { get; set; }
+
+        public string HeadName { get; set; } // 表头名
+
+        public double FlowRate2 { get; set; } // 供氧流量L/min
+
+        public double FlowRate3 { get; set; } // 供氧流量L/min
+
+        public string No { get; set; }
+    }
+}
diff --git a/MainWindow2.xaml b/MainWindow2.xaml
new file mode 100644
index 0000000..feb699b
--- /dev/null
+++ b/MainWindow2.xaml
@@ -0,0 +1,342 @@
+<Window x:Class="自救器呼吸器综合检验仪.MainWindow2"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:自救器呼吸器综合检验仪"
+        Title="自救器呼吸器综合检验仪" Height="900" Width="1280"
+        WindowStartupLocation="CenterScreen"
+        Background="Transparent"
+        FontFamily="Microsoft YaHeui"  Loaded="Window_Loaded" Closed="Window_Closed" Closing="Window_Closing">
+
+    <Window.DataContext>
+        <local:MainViewModel />
+    </Window.DataContext>
+
+
+    <!--<Window.Resources>
+
+        <Style x:Key="LabelStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="11"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="Margin" Value="3,2"/>
+        </Style>
+
+        <Style x:Key="TextBoxStyle" TargetType="TextBox">
+            <Setter Property="FontSize" Value="11"/>
+            <Setter Property="Height" Value="22"/>
+            <Setter Property="Width" Value="65"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="Margin" Value="3,2"/>
+            <Setter Property="BorderBrush" Value="#CCCCCC"/>
+            <Setter Property="BorderThickness" Value="1"/>
+        </Style>
+
+
+    </Window.Resources>-->
+
+    <!-- 背景层 -->
+    <Grid>
+        <!-- 背景图片 -->
+        <Grid.Background>
+            <ImageBrush ImageSource="/Resources/sleep2.jpg" Stretch="UniformToFill" Opacity="0.15"/>
+        </Grid.Background>
+
+        <!-- 背景遮罩层 -->
+        <Rectangle Fill="#1E3A5F" Opacity="0.85"/>
+
+        <!-- 主内容容器 -->
+        <Grid Margin="20">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <!-- 顶部标题栏 -->
+            <Border Grid.Row="0" Background="#2A4B6D" BorderBrush="#3A5B8C" BorderThickness="0,0,0,2" 
+                    Margin="0,0,0,15" Padding="20,12">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <!-- 主标题 -->
+                    <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                        <TextBlock Text="负压气密性检验系统" 
+                                   FontSize="22" FontWeight="Bold" Foreground="White"/>
+                        <!--<TextBlock Text="负压气密性检验系统" 
+                                   FontSize="12" Foreground="#CCFFFFFF" Margin="0,3,0,0"/>-->
+                    </StackPanel>
+
+                    <!--<StackPanel Orientation="Horizontal" Margin="2" HorizontalAlignment="Center">
+                        <TextBlock Text="样品编号：" FontSize="26" FontWeight="Bold" Foreground="White" Style="{StaticResource LabelStyle}"/>
+                        <TextBox x:Name="pressureDiff2" Text="" Width="180" Style="{StaticResource TextBoxStyle}" LostFocus="pressureDiff2_GotFocus"/>
+
+                    </StackPanel>-->
+
+                    <!-- 状态指示 -->
+                    <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,20,0">
+                        <Border Background="#27AE60" Padding="10,5" Margin="0,0,10,0">
+                            <TextBlock Text="系统状态：" FontSize="11" Foreground="White" FontWeight="Bold"/>
+                        </Border>
+                        <Border x:Name="statusPanel" Background="#3498DB" Padding="10,5">
+                            <TextBlock x:Name="status" Text="空闲" FontSize="11" Foreground="White" FontWeight="Bold"/>
+                        </Border>
+                    </StackPanel>
+
+                    <!-- 系统时间 -->
+                    <Border Grid.Column="2" Background="White" Padding="12,6">
+                        <TextBlock Text="{Binding CurrentTime, StringFormat='yyyy-MM-dd HH:mm:ss'}" 
+                                   FontSize="11" FontWeight="Bold" Foreground="#2C3E50"/>
+                    </Border>
+                </Grid>
+            </Border>
+
+            <!-- 主内容区域 -->
+            <Grid Grid.Row="1" Margin="0,0,0,15">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="280"/>
+                </Grid.ColumnDefinitions>
+
+                <!-- 左侧：配置与监控区 -->
+                <Grid Grid.Column="0" Margin="0,0,15,0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+
+                    <!-- 参数配置区 -->
+                    <Border Grid.Row="0" Background="White" Margin="0,0,0,15" 
+                            BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="20,15">
+                            <TextBlock Text="⚙️ 压力参数配置" FontSize="16" FontWeight="Bold" 
+                                       Foreground="#2C3E50" Margin="0,0,0,15"/>
+
+                            <!-- 第一行设置 -->
+                            <StackPanel Orientation="Horizontal" Margin="0,0,0,12">
+                                <TextBlock Text="压力设置：" Width="80" VerticalAlignment="Center" 
+                                           FontSize="13" FontWeight="SemiBold" Foreground="#2C3E50"/>
+                                <TextBox x:Name="settingtime" Text="0" Width="80" Height="32" 
+                                         VerticalContentAlignment="Center" TextAlignment="Center"
+                                         BorderBrush="#DCDFE6" BorderThickness="1" Background="#FAFBFC"
+                                         FontSize="13"/>
+                                <TextBlock Text="Pa" Margin="8,0,20,0" VerticalAlignment="Center" 
+                                           FontSize="13" Foreground="#7F8C8D"/>
+
+                                <Button Content="设置压力" Click="BtnWrite401_Click" 
+                                        Background="#3498DB" Foreground="White" FontSize="12" FontWeight="Bold"
+                                        Width="90" Height="32" BorderThickness="0" Margin="0,0,25,0"
+                                        Cursor="Hand"/>
+
+                                <TextBlock Text="检验时间：" Width="70" VerticalAlignment="Center" 
+                                           FontSize="13" FontWeight="SemiBold" Foreground="#2C3E50"/>
+                                <TextBox x:Name="settingtime2" Text="0" Width="80" Height="32" 
+                                         VerticalContentAlignment="Center" TextAlignment="Center"
+                                         BorderBrush="#DCDFE6" BorderThickness="1" Background="#FAFBFC"
+                                         FontSize="13"/>
+                                <TextBlock Text="秒" Margin="8,0,20,0" VerticalAlignment="Center" 
+                                           FontSize="13" Foreground="#7F8C8D"/>
+
+                                <Button Content="设置时间" Click="BtnWrite402_Click" 
+                                        Background="#3498DB" Foreground="White" FontSize="12" FontWeight="Bold"
+                                        Width="90" Height="32" BorderThickness="0" Cursor="Hand"/>
+                            </StackPanel>
+
+                            <!-- 第二行设置 -->
+                            <!--<StackPanel Orientation="Horizontal">
+                                <TextBlock Text="试验时间：" Width="80" VerticalAlignment="Center" 
+                                           FontSize="13" FontWeight="SemiBold" Foreground="#2C3E50"/>
+                                <TextBox Text="0" Width="60" Height="32" VerticalContentAlignment="Center" 
+                                         TextAlignment="Center" BorderBrush="#DCDFE6" BorderThickness="1" 
+                                         Background="#FAFBFC" FontSize="13"/>
+                                <TextBlock Text="分" Margin="5,0,15,0" VerticalAlignment="Center" 
+                                           FontSize="13" Foreground="#7F8C8D"/>
+                                <TextBox Text="0" Width="60" Height="32" VerticalContentAlignment="Center" 
+                                         TextAlignment="Center" BorderBrush="#DCDFE6" BorderThickness="1" 
+                                         Background="#FAFBFC" FontSize="13"/>
+                                <TextBlock Text="秒" Margin="5,0,0,0" VerticalAlignment="Center" 
+                                           FontSize="13" Foreground="#7F8C8D"/>
+                            </StackPanel>-->
+                        </StackPanel>
+                    </Border>
+
+                    <!-- 实时数据监控 -->
+                    <Border Grid.Row="1" Background="White" BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="20,15">
+                            <TextBlock Text="📊 压力数据监控" FontSize="16" FontWeight="Bold" 
+                                       Foreground="#2C3E50" Margin="0,0,0,15"/>
+
+                            <!-- 第一行数据 -->
+                            <Grid Margin="0,0,0,10">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <!-- 当前压力 -->
+                                <Border Grid.Column="0" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="当前压力" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="min" Text="0.00" FontSize="18" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="Pa" FontSize="12" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="5,0,0,2"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+
+                                <!-- 试验时间 -->
+                                <Border Grid.Column="1" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="试验时间" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="min2" Text="0.00" FontSize="18" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="秒" FontSize="12" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="5,0,0,2"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+
+                                <!-- 初始压力 -->
+                                <Border Grid.Column="2" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="初始压力" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="min3" Text="0.00" FontSize="18" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="Pa" FontSize="12" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="5,0,0,2"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+                            </Grid>
+
+                            <!-- 第二行数据 -->
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <!-- 结束压力 -->
+                                <Border Grid.Column="0" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="结束压力" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="min4" Text="0.00" FontSize="18" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="Pa" FontSize="12" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="5,0,0,2"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+
+                                <!-- 压差 -->
+                                <Border Grid.Column="1" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="压差" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="min5" Text="0.00" FontSize="18" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="Pa" FontSize="12" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="5,0,0,2"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+
+                                <!-- 状态指示 -->
+                                <Border Grid.Column="2" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <!--<StackPanel>
+                                        <TextBlock Text="检验状态" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock Text="正常" FontSize="18" FontWeight="Bold" 
+                                                       Foreground="#27AE60"/>
+                                        </StackPanel>
+                                    </StackPanel>-->
+                                </Border>
+                            </Grid>
+                        </StackPanel>
+                    </Border>
+                </Grid>
+
+                <!-- 右侧：操作控制区 -->
+                <StackPanel Grid.Column="1">
+                    <!-- 数据管理 -->
+                    <Border Background="White" Margin="0,0,0,15" BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="15,15">
+                            <TextBlock Text="💾 数据管理" FontSize="15" FontWeight="Bold" Foreground="#2C3E50" 
+                                       HorizontalAlignment="Center" Margin="0,0,0,15"/>
+                            <Button Content="📝 记录数据" Click="Button_Click" 
+                                    Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold"
+                                    Height="42" BorderThickness="0" Cursor="Hand"/>
+                        </StackPanel>
+                    </Border>
+
+                    <!-- 测试控制 -->
+                    <Border Background="White" BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="15,15">
+                            <TextBlock Text="🎛️ 测试控制" FontSize="15" FontWeight="Bold" Foreground="#2C3E50" 
+                                       HorizontalAlignment="Center" Margin="0,0,0,15"/>
+
+                            <Button Content="🚀 启动测试" Click="Button_Click_1" 
+                                    Background="#27AE60" Foreground="White" FontSize="13" FontWeight="Bold"
+                                    Height="42" BorderThickness="0" Margin="0,0,0,10" Cursor="Hand"/>
+
+                            <Button Content="🛑 停止测试" Click="Button_Click_2" 
+                                    Background="#E74C3C" Foreground="White" FontSize="13" FontWeight="Bold"
+                                    Height="42" BorderThickness="0" Margin="0,0,0,10" Cursor="Hand"/>
+
+                            <Button Content="⏱️ 开始计时" Click="Button_Click_3" 
+                                    Background="#3498DB" Foreground="White" FontSize="12" FontWeight="Bold"
+                                    Height="38" BorderThickness="0" Cursor="Hand"/>
+                        </StackPanel>
+                    </Border>
+                </StackPanel>
+            </Grid>
+
+            <!-- 底部导航 -->
+            <Border Grid.Row="2" Background="White" BorderBrush="#E1E8ED" BorderThickness="1,0,0,0">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="10,8">
+                    <Button Content="定量供应检验" Click="Button_Click_4"
+                            Background="White" Foreground="#2C3E50" FontSize="11" FontWeight="Bold"
+                            Width="120" Height="35" BorderBrush="#3498DB" BorderThickness="1" Margin="5,3"
+                            Cursor="Hand"/>
+
+                    <Button Content="负压气密性检验" 
+                            Background="#3498DB" Foreground="White" FontSize="11" FontWeight="Bold"
+                            Width="120" Height="35" BorderThickness="0" Margin="5,3" Cursor="Hand"/>
+
+                    <Button Content="正压气密性检验" Click="Button_Click_6"
+                            Background="White" Foreground="#2C3E50" FontSize="11" FontWeight="Bold"
+                            Width="120" Height="35" BorderBrush="#3498DB" BorderThickness="1" Margin="5,3"
+                            Cursor="Hand"/>
+
+                    <Button Content="排气阀压力测试" Click="Button_Click_7"
+                            Background="White" Foreground="#2C3E50" FontSize="11" FontWeight="Bold"
+                            Width="120" Height="35" BorderBrush="#3498DB" BorderThickness="1" Margin="5,3"
+                            Cursor="Hand"/>
+                </StackPanel>
+            </Border>
+        </Grid>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/MainWindow2.xaml.cs b/MainWindow2.xaml.cs
new file mode 100644
index 0000000..0a98cd9
--- /dev/null
+++ b/MainWindow2.xaml.cs
@@ -0,0 +1,751 @@
+using Modbus.Device;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.IO.Ports;
+using System.Linq;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+using 自救器呼吸器综合检验仪;
+using 自救器呼吸器综合检验仪.Data;
+
+namespace 自救器呼吸器综合检验仪
+{
+    /// <summary>
+    /// MainWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class MainWindow2 : Window
+    {
+        private MainWindow _mainWindow;
+        private MainWindow2 _mainWindow2;
+        private MainWindow3 _mainWindow3;
+        private MainWindow4 _mainWindow4;
+        private ReportWindow2 _reportWindow2;
+        private bool _wasRunning = false; // 上次检验的运行状态
+        private bool _recordAdded = false;   // 本轮测试是否已插入记录
+        private DateTime _testStartTime; // 测试开始时间
+
+        private TcpClient _tcpClient => ModbusResourceManager.Instance.TcpClient;
+        private IModbusMaster _modbusMaster => ModbusResourceManager.Instance.ModbusMaster;
+
+        private const byte SlaveId = 1;        // PLC从站地址
+        private const ushort Address262 = 310;        // 32位浮点数（float32，占2个寄存器）
+
+        private bool _isManualInput = false; // 手动输入标记：true=输入中（暂停读取），false=正常读取
+        private readonly DispatcherTimer _readTimer;
+
+        Function ma;
+        DataChange c = new DataChange();
+
+        public MainWindow2()
+        {
+            InitializeComponent();
+            _readTimer = InitDispatcherTimer();
+            //InitializeModbusTcp();
+            BindInputFocusEvents();
+        }
+
+        private void BindInputFocusEvents()
+        {
+            // 地址400输入框（count）
+            settingtime.GotFocus += (s, e) => _isManualInput = true;  // 获得焦点→暂停读取
+            settingtime.LostFocus += (s, e) => _isManualInput = false; // 失去焦点→恢复读取
+        }
+
+        private DispatcherTimer InitDispatcherTimer()
+        {
+            var timer = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromMilliseconds(500)
+            };
+            timer.Tick += async (s, e) =>
+            {
+                if (!_isManualInput && _modbusMaster != null)
+                {
+
+                    try
+                    {
+                        await ReadAllPlcDataAsync();
+                    }
+                    catch { }
+                }
+            };
+            return timer;
+        }
+
+
+
+        //private void InitializeModbusTcp()
+        //{
+        //    try
+        //    {
+        //        // 从配置读取PLC连接信息
+        //        string plcIp = "192.168.1.10";
+        //        int plcPort = 502;
+
+        //        _tcpClient = new TcpClient(plcIp, plcPort);
+        //        _modbusMaster = ModbusIpMaster.CreateIp(_tcpClient);
+        //        _modbusMaster.Transport.ReadTimeout = 3000;
+        //        _modbusMaster.Transport.WriteTimeout = 3000;
+
+        //        // 初始化定时器
+        //        //InitializeTimers();
+        //        // 初始化数据库
+        //        //InitializeDatabase();
+
+        //        ma = new Function(_modbusMaster);
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        ShowErrorMsg($"Modbus初始化失败: {ex.Message}");
+        //    }
+        //}
+        private async System.Threading.Tasks.Task ReadAllPlcDataAsync()
+        {
+            // 检查连接状态
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                return;
+            }
+            // 仅在非手动输入时读取设置地址（避免覆盖输入）
+            if (!_isManualInput)
+            {
+                await ReadAddr262DataAsync();
+                await System.Threading.Tasks.Task.Delay(50);
+
+                await ReadAddr404DataAsync();
+                await System.Threading.Tasks.Task.Delay(50);
+
+
+
+                await ReadAddr406DataAsync();
+                await System.Threading.Tasks.Task.Delay(50);
+
+                await ReadAddr130DataAsync();
+                await System.Threading.Tasks.Task.Delay(50);
+                await ReadAddr416DataAsync();
+
+
+                await System.Threading.Tasks.Task.Delay(50);
+                await ReadAddr1301DataAsync();
+
+                await System.Threading.Tasks.Task.Delay(50);
+                await ReadAddr4161DataAsync();
+
+            }
+
+            await ReadAddrStatusDataAsync();
+        }
+
+        private async System.Threading.Tasks.Task ReadAddr262DataAsync()
+        {
+            try
+            {
+                if (_tcpClient == null || !_tcpClient.Connected)
+                {
+                    ShowErrorMsg("Modbus连接已断开，请重新连接设备。");
+                    return;
+                }
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster?.ReadHoldingRegisters(1, Address262, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    Dispatcher.Invoke(() => settingtime.Text = addr406Value.ToString("F0"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+        private async System.Threading.Tasks.Task ReadAddr404DataAsync()
+        {
+            try
+            {
+                // 检查连接
+                if (_tcpClient == null || !_tcpClient.Connected)
+                {
+                    ShowErrorMsg("Modbus连接已断开，请重新连接设备。");
+                    return;
+                }
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster?.ReadHoldingRegisters(1, 312, 1)
+                );
+
+                if (registers != null)
+                {
+                    int addr406Value = registers[0];
+                    Dispatcher.Invoke(() => settingtime2.Text = addr406Value.ToString("F0"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+        private async System.Threading.Tasks.Task ReadAddr130DataAsync()
+        {
+            try
+            {
+                if (_tcpClient == null || !_tcpClient.Connected)
+                {
+                    ShowErrorMsg("Modbus连接已断开，请重新连接设备。");
+                    return;
+                }
+                ushort[] registers = _modbusMaster.ReadHoldingRegisters(1, 82, 1);
+
+
+
+                if (registers != null)
+                {
+                    int addr406Value = registers[0];
+                    Dispatcher.Invoke(() => min2.Text = addr406Value.ToString("F0"));
+                }
+
+                await Task.CompletedTask;
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+        private async System.Threading.Tasks.Task ReadAddr406DataAsync()
+        {
+            try
+            {
+                if (_tcpClient == null || !_tcpClient.Connected)
+                {
+                    ShowErrorMsg("Modbus连接已断开，请重新连接设备。");
+                    return;
+                }
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster.ReadHoldingRegisters(1, 1430, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    Dispatcher.Invoke(() => min.Text = addr406Value.ToString("F2"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+        private async System.Threading.Tasks.Task ReadAddr416DataAsync()
+        {
+            try
+            {
+                if (_tcpClient == null || !_tcpClient.Connected)
+                {
+                    ShowErrorMsg("Modbus连接已断开，请重新连接设备。");
+                    return;
+                }
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster.ReadHoldingRegisters(1, 1100, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    Dispatcher.Invoke(() => min3.Text = addr406Value.ToString("F2"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+        private async System.Threading.Tasks.Task ReadAddr1301DataAsync()
+        {
+            try
+            {
+                if (_tcpClient == null || !_tcpClient.Connected)
+                {
+                    ShowErrorMsg("Modbus连接已断开，请重新连接设备。");
+                    return;
+                }
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster?.ReadHoldingRegisters(1, 1102, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    Dispatcher.Invoke(() => min4.Text = addr406Value.ToString("F2"));
+
+
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+        private async System.Threading.Tasks.Task ReadAddr4161DataAsync()
+        {
+            try
+            {
+                if (_tcpClient == null || !_tcpClient.Connected)
+                {
+                    ShowErrorMsg("Modbus连接已断开，请重新连接设备。");
+                    return;
+                }
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster.ReadHoldingRegisters(1, 1106, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    Dispatcher.Invoke(() => min5.Text = addr406Value.ToString("F2"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+        private async System.Threading.Tasks.Task ReadAddrStatusDataAsync()
+        {
+            try
+            {
+                bool[] result = _modbusMaster?.ReadCoils(0x01, 81, 1);
+                bool isTestRunning = result != null && result.Length > 0 && result[0];
+
+                Dispatcher.Invoke(() =>
+                {
+                    if (isTestRunning)
+                    {
+                        status.Text = "正在运行";
+                        statusPanel.Background = Brushes.Green;
+                        if (!_wasRunning)
+                        {
+                            _testStartTime = DateTime.Now;
+                            _recordAdded = false; // 测试刚开始，允许插入记录
+                        }
+                    }
+                    else
+                    {
+                        status.Text = "空闲";
+                        statusPanel.Background = Brushes.Blue;
+                        // 状态从“运行”切换到“空闲”，且还没插入记录
+                        if (_wasRunning && !_recordAdded)
+                        {
+                            AddTestRecord();      // 插入记录
+                            _recordAdded = true;  // 标记已插入
+                        }
+                    }
+                    _wasRunning = isTestRunning; // 更新上一次状态
+                });
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取运行状态失败：{ex.Message}");
+            }
+        }
+
+
+        private void ShowErrorMsg(string msg)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                MessageBox.Show(msg, "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+            });
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            //ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 170);
+            OpenQuantitativeSupplyWindow2();
+        }
+
+        private void OpenQuantitativeSupplyWindow2()
+        {
+            try
+            {
+                SwitchWindow(ref _reportWindow2, () => new ReportWindow2());
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"打开定量供应检验窗口时出错：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 80);
+
+        }
+
+        private void Button_Click_2(object sender, RoutedEventArgs e)
+        {
+            //ma.BtnClickFunctionForNew(Function.ButtonType.复归型, 83);
+            ma.BtnClickFunctionForNew(Function.ButtonType.复归型, 83);
+        }
+
+        private void Button_Click_3(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 84);
+        }
+
+        private void Button_Click_4(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow, () => new MainWindow());
+        }
+
+        private void Button_Click_5(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow2, () => new MainWindow2());
+        }
+
+        private void Button_Click_6(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow3, () => new MainWindow3());
+        }
+
+        private void Button_Click_7(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow4, () => new MainWindow4());
+        }
+
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            string plcIp = "192.168.1.10";
+            bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+            if (!initSuccess)
+            {
+                MessageBox.Show("连接Modbus服务器失败！", "错误");
+                this.Close();
+                return;
+            }
+
+            // 检查连接状态
+            if (_tcpClient == null || !_tcpClient.Connected)
+            {
+                MessageBox.Show("Modbus连接异常！", "错误");
+                this.Close();
+                return;
+            }
+
+            ma = new Function(_modbusMaster);
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 62);
+            System.Threading.Tasks.Task.Delay(50);
+            _readTimer.Start();
+
+            _modbusMaster.WriteSingleCoil(1, 61, false);
+            System.Threading.Tasks.Task.Delay(50);
+
+            _modbusMaster.WriteSingleCoil(1, 62, true);
+            System.Threading.Tasks.Task.Delay(50);
+
+            _modbusMaster.WriteSingleCoil(1, 63, false);
+            System.Threading.Tasks.Task.Delay(50);
+
+            _modbusMaster.WriteSingleCoil(1, 64, false);
+            System.Threading.Tasks.Task.Delay(50);
+        }
+
+
+        private void SwitchWindow<T>(ref T windowInstance, Func<T> createFunc) where T : Window, new()
+        {
+            // 1. 停止当前窗口的定时器（不释放资源）
+            _readTimer?.Stop();
+
+            // 2. 检查资源是否可用（添加重连机制）
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                // 尝试重新连接
+                bool reconnectSuccess = TryReconnect();
+                if (!reconnectSuccess)
+                {
+                    MessageBox.Show("TCP连接已断开，请重新连接！", "提示");
+                    return;
+                }
+            }
+
+            // 3. 复用窗口实例：不存在则创建，存在则激活
+            if (windowInstance == null)
+            {
+                windowInstance = createFunc();
+                // 添加窗口关闭事件处理
+                windowInstance.Closed += (s, args) =>
+                {
+                    // 窗口关闭时重新启动定时器并显示当前窗口
+                    _readTimer?.Start();
+                    //this.Show();
+                    this.Activate();
+                };
+            }
+            else
+            {
+                // 激活已存在的窗口（前置显示）
+                windowInstance.Activate();
+                //return;
+            }
+
+            // 4. 切换窗口：隐藏当前窗口，显示目标窗口（非模态）
+            this.Hide();
+            windowInstance.Show(); // 使用 Show() 而不是 ShowDialog()
+        }
+        // 添加重连方法
+        private bool TryReconnect()
+        {
+            try
+            {
+                string plcIp = "192.168.1.10";
+                bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+                if (initSuccess)
+                {
+                    ma = new Function(_modbusMaster);
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"重新连接失败：{ex.Message}");
+            }
+            return false;
+        }
+
+
+        private void BtnWrite401_Click(object sender, RoutedEventArgs e)
+        {
+            if (!short.TryParse(settingtime.Text.Trim(), out short writeValue) ||
+                writeValue < short.MinValue || writeValue > short.MaxValue)
+            {
+                ShowErrorMsg($"需输入整数（范围：{short.MinValue} ~ {short.MaxValue}）");
+                settingtime.Focus();
+                return;
+            }
+
+            try
+            {
+                //await System.Threading.Tasks.Task.Run(() =>
+                //    _modbusMaster.WriteSingleRegister(SlaveId, Address262, (ushort)writeValue)
+                //);
+
+                ma.WriteToPLCForNew(settingtime.Text.Trim(), 310, Function.DataType.浮点型);
+
+                System.Threading.Tasks.Task.Delay(50);
+                _isManualInput = false; // 写入后恢复读取
+                //await ReadAddr400DataAsync(); // 刷新显示（确认写入成功）
+
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"地址400写入失败：{ex.Message}");
+            }
+        }
+
+
+        private void BtnWrite402_Click(object sender, RoutedEventArgs e)
+        {
+            if (!short.TryParse(settingtime2.Text.Trim(), out short writeValue) ||
+                writeValue < short.MinValue || writeValue > short.MaxValue)
+            {
+                ShowErrorMsg($"需输入整数（范围：{short.MinValue} ~ {short.MaxValue}）");
+                settingtime.Focus();
+                return;
+            }
+
+            try
+            {
+                //await System.Threading.Tasks.Task.Run(() =>
+                //    _modbusMaster.WriteSingleRegister(SlaveId, Address262, (ushort)writeValue)
+                //);
+
+                ma.WriteToPLCForNew(settingtime2.Text.Trim(), 312, Function.DataType.整形);
+
+                System.Threading.Tasks.Task.Delay(50);
+                _isManualInput = false; // 写入后恢复读取
+                //await ReadAddr400DataAsync(); // 刷新显示（确认写入成功）
+
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"地址400写入失败：{ex.Message}");
+            }
+        }
+
+
+
+        private void AddTestRecord()
+        {
+            try
+            {
+                // 计算测试时长
+                TimeSpan duration = DateTime.Now - _testStartTime;
+                string durationStr = $"{duration.Minutes:00}:{duration.Seconds:00}";
+
+                // 获取当前流量值
+                double startPress = 0, endPress = 0, diffPress = 0, ProtectTime = 0;
+                if (!string.IsNullOrEmpty(min3.Text) && double.TryParse(min3.Text, out double flow))
+                {
+                    startPress = flow;
+                }
+
+                if (!string.IsNullOrEmpty(min4.Text) && double.TryParse(min4.Text, out double flow2))
+                {
+                    endPress = flow2;
+                }
+
+                if (!string.IsNullOrEmpty(min5.Text) && double.TryParse(min5.Text, out double flow5))
+                {
+                    diffPress = flow5;
+                }
+
+                if (!string.IsNullOrEmpty(min2.Text) && double.TryParse(min2.Text, out double flow3))
+                {
+                    ProtectTime = flow3;
+                }
+
+                // 获取当前时间
+                string currentTime = DateTime.Now.ToString("HH:mm");
+                string currentDate = DateTime.Now.ToString("yy/MM/dd");
+
+                // 添加到报表窗口（如果存在）
+                Dispatcher.Invoke(() =>
+                {
+                    // 如果窗口不存在，先创建但不显示
+                    if (_reportWindow2 == null)
+                    {
+                        _reportWindow2 = new ReportWindow2();
+                    }
+                    string No = ConfigurationManager.AppSettings["No"]?.ToString();
+                    // 添加记录到窗口（无论窗口是否显示）
+                    _reportWindow2.AddRecord(currentTime, currentDate, startPress, endPress, diffPress, ProtectTime,No);
+                });
+
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"记录测试数据失败：{ex.Message}");
+            }
+        }
+
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            // 停止定时器
+            _readTimer?.Stop();
+
+            // 停止ViewModel的定时器
+            if (DataContext is MainViewModel viewModel)
+            {
+                viewModel.StopTimer();
+            }
+
+            // 释放Modbus资源
+            ModbusResourceManager.Instance?.Dispose();
+
+            // 确保应用程序完全退出
+            Application.Current.Shutdown();
+        }
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            // 清理其他窗口实例
+            //_mainWindow2?.Close();
+            _mainWindow3?.Close();
+            _mainWindow4?.Close();
+            _mainWindow?.Close();
+            _reportWindow2?.Close();
+        }
+
+        //private void number_GotFocus(object sender, RoutedEventArgs e)
+        //{
+
+        //}
+
+        //private void pressureDiff2_GotFocus(object sender, RoutedEventArgs e)
+        //{
+        //    SaveAppSetting("No", pressureDiff2.Text);
+        //}
+        //public bool SaveAppSetting(string key, string value)
+        //{
+        //    try
+        //    {
+        //        // 1. 获取当前程序的配置文件路径（编译后的 exe.config）
+        //        string configPath = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
+
+        //        // 2. 加载配置文件（ExeConfigurationFileMap 指定配置路径）
+        //        ExeConfigurationFileMap configFileMap = new ExeConfigurationFileMap { ExeConfigFilename = configPath };
+        //        Configuration config = ConfigurationManager.OpenMappedExeConfiguration(configFileMap, ConfigurationUserLevel.None);
+
+        //        // 3. 处理 appSettings 节点
+        //        if (config.AppSettings.Settings[key] == null)
+        //        {
+        //            // 键不存在 → 新增配置
+        //            config.AppSettings.Settings.Add(key, value);
+        //        }
+        //        else
+        //        {
+        //            // 键已存在 → 更新配置
+        //            config.AppSettings.Settings[key].Value = value;
+        //        }
+
+        //        // 4. 保存配置（重要！否则修改不生效）
+        //        config.Save(ConfigurationSaveMode.Modified);
+
+        //        // 5. 刷新 ConfigurationManager 缓存（可选，让后续读取能立即获取新值）
+        //        ConfigurationManager.RefreshSection("appSettings");
+
+        //        return true;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        // 捕获异常（如权限不足、文件被占用等）
+        //        MessageBox.Show($"保存配置失败：{ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+        //        return false;
+        //    }
+        //}
+
+    }
+   
+
+    public class TestRecordForNegativePressure
+    {
+        public int Id { get; set; }
+        public string Time { get; set; }
+        public string Date { get; set; }
+        public double StartPress { get; set; } // 供氧流量L/min
+        public double EndPress { get; set; } // 测试时长
+
+        public double DiffPress { get; set; } // 测试时长
+
+        public DateTime CreateTime { get; set; }
+
+        public double ProtectTime { get; set; }
+
+        public string No { get; set; }
+    }
+}
diff --git a/MainWindow3.xaml b/MainWindow3.xaml
new file mode 100644
index 0000000..180dc2f
--- /dev/null
+++ b/MainWindow3.xaml
@@ -0,0 +1,313 @@
+<Window x:Class="自救器呼吸器综合检验仪.MainWindow3"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:自救器呼吸器综合检验仪"
+        Title="自救器呼吸器综合检验仪" Height="900" Width="1280"
+        WindowStartupLocation="CenterScreen"
+        Background="Transparent"
+        FontFamily="Microsoft YaHeui"
+        Loaded="Window_Loaded" Closed="Window_Closed" Closing="Window_Closing">
+
+    <Window.DataContext>
+        <local:MainViewModel />
+    </Window.DataContext>
+
+    <!-- 背景层 -->
+    <Grid>
+        <!-- 背景图片 -->
+        <Grid.Background>
+            <ImageBrush ImageSource="/Resources/sleep2.jpg" Stretch="UniformToFill" Opacity="0.15"/>
+        </Grid.Background>
+
+        <!-- 背景遮罩层 -->
+        <Rectangle Fill="#1E3A5F" Opacity="0.85"/>
+
+        <!-- 主内容容器 -->
+        <Grid Margin="20">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <!-- 顶部标题栏 -->
+            <Border Grid.Row="0" Background="#2A4B6D" BorderBrush="#3A5B8C" BorderThickness="0,0,0,2" 
+                    Margin="0,0,0,15" Padding="20,12">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <!-- 主标题 -->
+                    <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                        <TextBlock Text="正压气密性检验系统" 
+                                   FontSize="22" FontWeight="Bold" Foreground="White"/>
+                        <!--<TextBlock Text="正压气密性检验系统" 
+                                   FontSize="12" Foreground="#CCFFFFFF" Margin="0,3,0,0"/>-->
+                    </StackPanel>
+
+                    <!-- 状态指示 -->
+                    <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,20,0">
+                        <Border Background="#27AE60" Padding="10,5" Margin="0,0,10,0">
+                            <TextBlock Text="系统状态：" FontSize="11" Foreground="White" FontWeight="Bold"/>
+                        </Border>
+                        <Border x:Name="statusPanel" Background="#3498DB" Padding="10,5">
+                            <TextBlock x:Name="status" Text="空闲" FontSize="11" Foreground="White" FontWeight="Bold"/>
+                        </Border>
+                    </StackPanel>
+
+                    <!-- 系统时间 -->
+                    <Border Grid.Column="2" Background="White" Padding="12,6">
+                        <TextBlock Text="{Binding CurrentTime, StringFormat='yyyy-MM-dd HH:mm:ss'}" 
+                                   FontSize="11" FontWeight="Bold" Foreground="#2C3E50"/>
+                    </Border>
+                </Grid>
+            </Border>
+
+            <!-- 主内容区域 -->
+            <Grid Grid.Row="1" Margin="0,0,0,15">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="280"/>
+                </Grid.ColumnDefinitions>
+
+                <!-- 左侧：配置与监控区 -->
+                <Grid Grid.Column="0" Margin="0,0,15,0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+
+                    <!-- 参数配置区 -->
+                    <Border Grid.Row="0" Background="White" Margin="0,0,0,15" 
+                            BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="20,15">
+                            <TextBlock Text="⚙️ 正压参数配置" FontSize="16" FontWeight="Bold" 
+                                       Foreground="#2C3E50" Margin="0,0,0,15"/>
+
+                            <!-- 第一行设置 -->
+                            <StackPanel Orientation="Horizontal" Margin="0,0,0,12">
+                                <TextBlock Text="压力设置：" Width="80" VerticalAlignment="Center" 
+                                           FontSize="13" FontWeight="SemiBold" Foreground="#2C3E50"/>
+                                <TextBox x:Name="settingtime" Text="0" Width="80" Height="32" 
+                                         VerticalContentAlignment="Center" TextAlignment="Center"
+                                         BorderBrush="#DCDFE6" BorderThickness="1" Background="#FAFBFC"
+                                         FontSize="13"/>
+                                <TextBlock Text="Pa" Margin="8,0,20,0" VerticalAlignment="Center" 
+                                           FontSize="13" Foreground="#7F8C8D"/>
+
+                                <Button Content="设置压力" Click="BtnWrite401_Click" 
+                                        Background="#3498DB" Foreground="White" FontSize="12" FontWeight="Bold"
+                                        Width="90" Height="32" BorderThickness="0" Margin="0,0,25,0"
+                                        Cursor="Hand"/>
+
+                                <TextBlock Text="检验时间：" Width="70" VerticalAlignment="Center" 
+                                           FontSize="13" FontWeight="SemiBold" Foreground="#2C3E50"/>
+                                <TextBox x:Name="settingtime2" Text="0" Width="80" Height="32" 
+                                         VerticalContentAlignment="Center" TextAlignment="Center"
+                                         BorderBrush="#DCDFE6" BorderThickness="1" Background="#FAFBFC"
+                                         FontSize="13"/>
+                                <TextBlock Text="秒" Margin="8,0,20,0" VerticalAlignment="Center" 
+                                           FontSize="13" Foreground="#7F8C8D"/>
+
+                                <Button Content="设置时间" Click="BtnWrite402_Click" 
+                                        Background="#3498DB" Foreground="White" FontSize="12" FontWeight="Bold"
+                                        Width="90" Height="32" BorderThickness="0" Cursor="Hand"/>
+                            </StackPanel>
+
+                            <!-- 第二行设置 -->
+                            <!--<StackPanel Orientation="Horizontal">
+                                <TextBlock Text="试验时间：" Width="80" VerticalAlignment="Center" 
+                                           FontSize="13" FontWeight="SemiBold" Foreground="#2C3E50"/>
+                                <TextBox Text="0" Width="60" Height="32" VerticalContentAlignment="Center" 
+                                         TextAlignment="Center" BorderBrush="#DCDFE6" BorderThickness="1" 
+                                         Background="#FAFBFC" FontSize="13"/>
+                                <TextBlock Text="分" Margin="5,0,15,0" VerticalAlignment="Center" 
+                                           FontSize="13" Foreground="#7F8C8D"/>
+                                <TextBox Text="0" Width="60" Height="32" VerticalContentAlignment="Center" 
+                                         TextAlignment="Center" BorderBrush="#DCDFE6" BorderThickness="1" 
+                                         Background="#FAFBFC" FontSize="13"/>
+                                <TextBlock Text="秒" Margin="5,0,0,0" VerticalAlignment="Center" 
+                                           FontSize="13" Foreground="#7F8C8D"/>
+                            </StackPanel>-->
+                        </StackPanel>
+                    </Border>
+
+                    <!-- 实时数据监控 -->
+                    <Border Grid.Row="1" Background="White" BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="20,15">
+                            <TextBlock Text="📊 正压数据监控" FontSize="16" FontWeight="Bold" 
+                                       Foreground="#2C3E50" Margin="0,0,0,15"/>
+
+                            <!-- 第一行数据 -->
+                            <Grid Margin="0,0,0,10">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <!-- 当前压力 -->
+                                <Border Grid.Column="0" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="当前压力" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="min" Text="0.00" FontSize="18" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="Pa" FontSize="12" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="5,0,0,2"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+
+                                <!-- 试验时间 -->
+                                <Border Grid.Column="1" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="试验时间" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="min2" Text="0.00" FontSize="18" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="秒" FontSize="12" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="5,0,0,2"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+
+                                <!-- 初始压力 -->
+                                <Border Grid.Column="2" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="初始压力" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="min3" Text="0.00" FontSize="18" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="Pa" FontSize="12" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="5,0,0,2"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+                            </Grid>
+
+                            <!-- 第二行数据 -->
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <!-- 结束压力 -->
+                                <Border Grid.Column="0" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="结束压力" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="min4" Text="0.00" FontSize="18" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="Pa" FontSize="12" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="5,0,0,2"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+
+                                <!-- 压差 -->
+                                <Border Grid.Column="1" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="压差" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock x:Name="min5" Text="0.00" FontSize="18" FontWeight="Bold" 
+                                                       Foreground="#2C3E50"/>
+                                            <TextBlock Text="Pa" FontSize="12" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Bottom" Margin="5,0,0,2"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+
+                                <!-- 状态指示 -->
+                                <Border Grid.Column="2" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <!--<StackPanel>
+                                        <TextBlock Text="检验状态" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock Text="正常" FontSize="18" FontWeight="Bold" 
+                                                       Foreground="#27AE60"/>
+                                        </StackPanel>
+                                    </StackPanel>-->
+                                </Border>
+                            </Grid>
+                        </StackPanel>
+                    </Border>
+                </Grid>
+
+                <!-- 右侧：操作控制区 -->
+                <StackPanel Grid.Column="1">
+                    <!-- 数据管理 -->
+                    <Border Background="White" Margin="0,0,0,15" BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="15,15">
+                            <TextBlock Text="💾 数据管理" FontSize="15" FontWeight="Bold" Foreground="#2C3E50" 
+                                       HorizontalAlignment="Center" Margin="0,0,0,15"/>
+                            <Button Content="📝 记录数据" Click="Button_Click" 
+                                    Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold"
+                                    Height="42" BorderThickness="0" Cursor="Hand"/>
+                        </StackPanel>
+                    </Border>
+
+                    <!-- 测试控制 -->
+                    <Border Background="White" BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="15,15">
+                            <TextBlock Text="🎛️ 测试控制" FontSize="15" FontWeight="Bold" Foreground="#2C3E50" 
+                                       HorizontalAlignment="Center" Margin="0,0,0,15"/>
+
+                            <Button Content="🚀 启动测试" Click="Button_Click_1" 
+                                    Background="#27AE60" Foreground="White" FontSize="13" FontWeight="Bold"
+                                    Height="42" BorderThickness="0" Margin="0,0,0,10" Cursor="Hand"/>
+
+                            <Button Content="🛑 停止测试" Click="Button_Click_2" 
+                                    Background="#E74C3C" Foreground="White" FontSize="13" FontWeight="Bold"
+                                    Height="42" BorderThickness="0" Margin="0,0,0,10" Cursor="Hand"/>
+
+                            <Button Content="⏱️ 开始计时" Click="Button_Click_3" 
+                                    Background="#3498DB" Foreground="White" FontSize="12" FontWeight="Bold"
+                                    Height="38" BorderThickness="0" Cursor="Hand"/>
+                        </StackPanel>
+                    </Border>
+                </StackPanel>
+            </Grid>
+
+            <!-- 底部导航 -->
+            <Border Grid.Row="2" Background="White" BorderBrush="#E1E8ED" BorderThickness="1,0,0,0">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="10,8">
+                    <Button Content="定量供应检验" Click="Button_Click_4"
+                            Background="White" Foreground="#2C3E50" FontSize="11" FontWeight="Bold"
+                            Width="120" Height="35" BorderBrush="#3498DB" BorderThickness="1" Margin="5,3"
+                            Cursor="Hand"/>
+
+                    <Button Content="负压气密性检验" Click="Button_Click_5"
+                            Background="White" Foreground="#2C3E50" FontSize="11" FontWeight="Bold"
+                            Width="120" Height="35" BorderBrush="#3498DB" BorderThickness="1" Margin="5,3"
+                            Cursor="Hand"/>
+
+                    <Button Content="正压气密性检验" 
+                            Background="#3498DB" Foreground="White" FontSize="11" FontWeight="Bold"
+                            Width="120" Height="35" BorderThickness="0" Margin="5,3" Cursor="Hand"/>
+
+                    <Button Content="排气阀压力测试" Click="Button_Click_7"
+                            Background="White" Foreground="#2C3E50" FontSize="11" FontWeight="Bold"
+                            Width="120" Height="35" BorderBrush="#3498DB" BorderThickness="1" Margin="5,3"
+                            Cursor="Hand"/>
+                </StackPanel>
+            </Border>
+        </Grid>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/MainWindow3.xaml.cs b/MainWindow3.xaml.cs
new file mode 100644
index 0000000..6197fe7
--- /dev/null
+++ b/MainWindow3.xaml.cs
@@ -0,0 +1,687 @@
+using Modbus.Device;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.IO.Ports;
+using System.Linq;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+using 自救器呼吸器综合检验仪;
+using 自救器呼吸器综合检验仪.Data;
+
+namespace 自救器呼吸器综合检验仪
+{
+    /// <summary>
+    /// MainWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class MainWindow3 : Window
+    {
+        private MainWindow _mainWindow;
+        private MainWindow2 _mainWindow2;
+        private MainWindow3 _mainWindow3;
+        private MainWindow4 _mainWindow4;
+
+        private ReportWindow3 _reportWindow3;
+        private bool _wasRunning = false; // 上次检验的运行状态
+        private bool _recordAdded = false;   // 本轮测试是否已插入记录
+        private DateTime _testStartTime; // 测试开始时间
+        private TcpClient _tcpClient => ModbusResourceManager.Instance.TcpClient;
+        private IModbusMaster _modbusMaster => ModbusResourceManager.Instance.ModbusMaster;
+        private const byte SlaveId = 1;        // PLC从站地址
+                                               // Modbus通信
+
+        private bool _isManualInput = false; // 手动输入标记：true=输入中（暂停读取），false=正常读取
+        private readonly DispatcherTimer _readTimer;
+
+        Function ma;
+        DataChange c = new DataChange();
+
+        public MainWindow3()
+        {
+            InitializeComponent();
+            _readTimer = InitDispatcherTimer();
+            //InitializeModbusTcp();
+            BindInputFocusEvents();
+        }
+
+        private void BindInputFocusEvents()
+        {
+            // 地址400输入框（count）
+            settingtime.GotFocus += (s, e) => _isManualInput = true;  // 获得焦点→暂停读取
+            settingtime.LostFocus += (s, e) => _isManualInput = false; // 失去焦点→恢复读取
+
+            //// 地址404输入框（count2）
+            //count2.GotFocus += (s, e) => _isManualInput = true;
+            //count2.LostFocus += (s, e) => _isManualInput = false;
+
+            //// 地址406输入框（count3）
+            //count3.GotFocus += (s, e) => _isManualInput = true;
+            //count3.LostFocus += (s, e) => _isManualInput = false;
+        }
+
+        private DispatcherTimer InitDispatcherTimer()
+        {
+            var timer = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromMilliseconds(500)
+            };
+            timer.Tick += async (s, e) =>
+            {
+                if (!_isManualInput && _modbusMaster != null)
+                {
+
+                    try
+                    {
+                        await ReadAllPlcDataAsync();
+                    }
+                    catch { }
+                }
+            };
+            return timer;
+        }
+
+
+
+        //private void InitializeModbusTcp()
+        //{
+        //    try
+        //    {
+        //        // 从配置读取PLC连接信息
+        //        string plcIp = "192.168.1.10";
+        //        int plcPort = 502;
+
+        //        _tcpClient = new TcpClient(plcIp, plcPort);
+        //        _modbusMaster = ModbusIpMaster.CreateIp(_tcpClient);
+        //        _modbusMaster.Transport.ReadTimeout = 3000;
+        //        _modbusMaster.Transport.WriteTimeout = 3000;
+
+        //        // 初始化定时器
+        //        //InitializeTimers();
+        //        // 初始化数据库
+        //        //InitializeDatabase();
+        //        _readTimer.Start();
+        //        ma = new Function(_modbusMaster);
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        ShowErrorMsg($"Modbus初始化失败: {ex.Message}");
+        //    }
+        //}
+        private async System.Threading.Tasks.Task ReadAllPlcDataAsync()
+        {
+
+            // 检查连接状态
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                return;
+            }
+            // 仅在非手动输入时读取设置地址（避免覆盖输入）
+            if (!_isManualInput)
+            {
+                await ReadAddr262DataAsync();
+                await System.Threading.Tasks.Task.Delay(50);
+
+                await ReadAddr404DataAsync();
+                await System.Threading.Tasks.Task.Delay(50);
+
+
+
+
+                await ReadAddr406DataAsync();
+                await System.Threading.Tasks.Task.Delay(50);
+
+                await ReadAddr130DataAsync();
+                await System.Threading.Tasks.Task.Delay(50);
+                await ReadAddr416DataAsync();
+
+
+                await System.Threading.Tasks.Task.Delay(50);
+                await ReadAddr1301DataAsync();
+
+                await System.Threading.Tasks.Task.Delay(50);
+                await ReadAddr4161DataAsync();
+
+
+
+            }
+
+            await ReadAddrStatusDataAsync();
+        }
+
+        private async System.Threading.Tasks.Task ReadAddr262DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster?.ReadHoldingRegisters(1, 320, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    Dispatcher.Invoke(() => settingtime.Text = addr406Value.ToString("F2"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+
+
+        private async System.Threading.Tasks.Task ReadAddr416DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster?.ReadHoldingRegisters(1, 1110, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    Dispatcher.Invoke(() => min3.Text = addr406Value.ToString("F2"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+        private async System.Threading.Tasks.Task ReadAddr1301DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster?.ReadHoldingRegisters(1, 1112, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    Dispatcher.Invoke(() => min4.Text = addr406Value.ToString("F2"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+        private async System.Threading.Tasks.Task ReadAddr4161DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster?.ReadHoldingRegisters(1, 1116, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    Dispatcher.Invoke(() => min5.Text = addr406Value.ToString("F2"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+        private async System.Threading.Tasks.Task ReadAddr404DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster?.ReadHoldingRegisters(1, 322, 1)
+                );
+
+                if (registers != null)
+                {
+                    int addr406Value = registers[0];
+                    Dispatcher.Invoke(() => settingtime2.Text = addr406Value.ToString("F0"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+        private async System.Threading.Tasks.Task ReadAddr406DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster?.ReadHoldingRegisters(1, 1430, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    Dispatcher.Invoke(() => min.Text = addr406Value.ToString("F2"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+        private async System.Threading.Tasks.Task ReadAddr130DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster?.ReadHoldingRegisters(1, 92, 1)
+                );
+
+                if (registers != null)
+                {
+                    int addr406Value = registers[0];
+                    Dispatcher.Invoke(() => min2.Text = addr406Value.ToString("F2"));
+
+
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+        private async System.Threading.Tasks.Task ReadAddrStatusDataAsync()
+        {
+            try
+            {
+                bool[] result = _modbusMaster?.ReadCoils(0x01, 91, 1);
+                bool isTestRunning = result != null && result.Length > 0 && result[0];
+
+                Dispatcher.Invoke(() =>
+                {
+                    if (isTestRunning)
+                    {
+                        status.Text = "正在运行";
+                        statusPanel.Background = Brushes.Green;
+                        if (!_wasRunning)
+                        {
+                            _testStartTime = DateTime.Now;
+                            _recordAdded = false; // 测试刚开始，允许插入记录
+                        }
+                    }
+                    else
+                    {
+                        status.Text = "空闲";
+                        statusPanel.Background = Brushes.Blue;
+                        // 状态从“运行”切换到“空闲”，且还没插入记录
+                        if (_wasRunning && !_recordAdded)
+                        {
+                            AddTestRecord();      // 插入记录
+                            _recordAdded = true;  // 标记已插入
+                        }
+                    }
+                    _wasRunning = isTestRunning; // 更新上一次状态
+                });
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取运行状态失败：{ex.Message}");
+            }
+        }
+
+
+        private void ShowErrorMsg(string msg)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                MessageBox.Show(msg, "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+            });
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            OpenQuantitativeSupplyWindow3();
+
+        }
+
+        private void OpenQuantitativeSupplyWindow3()
+        {
+            try
+            {
+                SwitchWindow(ref _reportWindow3, () => new ReportWindow3());
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"打开定量供应检验窗口时出错：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 90);
+
+        }
+
+        private void Button_Click_2(object sender, RoutedEventArgs e)
+        {
+            //ma.BtnClickFunctionForNew(Function.ButtonType.复归型, 93);
+            ma.BtnClickFunctionForNew(Function.ButtonType.复归型, 93);
+
+        }
+
+        private void Button_Click_3(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 94);
+        }
+
+        private void Button_Click_4(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow, () => new MainWindow());
+        }
+
+        private void Button_Click_5(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow2, () => new MainWindow2());
+        }
+
+        private void Button_Click_6(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow3, () => new MainWindow3());
+        }
+
+        private void Button_Click_7(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow4, () => new MainWindow4());
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            string plcIp = "192.168.1.10";
+            bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+            if (!initSuccess)
+            {
+                MessageBox.Show("连接Modbus服务器失败！", "错误");
+                this.Close();
+                return;
+            }
+
+            // 检查连接状态
+            if (_tcpClient == null || !_tcpClient.Connected)
+            {
+                MessageBox.Show("Modbus连接异常！", "错误");
+                this.Close();
+                return;
+            }
+
+            ma = new Function(_modbusMaster);
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 63);
+            System.Threading.Tasks.Task.Delay(50);
+            _readTimer.Start();
+
+            _modbusMaster.WriteSingleCoil(1, 61, false);
+            System.Threading.Tasks.Task.Delay(50);
+
+            _modbusMaster.WriteSingleCoil(1, 62, false);
+            System.Threading.Tasks.Task.Delay(50);
+
+            _modbusMaster.WriteSingleCoil(1, 63, true);
+            System.Threading.Tasks.Task.Delay(50);
+
+            _modbusMaster.WriteSingleCoil(1, 64, false);
+            System.Threading.Tasks.Task.Delay(50);
+        }
+
+        private void SwitchWindow<T>(ref T windowInstance, Func<T> createFunc) where T : Window, new()
+        {
+            // 1. 停止当前窗口的定时器（不释放资源）
+            _readTimer?.Stop();
+
+            // 2. 检查资源是否可用（添加重连机制）
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                // 尝试重新连接
+                bool reconnectSuccess = TryReconnect();
+                if (!reconnectSuccess)
+                {
+                    MessageBox.Show("TCP连接已断开，请重新连接！", "提示");
+                    return;
+                }
+            }
+
+            // 3. 复用窗口实例：不存在则创建，存在则激活
+            if (windowInstance == null)
+            {
+                windowInstance = createFunc();
+                // 添加窗口关闭事件处理
+                windowInstance.Closed += (s, args) =>
+                {
+                    // 窗口关闭时重新启动定时器并显示当前窗口
+                    _readTimer?.Start();
+                    //this.Show();
+                    this.Activate();
+                };
+            }
+            else
+            {
+                // 激活已存在的窗口（前置显示）
+                windowInstance.Activate();
+                //return;
+            }
+
+            // 4. 切换窗口：隐藏当前窗口，显示目标窗口（非模态）
+            this.Hide();
+            windowInstance.Show(); // 使用 Show() 而不是 ShowDialog()
+        }
+        // 添加重连方法
+        private bool TryReconnect()
+        {
+            try
+            {
+                string plcIp = "192.168.1.10";
+                bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+                if (initSuccess)
+                {
+                    ma = new Function(_modbusMaster);
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"重新连接失败：{ex.Message}");
+            }
+            return false;
+        }
+
+
+
+        private void BtnWrite401_Click(object sender, RoutedEventArgs e)
+        {
+            if (!double.TryParse(settingtime.Text.Trim(), out double writeValue) ||
+                 writeValue > short.MaxValue)
+            {
+                ShowErrorMsg($"需输入整数（范围：{short.MinValue} ~ {short.MaxValue}）");
+                settingtime.Focus();
+                return;
+            }
+
+            try
+            {
+                //await System.Threading.Tasks.Task.Run(() =>
+                //    _modbusMaster.WriteSingleRegister(SlaveId, Address262, (ushort)writeValue)
+                //);
+
+                ma.WriteToPLCForNew(settingtime.Text.Trim(), 320, Function.DataType.浮点型);
+
+                System.Threading.Tasks.Task.Delay(50);
+                _isManualInput = false; // 写入后恢复读取
+                //await ReadAddr400DataAsync(); // 刷新显示（确认写入成功）
+
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"地址400写入失败：{ex.Message}");
+            }
+        }
+
+
+        private void BtnWrite402_Click(object sender, RoutedEventArgs e)
+        {
+            if (!double.TryParse(settingtime2.Text.Trim(), out double writeValue) ||
+                 writeValue > short.MaxValue)
+            {
+                ShowErrorMsg($"需输入整数（范围：{short.MinValue} ~ {short.MaxValue}）");
+                settingtime.Focus();
+                return;
+            }
+
+            try
+            {
+                //await System.Threading.Tasks.Task.Run(() =>
+                //    _modbusMaster.WriteSingleRegister(SlaveId, Address262, (ushort)writeValue)
+                //);
+
+                ma.WriteToPLCForNew(settingtime2.Text.Trim(), 322, Function.DataType.整形);
+
+                System.Threading.Tasks.Task.Delay(50);
+                _isManualInput = false; // 写入后恢复读取
+                //await ReadAddr400DataAsync(); // 刷新显示（确认写入成功）
+
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"地址400写入失败：{ex.Message}");
+            }
+        }
+
+
+        private void OpenReportWindow()
+        {
+            try
+            {
+                if (_reportWindow3 == null)
+                {
+                    _reportWindow3 = new ReportWindow3();
+                }
+
+                // 如果窗口已关闭，重新创建并显示
+                if (!_reportWindow3.IsVisible)
+                {
+                    _reportWindow3 = new ReportWindow3();
+                    // 将之前的数据复制到新窗口
+                    if (_reportWindow3._records != null)
+                    {
+                        // 保持数据引用不变
+                    }
+                }
+
+                _reportWindow3.Show();
+                _reportWindow3.Activate();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"打开报表窗口时出错：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+
+        private void AddTestRecord()
+        {
+            try
+            {
+                // 计算测试时长
+                TimeSpan duration = DateTime.Now - _testStartTime;
+                string durationStr = $"{duration.Minutes:00}:{duration.Seconds:00}";
+
+                // 获取当前流量值
+                double startPress = 0, endPress = 0, diffPress = 0, ProtectTime = 0;
+                if (!string.IsNullOrEmpty(min3.Text) && double.TryParse(min3.Text, out double flow))
+                {
+                    startPress = flow;
+                }
+
+                if (!string.IsNullOrEmpty(min4.Text) && double.TryParse(min4.Text, out double flow2))
+                {
+                    endPress = flow2;
+                }
+
+                if (!string.IsNullOrEmpty(min5.Text) && double.TryParse(min5.Text, out double flow5))
+                {
+                    diffPress = flow5;
+                }
+
+                if (!string.IsNullOrEmpty(min2.Text) && double.TryParse(min2.Text, out double flow3))
+                {
+                    ProtectTime = flow3;
+                }
+
+                // 获取当前时间
+                string currentTime = DateTime.Now.ToString("HH:mm");
+                string currentDate = DateTime.Now.ToString("yy/MM/dd");
+
+                // 添加到报表窗口（如果存在）
+                Dispatcher.Invoke(() =>
+                {
+                    // 如果窗口不存在，先创建但不显示
+                    if (_reportWindow3 == null)
+                    {
+                        _reportWindow3 = new ReportWindow3();
+                    }
+
+                    string testNo = ConfigurationManager.AppSettings["No"].ToString();// 待定
+                    // 添加记录到窗口（无论窗口是否显示）
+                    _reportWindow3.AddRecord(currentTime, currentDate, startPress, endPress, diffPress, ProtectTime, testNo);
+                });
+
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"记录测试数据失败：{ex.Message}");
+            }
+        }
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            // 停止定时器
+            _readTimer?.Stop();
+
+            // 停止ViewModel的定时器
+            if (DataContext is MainViewModel viewModel)
+            {
+                viewModel.StopTimer();
+            }
+
+            // 释放Modbus资源
+            ModbusResourceManager.Instance?.Dispose();
+
+            // 确保应用程序完全退出
+            Application.Current.Shutdown();
+        }
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            // 清理其他窗口实例
+            _mainWindow?.Close();
+            _mainWindow2?.Close();
+            //_mainWindow3?.Close();
+            _mainWindow4?.Close();
+            _reportWindow3?.Close();
+        }
+    }
+}
diff --git a/MainWindow4.xaml b/MainWindow4.xaml
new file mode 100644
index 0000000..f9b2ff3
--- /dev/null
+++ b/MainWindow4.xaml
@@ -0,0 +1,229 @@
+<Window x:Class="自救器呼吸器综合检验仪.MainWindow4"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:自救器呼吸器综合检验仪"
+        Title="自救器呼吸器综合检验仪" Height="900" Width="1280"
+        WindowStartupLocation="CenterScreen"
+        Background="Transparent"
+        FontFamily="Microsoft YaHeui"
+        Loaded="Window_Loaded" Closed="Window_Closed" Closing="Window_Closing">
+
+    <Window.DataContext>
+        <local:MainViewModel />
+    </Window.DataContext>
+
+    <!-- 背景层 -->
+    <Grid>
+        <!-- 背景图片 -->
+        <Grid.Background>
+            <ImageBrush ImageSource="/Resources/sleep2.jpg" Stretch="UniformToFill" Opacity="0.15"/>
+        </Grid.Background>
+
+        <!-- 背景遮罩层 -->
+        <Rectangle Fill="#1E3A5F" Opacity="0.85"/>
+
+        <!-- 主内容容器 -->
+        <Grid Margin="20">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <!-- 顶部标题栏 -->
+            <Border Grid.Row="0" Background="#2A4B6D" BorderBrush="#3A5B8C" BorderThickness="0,0,0,2" 
+                    Margin="0,0,0,15" Padding="20,12">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <!-- 主标题 -->
+                    <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                        <TextBlock Text="排气阀开启压力测试系统" 
+                                   FontSize="22" FontWeight="Bold" Foreground="White"/>
+                        <!--<TextBlock Text="排气阀开启压力测试系统" 
+                                   FontSize="12" Foreground="#CCFFFFFF" Margin="0,3,0,0"/>-->
+                    </StackPanel>
+
+                    <!-- 状态指示 -->
+                    <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,20,0">
+                        <Border Background="#27AE60" Padding="10,5" Margin="0,0,10,0">
+                            <TextBlock Text="系统状态：" FontSize="11" Foreground="White" FontWeight="Bold"/>
+                        </Border>
+                        <Border x:Name="statusPanel" Background="#3498DB" Padding="10,5">
+                            <TextBlock x:Name="status" Text="空闲" FontSize="11" Foreground="White" FontWeight="Bold"/>
+                        </Border>
+                    </StackPanel>
+
+                    <!-- 系统时间 -->
+                    <Border Grid.Column="2" Background="White" Padding="12,6">
+                        <TextBlock Text="{Binding CurrentTime, StringFormat='yyyy-MM-dd HH:mm:ss'}" 
+                                   FontSize="11" FontWeight="Bold" Foreground="#2C3E50"/>
+                    </Border>
+                </Grid>
+            </Border>
+
+            <!-- 主内容区域 -->
+            <Grid Grid.Row="1" Margin="0,0,0,15">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="280"/>
+                </Grid.ColumnDefinitions>
+
+                <!-- 左侧：配置与监控区 -->
+                <Grid Grid.Column="0" Margin="0,0,15,0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+
+                    <!-- 压力数据监控 -->
+                    <Border Grid.Row="0" Background="White" BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="20,15">
+                            <TextBlock Text="📊 排气阀压力监控" FontSize="16" FontWeight="Bold" 
+                                       Foreground="#2C3E50" Margin="0,0,0,20"/>
+
+                            <!-- 压力设置行 -->
+                            <Grid Margin="0,0,0,25">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <!-- 当前压力设置 -->
+                                <Border Grid.Column="0" Background="#F8F9FA" Margin="10" Padding="20,15" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="当前压力" FontSize="13" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,10"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,12">
+                                            <TextBlock x:Name="settingtime" Text="0.00" FontSize="20" FontWeight="Bold" 
+                                                       Foreground="#2C3E50" VerticalAlignment="Center"/>
+                                            <TextBlock Text="Pa" FontSize="13" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Center" Margin="8,0,15,0"/>
+                                        </StackPanel>
+                                        <!--<Button Content="设置压力" Click="BtnWrite401_Click" 
+                                                Background="#3498DB" Foreground="White" FontSize="12" FontWeight="Bold"
+                                                Width="100" Height="32" BorderThickness="0" Cursor="Hand"/>-->
+                                    </StackPanel>
+                                </Border>
+
+                                <!-- 开启压力设置 -->
+                                <Border Grid.Column="1" Background="#F8F9FA" Margin="10" Padding="20,15" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="开启压力" FontSize="13" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,10"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,12">
+                                            <TextBlock x:Name="settingtime2" Text="0.00" FontSize="20" FontWeight="Bold" 
+                                                       Foreground="#2C3E50" VerticalAlignment="Center"/>
+                                            <TextBlock Text="Pa" FontSize="13" Foreground="#7F8C8D" 
+                                                       VerticalAlignment="Center" Margin="8,0,15,0"/>
+                                        </StackPanel>
+                                        <!--<Button Content="设置压力" Click="BtnWrite402_Click" 
+                                                Background="#3498DB" Foreground="White" FontSize="12" FontWeight="Bold"
+                                                Width="100" Height="32" BorderThickness="0" Cursor="Hand"/>-->
+                                    </StackPanel>
+                                </Border>
+                            </Grid>
+
+                            <!-- 状态指示行 -->
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <!-- 测试状态 --><!--
+                                <Border Grid.Column="0" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="测试状态" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock Text="待机" FontSize="16" FontWeight="Bold" 
+                                                       Foreground="#3498DB"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>
+
+                                --><!-- 压力状态 --><!--
+                                <Border Grid.Column="1" Background="#F8F9FA" Margin="8" Padding="15,12" 
+                                        BorderBrush="#E1E8ED" BorderThickness="1">
+                                    <StackPanel>
+                                        <TextBlock Text="压力状态" FontSize="12" Foreground="#7F8C8D" 
+                                                   FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                            <TextBlock Text="正常" FontSize="16" FontWeight="Bold" 
+                                                       Foreground="#27AE60"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Border>-->
+
+                                <!-- 阀门状态 -->
+
+                            </Grid>
+                        </StackPanel>
+                    </Border>
+                </Grid>
+
+                <!-- 右侧：操作控制区 -->
+                <StackPanel Grid.Column="1">
+                    <!-- 数据管理 -->
+                    <Border Background="White" Margin="0,0,0,15" BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="15,15">
+                            <TextBlock Text="💾 数据管理" FontSize="15" FontWeight="Bold" Foreground="#2C3E50" 
+                                       HorizontalAlignment="Center" Margin="0,0,0,15"/>
+                            <Button Content="📝 记录数据" Click="Button_Click" 
+                                    Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold"
+                                    Height="42" BorderThickness="0" Cursor="Hand"/>
+                        </StackPanel>
+                    </Border>
+
+                    <!-- 测试控制 -->
+                    <Border Background="White" BorderBrush="#E1E8ED" BorderThickness="1">
+                        <StackPanel Margin="15,15">
+                            <TextBlock Text="🎛️ 测试控制" FontSize="15" FontWeight="Bold" Foreground="#2C3E50" 
+                                       HorizontalAlignment="Center" Margin="0,0,0,15"/>
+
+                            <Button Content="🚀 启动测试" Click="Button_Click_1" 
+                                    Background="#27AE60" Foreground="White" FontSize="13" FontWeight="Bold"
+                                    Height="42" BorderThickness="0" Margin="0,0,0,10" Cursor="Hand"/>
+
+                            <Button Content="🛑 停止测试" Click="Button_Click_2" 
+                                    Background="#E74C3C" Foreground="White" FontSize="13" FontWeight="Bold"
+                                    Height="42" BorderThickness="0" Margin="0,0,0,10" Cursor="Hand"/>
+                        </StackPanel>
+                    </Border>
+                </StackPanel>
+            </Grid>
+
+            <!-- 底部导航 -->
+            <Border Grid.Row="2" Background="White" BorderBrush="#E1E8ED" BorderThickness="1,0,0,0">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="10,8">
+                    <Button Content="定量供应检验" Click="Button_Click_4"
+                            Background="White" Foreground="#2C3E50" FontSize="11" FontWeight="Bold"
+                            Width="120" Height="35" BorderBrush="#3498DB" BorderThickness="1" Margin="5,3"
+                            Cursor="Hand"/>
+
+                    <Button Content="负压气密性检验" Click="Button_Click_5"
+                            Background="White" Foreground="#2C3E50" FontSize="11" FontWeight="Bold"
+                            Width="120" Height="35" BorderBrush="#3498DB" BorderThickness="1" Margin="5,3"
+                            Cursor="Hand"/>
+
+                    <Button Content="正压气密性检验" Click="Button_Click_6"
+                            Background="White" Foreground="#2C3E50" FontSize="11" FontWeight="Bold"
+                            Width="120" Height="35" BorderBrush="#3498DB" BorderThickness="1" Margin="5,3"
+                            Cursor="Hand"/>
+
+                    <Button Content="排气阀压力测试" 
+                            Background="#3498DB" Foreground="White" FontSize="11" FontWeight="Bold"
+                            Width="120" Height="35" BorderThickness="0" Margin="5,3" Cursor="Hand"/>
+                </StackPanel>
+            </Border>
+        </Grid>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/MainWindow4.xaml.cs b/MainWindow4.xaml.cs
new file mode 100644
index 0000000..74a6dd8
--- /dev/null
+++ b/MainWindow4.xaml.cs
@@ -0,0 +1,521 @@
+using Modbus.Device;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.IO.Ports;
+using System.Linq;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+using 自救器呼吸器综合检验仪;
+using 自救器呼吸器综合检验仪.Data;
+
+namespace 自救器呼吸器综合检验仪
+{
+    /// <summary>
+    /// MainWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class MainWindow4 : Window
+    {
+        private MainWindow _mainWindow;
+        private MainWindow2 _mainWindow2;
+        private MainWindow3 _mainWindow3;
+        private MainWindow4 _mainWindow4;
+
+
+
+        private ReportWindow4 _reportWindow4;
+
+        private bool _wasRunning = false; // 上次检验的运行状态
+        private bool _recordAdded = false;   // 本轮测试是否已插入记录
+        private DateTime _testStartTime; // 测试开始时间
+
+        private TcpClient _tcpClient => ModbusResourceManager.Instance.TcpClient;
+        private IModbusMaster _modbusMaster => ModbusResourceManager.Instance.ModbusMaster;
+        private const byte SlaveId = 1;        // PLC从站地址
+        private const ushort Address262 = 262;        // 32位浮点数（float32，占2个寄存器）
+        private const ushort Address2506 = 2506;        // 32位浮点数（float32，占2个寄存器）
+        private const ushort Address2502 = 2502;        // 32位浮点数（float32，占2个寄存器）
+                                                        // Modbus通信
+        private bool _isManualInput = false; // 手动输入标记：true=输入中（暂停读取），false=正常读取
+        private readonly DispatcherTimer _readTimer;
+
+        Function ma;
+        DataChange c = new DataChange();
+
+        public MainWindow4()
+        {
+            InitializeComponent();
+            _readTimer = InitDispatcherTimer();
+            //InitializeModbusTcp();
+            BindInputFocusEvents();
+        }
+
+        private void BindInputFocusEvents()
+        {
+            // 地址400输入框（count）
+            //settingtime.GotFocus += (s, e) => _isManualInput = true;  // 获得焦点→暂停读取
+            //settingtime.LostFocus += (s, e) => _isManualInput = false; // 失去焦点→恢复读取
+
+            //// 地址404输入框（count2）
+            //count2.GotFocus += (s, e) => _isManualInput = true;
+            //count2.LostFocus += (s, e) => _isManualInput = false;
+
+            //// 地址406输入框（count3）
+            //count3.GotFocus += (s, e) => _isManualInput = true;
+            //count3.LostFocus += (s, e) => _isManualInput = false;
+        }
+
+        private DispatcherTimer InitDispatcherTimer()
+        {
+            var timer = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromMilliseconds(500)
+            };
+            timer.Tick += async (s, e) =>
+            {
+                if (!_isManualInput && _modbusMaster != null)
+                {
+
+                    try
+                    {
+                        await ReadAllPlcDataAsync();
+                    }
+                    catch { }
+                }
+            };
+            return timer;
+        }
+
+
+
+        //private void InitializeModbusTcp()
+        //{
+        //    try
+        //    {
+        //        // 从配置读取PLC连接信息
+        //        string plcIp = "192.168.1.10";
+        //        int plcPort = 502;
+
+        //        _tcpClient = new TcpClient(plcIp, plcPort);
+        //        _modbusMaster = ModbusIpMaster.CreateIp(_tcpClient);
+        //        _modbusMaster.Transport.ReadTimeout = 3000;
+        //        _modbusMaster.Transport.WriteTimeout = 3000;
+
+        //        // 初始化定时器
+        //        //InitializeTimers();
+        //        // 初始化数据库
+        //        //InitializeDatabase();
+        //        _readTimer.Start();
+        //        ma = new Function(_modbusMaster);
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        ShowErrorMsg($"Modbus初始化失败: {ex.Message}");
+        //    }
+        //}
+        private async System.Threading.Tasks.Task ReadAllPlcDataAsync()
+        {
+            // 检查连接状态
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                return;
+            }
+
+            // 仅在非手动输入时读取设置地址（避免覆盖输入）
+            if (!_isManualInput)
+            {
+                await ReadAddr262DataAsync();
+                await System.Threading.Tasks.Task.Delay(50);
+
+                await ReadAddr404DataAsync();
+                await System.Threading.Tasks.Task.Delay(50);
+
+                //await ReadAddr406DataAsync();
+                //await System.Threading.Tasks.Task.Delay(50);
+                //await ReadAddr130DataAsync();
+            }
+
+            await ReadAddrStatusDataAsync();
+        }
+
+        private async System.Threading.Tasks.Task ReadAddr262DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster.ReadHoldingRegisters(1, 1430, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    Dispatcher.Invoke(() => settingtime.Text = addr406Value.ToString("F2"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+        private async System.Threading.Tasks.Task ReadAddr404DataAsync()
+        {
+            try
+            {
+                ushort[] registers = await System.Threading.Tasks.Task.Run(() =>
+                    _modbusMaster.ReadHoldingRegisters(1, 106, 2)
+                );
+
+                if (registers != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers[1], registers[0]);
+                    Dispatcher.Invoke(() => settingtime2.Text = addr406Value.ToString("F2"));
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+
+        private void ShowErrorMsg(string msg)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                MessageBox.Show(msg, "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+            });
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+
+            OpenQuantitativeSupplyWindow4();
+        }
+
+        private void OpenQuantitativeSupplyWindow4()
+        {
+            try
+            {
+                SwitchWindow(ref _reportWindow4, () => new ReportWindow4());
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"打开定量供应检验窗口时出错：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 100);
+
+        }
+
+        private void Button_Click_2(object sender, RoutedEventArgs e)
+        {
+            //ma.BtnClickFunctionForNew(Function.ButtonType.复归型, 103);
+            ma.BtnClickFunctionForNew(Function.ButtonType.复归型, 103);
+        }
+
+        private void Button_Click_3(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 15);
+        }
+
+        private void Button_Click_4(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow, () => new MainWindow());
+        }
+
+        private void Button_Click_5(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow2, () => new MainWindow2());
+        }
+
+        private void Button_Click_6(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow3, () => new MainWindow3());
+        }
+
+        private void Button_Click_7(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow4, () => new MainWindow4());
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            string plcIp = "192.168.1.10";
+            bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+            if (!initSuccess)
+            {
+                MessageBox.Show("连接Modbus服务器失败！", "错误");
+                this.Close();
+                return;
+            }
+
+            // 检查连接状态
+            if (_tcpClient == null || !_tcpClient.Connected)
+            {
+                MessageBox.Show("Modbus连接异常！", "错误");
+                this.Close();
+                return;
+            }
+
+            ma = new Function(_modbusMaster);
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 64);
+            System.Threading.Tasks.Task.Delay(50);
+            _readTimer.Start();
+
+            _modbusMaster.WriteSingleCoil(1, 61, false);
+            System.Threading.Tasks.Task.Delay(50);
+
+            _modbusMaster.WriteSingleCoil(1, 62, false);
+            System.Threading.Tasks.Task.Delay(50);
+
+            _modbusMaster.WriteSingleCoil(1, 63, false);
+            System.Threading.Tasks.Task.Delay(50);
+
+            _modbusMaster.WriteSingleCoil(1, 64, true);
+            System.Threading.Tasks.Task.Delay(50);
+        }
+
+
+        private void SwitchWindow<T>(ref T windowInstance, Func<T> createFunc) where T : Window, new()
+        {
+            // 1. 停止当前窗口的定时器（不释放资源）
+            _readTimer?.Stop();
+
+            // 2. 检查资源是否可用（添加重连机制）
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                // 尝试重新连接
+                bool reconnectSuccess = TryReconnect();
+                if (!reconnectSuccess)
+                {
+                    MessageBox.Show("TCP连接已断开，请重新连接！", "提示");
+                    return;
+                }
+            }
+
+            // 3. 复用窗口实例：不存在则创建，存在则激活
+            if (windowInstance == null)
+            {
+                windowInstance = createFunc();
+                // 添加窗口关闭事件处理
+                windowInstance.Closed += (s, args) =>
+                {
+                    // 窗口关闭时重新启动定时器并显示当前窗口
+                    _readTimer?.Start();
+                    //this.Show();
+                    this.Activate();
+                };
+            }
+            else
+            {
+                // 激活已存在的窗口（前置显示）
+                windowInstance.Activate();
+                //return;
+            }
+
+            // 4. 切换窗口：隐藏当前窗口，显示目标窗口（非模态）
+            this.Hide();
+            windowInstance.Show(); // 使用 Show() 而不是 ShowDialog()
+        }
+        private bool TryReconnect()
+        {
+            try
+            {
+                string plcIp = "192.168.1.10";
+                bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+                if (initSuccess)
+                {
+                    ma = new Function(_modbusMaster);
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                ShowErrorMsg($"重新连接失败：{ex.Message}");
+            }
+            return false;
+        }
+
+
+        private void BtnWrite401_Click(object sender, RoutedEventArgs e)
+        {
+            if (!double.TryParse(settingtime.Text.Trim(), out double writeValue) ||
+                 writeValue > short.MaxValue)
+            {
+                ShowErrorMsg($"需输入整数（范围：{short.MinValue} ~ {short.MaxValue}）");
+                settingtime.Focus();
+                return;
+            }
+
+            try
+            {
+                //await System.Threading.Tasks.Task.Run(() =>
+                //    _modbusMaster.WriteSingleRegister(SlaveId, Address262, (ushort)writeValue)
+                //);
+
+                ma.WriteToPLCForNew(settingtime.Text.Trim(), 1430, Function.DataType.浮点型);
+
+                System.Threading.Tasks.Task.Delay(50);
+                _isManualInput = false; // 写入后恢复读取
+                //await ReadAddr400DataAsync(); // 刷新显示（确认写入成功）
+
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"地址400写入失败：{ex.Message}");
+            }
+        }
+
+
+        private void BtnWrite402_Click(object sender, RoutedEventArgs e)
+        {
+            if (!double.TryParse(settingtime2.Text.Trim(), out double writeValue) ||
+                 writeValue > short.MaxValue)
+            {
+                ShowErrorMsg($"需输入整数（范围：{short.MinValue} ~ {short.MaxValue}）");
+                settingtime.Focus();
+                return;
+            }
+
+            try
+            {
+                //await System.Threading.Tasks.Task.Run(() =>
+                //    _modbusMaster.WriteSingleRegister(SlaveId, Address262, (ushort)writeValue)
+                //);
+
+                ma.WriteToPLCForNew(settingtime2.Text.Trim(), 106, Function.DataType.浮点型);
+
+                System.Threading.Tasks.Task.Delay(50);
+                _isManualInput = false; // 写入后恢复读取
+                //await ReadAddr400DataAsync(); // 刷新显示（确认写入成功）
+
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"地址400写入失败：{ex.Message}");
+            }
+        }
+
+        private async System.Threading.Tasks.Task ReadAddrStatusDataAsync()
+        {
+            try
+            {
+                bool[] result = _modbusMaster?.ReadCoils(0x01, 101, 1);
+                bool isTestRunning = result != null && result.Length > 0 && result[0];
+
+                Dispatcher.Invoke(() =>
+                {
+                    if (isTestRunning)
+                    {
+                        status.Text = "正在运行";
+                        statusPanel.Background = Brushes.Green;
+                        if (!_wasRunning)
+                        {
+                            _testStartTime = DateTime.Now;
+                            _recordAdded = false; // 测试刚开始，允许插入记录
+                        }
+                    }
+                    else
+                    {
+                        status.Text = "空闲";
+                        statusPanel.Background = Brushes.Blue;
+                        // 状态从“运行”切换到“空闲”，且还没插入记录
+                        if (_wasRunning && !_recordAdded)
+                        {
+                            AddTestRecord();      // 插入记录
+                            _recordAdded = true;  // 标记已插入
+                        }
+                    }
+                    _wasRunning = isTestRunning; // 更新上一次状态
+                });
+            }
+            catch (Exception ex)
+            {
+                ShowErrorMsg($"读取运行状态失败：{ex.Message}");
+            }
+        }
+
+        private void AddTestRecord()
+        {
+            try
+            {
+                // 计算测试时长
+                TimeSpan duration = DateTime.Now - _testStartTime;
+                string durationStr = $"{duration.Minutes:00}:{duration.Seconds:00}";
+
+                // 获取当前流量值
+                double currentFlowRate = 0;
+                if (!string.IsNullOrEmpty(settingtime2.Text) && double.TryParse(settingtime2.Text, out double flow))
+                {
+                    currentFlowRate = flow;
+                }
+
+                // 获取当前时间
+                string currentTime = DateTime.Now.ToString("HH:mm");
+                string currentDate = DateTime.Now.ToString("yy/MM/dd");
+
+                // 添加到报表窗口（如果存在或创建）
+                Dispatcher.Invoke(() =>
+                {
+                    // 如果窗口不存在，先创建但不显示
+                    if (_reportWindow4 == null)
+                    {
+                        _reportWindow4 = new ReportWindow4();
+                    }
+                    string no = ConfigurationManager.AppSettings["No"]?.ToString();
+                    // 添加记录到窗口（无论窗口是否显示）
+                    _reportWindow4.AddRecord(currentTime, currentDate, currentFlowRate, durationStr, no);
+                });
+
+            }
+            catch (Exception ex)
+            {
+                ShowErrorMsg($"记录测试数据失败：{ex.Message}");
+            }
+        }
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            // 停止定时器
+            _readTimer?.Stop();
+
+            // 停止ViewModel的定时器
+            if (DataContext is MainViewModel viewModel)
+            {
+                viewModel.StopTimer();
+            }
+
+            // 释放Modbus资源
+            ModbusResourceManager.Instance?.Dispose();
+
+            // 确保应用程序完全退出
+            Application.Current.Shutdown();
+        }
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            // 清理其他窗口实例
+            _mainWindow2?.Close();
+            _mainWindow3?.Close();
+            //_mainWindow4?.Close();
+            _mainWindow?.Close();
+            _reportWindow4?.Close();
+        }
+    }
+}
diff --git a/NotifyPropertyChangedBase.cs b/NotifyPropertyChangedBase.cs
new file mode 100644
index 0000000..fb55abe
--- /dev/null
+++ b/NotifyPropertyChangedBase.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace 自救器呼吸器综合检验仪
+{
+    public class NotifyPropertyChangedBase : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        protected bool SetField<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
+        {
+            if (EqualityComparer<T>.Default.Equals(field, value)) return false;
+            field = value;
+            OnPropertyChanged(propertyName);
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ParameterSettingsWindow.xaml b/ParameterSettingsWindow.xaml
new file mode 100644
index 0000000..08e80b4
--- /dev/null
+++ b/ParameterSettingsWindow.xaml
@@ -0,0 +1,310 @@
+<Window x:Class="自救器呼吸器综合检验仪.ParameterSettingsWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="参数设置" Height="768" Width="1024"
+        WindowStartupLocation="CenterScreen"
+        ResizeMode="NoResize" Loaded="Window_Loaded" Closed="Window_Closed" Closing="Window_Closing">
+
+    <Window.Resources>
+        <Style x:Key="GroupBoxStyle" TargetType="GroupBox">
+            <Setter Property="BorderBrush" Value="#2E75B6"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Foreground" Value="#2E75B6"/>
+            <Setter Property="FontWeight" Value="Bold"/>
+            <Setter Property="FontSize" Value="11"/>
+            <Setter Property="Margin" Value="3"/>
+            <Setter Property="Padding" Value="8,5"/>
+        </Style>
+
+        <Style x:Key="LabelStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="11"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="Margin" Value="3,2"/>
+        </Style>
+
+        <Style x:Key="TextBoxStyle" TargetType="TextBox">
+            <Setter Property="FontSize" Value="11"/>
+            <Setter Property="Height" Value="22"/>
+            <Setter Property="Width" Value="65"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="Margin" Value="3,2"/>
+            <Setter Property="BorderBrush" Value="#CCCCCC"/>
+            <Setter Property="BorderThickness" Value="1"/>
+        </Style>
+
+        <Style x:Key="ButtonStyle" TargetType="Button">
+            <Setter Property="FontSize" Value="11"/>
+            <Setter Property="Width" Value="60"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="Margin" Value="5,3"/>
+            <Setter Property="Background" Value="#2E75B6"/>
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="BorderThickness" Value="0"/>
+        </Style>
+
+        <Style x:Key="TimeLabelStyle" TargetType="TextBlock" BasedOn="{StaticResource LabelStyle}">
+            <Setter Property="Width" Value="18"/>
+            <Setter Property="TextAlignment" Value="Center"/>
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+        </Style>
+
+        <Style x:Key="TimeTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource TextBoxStyle}">
+            <Setter Property="Width" Value="35"/>
+        </Style>
+    </Window.Resources>
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- 标题 -->
+        <Border Grid.Row="0" Background="#2E75B6" Padding="8" Margin="0,0,0,8">
+            <TextBlock Text="参数设置" 
+                      FontSize="14" 
+                      FontWeight="Bold" 
+                      Foreground="White" 
+                      HorizontalAlignment="Center"/>
+        </Border>
+
+        <!-- 参数设置内容 - 使用Grid均匀分布 -->
+        <Grid Grid.Row="1" Margin="0,5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="135*"/>
+                <ColumnDefinition Width="13*"/>
+                <ColumnDefinition Width="354*"/>
+                <ColumnDefinition Width="502*"/>
+            </Grid.ColumnDefinitions>
+            <!--<TextBlock  Name="l1" Text="" Style="{StaticResource LabelStyle}" Margin="152,-14,0,0" Grid.Column="2" VerticalAlignment="Top"/>
+            <TextBlock  Name="l2" Text="" Style="{StaticResource LabelStyle}" Margin="100,-14,0,0" Grid.ColumnSpan="3" VerticalAlignment="Top"/>-->
+            <!-- 第一行：压差设置 -->
+            <GroupBox Grid.Row="0" Grid.ColumnSpan="4" Header="压差设置" Style="{StaticResource GroupBoxStyle}" Margin="3,3,3,3">
+                <Grid Margin="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBox Name="t0" Width="0" Height="0"></TextBox>
+                    <TextBlock Grid.Column="0" Text="压差系数：" Style="{StaticResource LabelStyle}"/>
+                    <TextBox Grid.Column="1" Margin="-30 0 0 0" x:Name="txtPressureDiffCoefficient" Text="0.00" Style="{StaticResource TextBoxStyle}"   GotFocus="txtPressureDiffCoefficient_GotFocus" TouchDown="txtPressureDiffCoefficient_TouchDown" />
+                    <Button Grid.Column="2" Content="校准" Style="{StaticResource ButtonStyle}" Margin="10,0,0,0" Click="Button_Click"/>
+
+                    <TextBlock Grid.Column="3" Text="压差保护上限：" Style="{StaticResource LabelStyle}" Margin="20,0,0,0"/>
+                    <TextBox Grid.Column="4" x:Name="txtUpperLimit" Text="0.0" Margin="-250,0,0,0" Style="{StaticResource TextBoxStyle}" GotFocus="txtUpperLimit_GotFocus"/>
+
+                    <TextBlock Grid.Column="5" Text="压差保护下限：" Style="{StaticResource LabelStyle}" Margin="-240,0,0,0"/>
+                    <TextBox Grid.Column="6" x:Name="txtLowerLimit" Text="0.0" Margin="-200,0,0,0" Style="{StaticResource TextBoxStyle}" GotFocus="txtLowerLimit_GotFocus"/>
+                    <!--<Button Grid.Column="6" Content="设置" Style="{StaticResource ButtonStyle}" Margin="10,0,0,0"/>-->
+                </Grid>
+            </GroupBox>
+
+
+            <!-- 第二行：流量保护设置 -->
+            <GroupBox Grid.Row="1" Grid.ColumnSpan="4" Header="流量保护设置" Style="{StaticResource GroupBoxStyle}" Margin="3,3,3,3">
+                <Grid Margin="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock Grid.Column="0" Text="大流量计保护：" Style="{StaticResource LabelStyle}"/>
+                    <TextBox Grid.Column="1" x:Name="txtLargeFlowCoefficient2" Margin="-105 0 0 0" Text="0.00" Style="{StaticResource TextBoxStyle}" GotFocus="txtLargeFlowCoefficient2_GotFocus"/>
+                    <TextBlock Grid.Column="1" Text="L/min" Style="{StaticResource LabelStyle}" Margin="185,0,0,0"/>
+                    <TextBlock Grid.Column="2" Text="小流量计保护：" Style="{StaticResource LabelStyle}" Margin="10,0,0,0"/>
+                    <TextBox Grid.Column="3" x:Name="txtSmallFlowCoefficient2" Text="0.00" Style="{StaticResource TextBoxStyle}" Margin="10,0,0,0" GotFocus="txtSmallFlowCoefficient2_GotFocus"/>
+                    <TextBlock Grid.Column="3" Text="L/min" Style="{StaticResource LabelStyle}" Margin="242,0,0,0"/>
+
+                </Grid>
+            </GroupBox>
+
+
+
+
+            <!-- 第二行：流量系数设置 -->
+            <GroupBox Grid.Row="2" Grid.ColumnSpan="4" Header="流量系数设置" Style="{StaticResource GroupBoxStyle}" Margin="3,3,3,3">
+                <Grid Margin="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock Grid.Column="0" Text="大流量系数：" Style="{StaticResource LabelStyle}"/>
+                    <TextBox Grid.Column="1" x:Name="txtLargeFlowCoefficient" Text="0.00" Style="{StaticResource TextBoxStyle}" Margin="-26 0 0 0" GotFocus="txtLargeFlowCoefficient_GotFocus"/>
+                    <TextBlock Grid.Column="2" Text="小流量系数：" Style="{StaticResource LabelStyle}" Margin="80,0,0,0"/>
+                    <TextBox Grid.Column="3" x:Name="txtSmallFlowCoefficient" Text="0.00" Style="{StaticResource TextBoxStyle}" Margin="90,0,0,0" GotFocus="txtSmallFlowCoefficient_GotFocus"/>
+                    <Button Grid.Column="4" Content="校准" Style="{StaticResource ButtonStyle}" Margin="10,0,0,0" Click="Button_Click_1"/>
+                </Grid>
+            </GroupBox>
+
+            <!-- 第三行：时间设置 -->
+            <!--
+            <GroupBox Grid.Row="3" Grid.ColumnSpan="4" Header="时间设置" Style="{StaticResource GroupBoxStyle}" Margin="3,3,3,3">
+                <StackPanel Orientation="Horizontal" Margin="2" HorizontalAlignment="Center">
+                    <TextBox x:Name="txtYear" Text="0" Style="{StaticResource TimeTextBoxStyle}"/>
+                    <TextBlock Text="年" Style="{StaticResource TimeLabelStyle}"/>
+                    <TextBox x:Name="txtMonth" Text="0" Style="{StaticResource TimeTextBoxStyle}"/>
+                    <TextBlock Text="月" Style="{StaticResource TimeLabelStyle}"/>
+                    <TextBox x:Name="txtDay" Text="0" Style="{StaticResource TimeTextBoxStyle}"/>
+                    <TextBlock Text="日" Style="{StaticResource TimeLabelStyle}"/>
+                    <TextBox x:Name="txtHour" Text="0" Style="{StaticResource TimeTextBoxStyle}"/>
+                    <TextBlock Text="时" Style="{StaticResource TimeLabelStyle}"/>
+                    <TextBox x:Name="txtMinute" Text="0" Style="{StaticResource TimeTextBoxStyle}"/>
+                    <TextBlock Text="分" Style="{StaticResource TimeLabelStyle}"/>
+                    <TextBox x:Name="txtSecond" Text="0" Style="{StaticResource TimeTextBoxStyle}"/>
+                    <TextBlock Text="秒" Style="{StaticResource TimeLabelStyle}"/>
+                </StackPanel>
+            </GroupBox>-->
+
+            <!-- 第四行：左侧 - 质量判定，右侧 - 误差设置 -->
+            <GroupBox Grid.Row="4" Grid.Column="0" Header="质量判定" Style="{StaticResource GroupBoxStyle}" Grid.ColumnSpan="3" Margin="3,3,3,3">
+                <StackPanel Margin="2">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="正负压大于50帕不合格：" Style="{StaticResource LabelStyle}"/>
+                        <TextBox x:Name="txtQualityThreshold" Text="0.00" Style="{StaticResource TextBoxStyle}" GotFocus="txtQualityThreshold_GotFocus"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" Margin="0,3,0,0">
+                        <TextBlock Text="排气判定时间：" Style="{StaticResource LabelStyle}"/>
+                        <TextBox x:Name="txtExhaustTime" Margin="49,0,0,0" Text="0" Style="{StaticResource TextBoxStyle}" GotFocus="txtExhaustTime_GotFocus"/>
+                        <TextBlock Text="ms" Style="{StaticResource LabelStyle}"/>
+                    </StackPanel>
+                </StackPanel>
+            </GroupBox>
+
+            <GroupBox Grid.Row="4" Grid.Column="3" Header="误差设置" Style="{StaticResource GroupBoxStyle}" Margin="3,3,3,3">
+                <StackPanel Margin="2">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="正压自身误差：" Style="{StaticResource LabelStyle}"/>
+                        <TextBox x:Name="txtPositiveError" Text="0" Style="{StaticResource TextBoxStyle}" GotFocus="txtPositiveError_GotFocus"/>
+                        <TextBlock Text="pa" Style="{StaticResource LabelStyle}"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" Margin="0,3,0,0">
+                        <TextBlock Text="负压自身误差：" Style="{StaticResource LabelStyle}"/>
+                        <TextBox x:Name="txtNegativeError" Text="0" Style="{StaticResource TextBoxStyle}" GotFocus="txtNegativeError_GotFocus"/>
+                        <TextBlock Text="pa" Style="{StaticResource LabelStyle}"/>
+                    </StackPanel>
+                </StackPanel>
+            </GroupBox>
+
+            <!-- 第五行：左侧 - PID稳定时间，右侧 - 延迟记录 -->
+            <GroupBox Grid.Row="5" Grid.Column="0" Header="PID稳定时间" Style="{StaticResource GroupBoxStyle}" Grid.ColumnSpan="3" Margin="3,3,3,3">
+                <StackPanel Margin="2">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="正压PID稳定时间：" Style="{StaticResource LabelStyle}"/>
+                        <TextBox x:Name="txtPositivePIDTime" Text="0" Style="{StaticResource TextBoxStyle}" GotFocus="txtPositivePIDTime_GotFocus"/>
+                        <TextBlock Text="ms" Style="{StaticResource LabelStyle}"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" Margin="0,3,0,0">
+                        <TextBlock Text="负压PID稳定时间：" Style="{StaticResource LabelStyle}"/>
+                        <TextBox x:Name="txtNegativePIDTime" Text="0" Style="{StaticResource TextBoxStyle}" GotFocus="txtNegativePIDTime_GotFocus"/>
+                        <TextBlock Text="ms" Style="{StaticResource LabelStyle}"/>
+                    </StackPanel>
+                </StackPanel>
+            </GroupBox>
+
+            <GroupBox Grid.Row="5" Grid.Column="3" Header="延迟记录" Style="{StaticResource GroupBoxStyle}" Margin="3,3,3,3">
+                <StackPanel Margin="2">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="正压延迟记录初始值：" Style="{StaticResource LabelStyle}"/>
+                        <TextBox x:Name="txtPositiveDelay" Text="0" Style="{StaticResource TextBoxStyle}" GotFocus="txtPositiveDelay_GotFocus"/>
+                        <TextBlock Text="ms" Style="{StaticResource LabelStyle}"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" Margin="0,3,0,0">
+                        <TextBlock Text="负压延迟记录初始值：" Style="{StaticResource LabelStyle}"/>
+                        <TextBox x:Name="txtNegativeDelay" Text="0" Style="{StaticResource TextBoxStyle}" GotFocus="txtNegativeDelay_GotFocus"/>
+                        <TextBlock Text="ms" Style="{StaticResource LabelStyle}"/>
+                    </StackPanel>
+                </StackPanel>
+            </GroupBox>
+
+            <!-- 第六行：PID稳定压力 -->
+            <GroupBox Grid.Row="6" Grid.ColumnSpan="4" Header="PID稳定压力" Style="{StaticResource GroupBoxStyle}" Margin="3,3,3,3">
+                <StackPanel Orientation="Horizontal" Margin="2" HorizontalAlignment="Center">
+                    <TextBlock Text="正压增加PID稳定压力：" Style="{StaticResource LabelStyle}"/>
+                    <TextBox x:Name="txtPositivePIDPressure" Text="0.00" Style="{StaticResource TextBoxStyle}" GotFocus="txtPositivePIDPressure_GotFocus"/>
+                    <TextBlock Text="pa" Style="{StaticResource LabelStyle}"/>
+                    <TextBlock Text="负压增加PID稳定压力：" Style="{StaticResource LabelStyle}" Margin="15,0,0,0"/>
+                    <TextBox x:Name="txtNegativePIDPressure" Text="0.00" Style="{StaticResource TextBoxStyle}" GotFocus="txtNegativePIDPressure_GotFocus"/>
+                    <TextBlock Text="pa" Style="{StaticResource LabelStyle}"/>
+                </StackPanel>
+            </GroupBox>
+
+            <!--//第七行：压差流量显示-->
+            <GroupBox Grid.Row="7" Grid.ColumnSpan="4" Header="压差/流量显示" Style="{StaticResource GroupBoxStyle}" Margin="3,3,3,3">
+                <StackPanel Orientation="Horizontal" Margin="2" HorizontalAlignment="Center">
+                    <TextBlock Text="压差显示：" Style="{StaticResource LabelStyle}"/>
+                    <TextBox x:Name="pressureDiff" Text="0.00" Style="{StaticResource TextBoxStyle}" GotFocus="txtPositivePIDPressure_GotFocus"/>
+                    <!--<TextBlock Text="pa" Style="{StaticResource LabelStyle}"/>-->
+                    <TextBlock Text="流量显示：" Style="{StaticResource LabelStyle}" Margin="200,0,0,0"/>
+                    <TextBox x:Name="flow" Text="0.00" Style="{StaticResource TextBoxStyle}" GotFocus="txtNegativePIDPressure_GotFocus"/>
+                    <!--<TextBlock Text="pa" Style="{StaticResource LabelStyle}"/>-->
+                </StackPanel>
+            </GroupBox>
+
+            <!--<GroupBox Grid.Row="8" Grid.ColumnSpan="4" Header="试样编号" Style="{StaticResource GroupBoxStyle}" Margin="3,3,3,3">
+                <StackPanel Orientation="Horizontal" Margin="2" HorizontalAlignment="Center">
+                    <TextBlock Text="编号：" Style="{StaticResource LabelStyle}"/>
+                    <TextBox x:Name="pressureDiff2" Text="" Width="180" Style="{StaticResource TextBoxStyle}" LostFocus="pressureDiff2_GotFocus"/>
+
+                </StackPanel>
+            </GroupBox>-->
+            <!-- 第八行：语音设置 --><!--
+            <GroupBox Grid.Row="8" Grid.ColumnSpan="4" Header="语音设置" Style="{StaticResource GroupBoxStyle}" Margin="3,3,3,3">
+                <Grid Margin="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    --><!--<TextBlock Grid.Column="0" Text="大流量系数：" Style="{StaticResource LabelStyle}"/>
+        <TextBox Grid.Column="1" x:Name="sound" Text="0.00" Style="{StaticResource TextBoxStyle}" Margin="-26 0 0 0" GotFocus="txtLargeFlowCoefficient_GotFocus"/>--><!--
+                    <Button Grid.Column="1" Content="关闭音量" Name="closesound"  Style="{StaticResource ButtonStyle}" Margin="-400,0,0,0" Click="Button_Click_2"/>
+
+                    <TextBlock Grid.Column="2" Text="设置音量：" Style="{StaticResource LabelStyle}" Margin="-100,0,90,0"/>
+                    <TextBox Grid.Column="3" x:Name="setsound" Text="0" Style="{StaticResource TextBoxStyle}" Margin="-60,0,160,0" GotFocus="setsound_GotFocus"/>
+                    <Button Grid.Column="4" Content="确认音量" Name="soundsure"  Style="{StaticResource ButtonStyle}" Margin="-250,0,0,0" Click="Button_Click_3"/>
+
+
+                </Grid>
+            </GroupBox>-->
+        </Grid>
+        
+
+        <!-- 底部按钮 -->
+        <Border Grid.Row="2" Background="#F5F5F5" Padding="8" Margin="0,8,0,0">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <!--<Button Content="保存" Style="{StaticResource ButtonStyle}" Click="SaveButton_Click"/>-->
+                <!--<Button Content="重置" Style="{StaticResource ButtonStyle}" Click="ResetButton_Click" Background="#6C757D" Margin="15,0,0,0"/>-->
+                <Button Content="返回" Style="{StaticResource ButtonStyle}" Click="ReturnButton_Click" Background="#DC3545" Margin="15,0,0,0"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/ParameterSettingsWindow.xaml.cs b/ParameterSettingsWindow.xaml.cs
new file mode 100644
index 0000000..14a5313
--- /dev/null
+++ b/ParameterSettingsWindow.xaml.cs
@@ -0,0 +1,792 @@
+using Modbus.Device;
+using System;
+using System.Configuration;
+using System.Net.Sockets;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Threading;
+using 自救器呼吸器综合检验仪.Data;
+
+namespace 自救器呼吸器综合检验仪
+{
+    public partial class ParameterSettingsWindow : Window
+    {
+        private MainWindow _mainWindow;
+        private MainWindow2 _mainWindow2;
+        private MainWindow3 _mainWindow3;
+        private MainWindow4 _mainWindow4;
+        private readonly DispatcherTimer _readTimer;
+        private bool _isManualInput = false; // 手动输入标记：true=输入中（暂停读取），false=正常读取
+        private TcpClient _tcpClient => ModbusResourceManager.Instance.TcpClient;
+        private IModbusMaster _modbusMaster => ModbusResourceManager.Instance.ModbusMaster;
+        Function ma;
+        DataChange c = new DataChange();
+        public ParameterSettingsWindow()
+        {
+            InitializeComponent();
+            LoadCurrentSettings();
+            _readTimer = InitDispatcherTimer();
+        }
+
+        private DispatcherTimer InitDispatcherTimer()
+        {
+            var timer = new DispatcherTimer
+            {
+                Interval = TimeSpan.FromMilliseconds(500)
+            };
+            timer.Tick += async (s, e) =>
+            {
+                if (!_isManualInput && _modbusMaster != null)
+                {
+
+                    try
+                    {
+                        await ReadAllPlcDataAsync();
+                    }
+                    catch { }
+                }
+            };
+            return timer;
+        }
+
+        private async System.Threading.Tasks.Task ReadAllPlcDataAsync()
+        {
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                return;
+            }
+
+            // 仅在非手动输入时读取设置地址（避免覆盖输入）
+            if (!_isManualInput)
+            {
+                await ReadAddr262DataAsync();
+                //await System.Threading.Tasks.Task.Delay(50);
+
+                //await ReadAddr404DataAsync();
+                //await System.Threading.Tasks.Task.Delay(50);
+
+                //await ReadAddr406DataAsync();
+                //await System.Threading.Tasks.Task.Delay(50);
+                //await ReadAddr130DataAsync();
+            }
+        }
+
+        // 加载当前设置
+        private void LoadCurrentSettings()
+        {
+            // 这里可以连接实际的数据源来加载当前设置
+            // 目前使用默认值
+        }
+
+        // 保存按钮点击事件
+        //private void SaveButton_Click(object sender, RoutedEventArgs e)
+        //{
+        //    try
+        //    {
+        //        // 验证并保存所有参数
+        //        if (ValidateParameters())
+        //        {
+        //            SaveParameters();
+        //            MessageBox.Show("参数保存成功！", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        MessageBox.Show($"保存参数时出错：{ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+        //    }
+        //}
+
+        // 重置按钮点击事件
+        private void ResetButton_Click(object sender, RoutedEventArgs e)
+        {
+            var result = MessageBox.Show("确定要重置所有参数吗？", "确认重置",
+                MessageBoxButton.YesNo, MessageBoxImage.Question);
+
+            if (result == MessageBoxResult.Yes)
+            {
+                ResetToDefaults();
+            }
+        }
+
+        // 返回按钮点击事件
+        private void ReturnButton_Click(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow, () => new MainWindow());
+        }
+
+
+        private void SwitchWindow<T>(ref T windowInstance, Func<T> createFunc) where T : Window, new()
+        {
+            // 1. 停止当前窗口的定时器（不释放资源）
+            _readTimer?.Stop();
+
+            // 2. 检查资源是否可用（添加重连机制）
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                // 尝试重新连接
+                bool reconnectSuccess = TryReconnect();
+                if (!reconnectSuccess)
+                {
+                    MessageBox.Show("TCP连接已断开，请重新连接！", "提示");
+                    return;
+                }
+            }
+
+            // 3. 复用窗口实例：不存在则创建，存在则激活
+            if (windowInstance == null)
+            {
+                windowInstance = createFunc();
+                // 添加窗口关闭事件处理
+                windowInstance.Closed += (s, args) =>
+                {
+                    // 窗口关闭时重新启动定时器并显示当前窗口
+                    _readTimer?.Start();
+                    this.Show();
+                    this.Activate();
+                };
+            }
+            else
+            {
+                // 激活已存在的窗口（前置显示）
+                windowInstance.Activate();
+                return;
+            }
+
+            // 4. 切换窗口：隐藏当前窗口，显示目标窗口（非模态）
+            this.Hide();
+            windowInstance.Show(); // 使用 Show() 而不是 ShowDialog()
+        }
+
+
+        // 添加重连方法
+        private bool TryReconnect()
+        {
+            try
+            {
+                string plcIp = "192.168.1.10";
+                bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+                if (initSuccess)
+                {
+                    ma = new Function(_modbusMaster);
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                ShowErrorMsg($"重新连接失败：{ex.Message}");
+            }
+            return false;
+        }
+
+        private async System.Threading.Tasks.Task ReadAddr262DataAsync()
+        {
+            try
+            {
+                ushort[] registers3 = await System.Threading.Tasks.Task.Run(() =>
+    _modbusMaster?.ReadHoldingRegisters(1, 1428, 2)
+);
+
+                if (registers3 != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers3[1], registers3[0]);
+                    Dispatcher.Invoke(() => txtPressureDiffCoefficient.Text = addr406Value.ToString("F2"));
+                }
+
+
+
+                ushort[] registers4 = await System.Threading.Tasks.Task.Run(() =>
+   _modbusMaster?.ReadHoldingRegisters(1, 484, 2)
+);
+
+                if (registers4 != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers4[1], registers4[0]);
+                    Dispatcher.Invoke(() => txtUpperLimit.Text = addr406Value.ToString("F2"));
+                }
+
+
+                ushort[] registers5 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 482, 2)
+);
+
+                if (registers5 != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers5[1], registers5[0]);
+                    Dispatcher.Invoke(() => txtLowerLimit.Text = addr406Value.ToString("F2"));
+                }
+
+
+
+
+
+
+                ushort[] registers6 = await System.Threading.Tasks.Task.Run(() =>
+   _modbusMaster?.ReadHoldingRegisters(1, 490, 2)
+);
+
+                if (registers6 != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers6[1], registers6[0]);
+                    Dispatcher.Invoke(() => txtLargeFlowCoefficient2.Text = addr406Value.ToString("F2"));
+                }
+
+
+                ushort[] registers7 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 492, 2)
+);
+
+                if (registers7 != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers7[1], registers7[0]);
+                    Dispatcher.Invoke(() => txtSmallFlowCoefficient2.Text = addr406Value.ToString("F2"));
+                }
+
+
+
+
+                ushort[] registers8 = await System.Threading.Tasks.Task.Run(() =>
+  _modbusMaster?.ReadHoldingRegisters(1, 1328, 2)
+);
+
+                if (registers8 != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers8[1], registers8[0]);
+                    Dispatcher.Invoke(() => txtLargeFlowCoefficient.Text = addr406Value.ToString("F2"));
+                }
+
+
+                ushort[] registers9 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 1378, 2)
+);
+
+                if (registers9 != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers9[1], registers9[0]);
+                    Dispatcher.Invoke(() => txtSmallFlowCoefficient.Text = addr406Value.ToString("F2"));
+                }
+
+
+                ushort[] registers10 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 308, 2)
+);
+
+                if (registers10 != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers10[1], registers10[0]);
+                    Dispatcher.Invoke(() => txtQualityThreshold.Text = addr406Value.ToString("F2"));
+                }
+
+
+
+                ushort[] registers11 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 330, 2)
+);
+
+                if (registers11 != null)
+                {
+                    int addr406Value = registers11[0];
+                    Dispatcher.Invoke(() => txtExhaustTime.Text = addr406Value.ToString("F0"));
+                }
+
+
+
+
+
+
+
+
+                ushort[] registers12 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 326, 1)
+);
+
+                if (registers12 != null)
+                {
+                    //float addr406Value = c.UshortToFloat(registers12[1], registers12[0]);
+                    int addr406Value = registers12[0];
+                    Dispatcher.Invoke(() => txtPositiveError.Text = addr406Value.ToString("F0"));
+                }
+
+
+
+                ushort[] registers13 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 316, 1)
+);
+
+                if (registers13 != null)
+                {
+                    //float addr406Value = c.UshortToFloat(registers13[1], registers13[0]);
+                    float addr406Value = registers13[0];
+                    Dispatcher.Invoke(() => txtNegativeError.Text = addr406Value.ToString("F0"));
+                }
+
+
+
+
+
+                ushort[] registers14 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 324, 1)
+);
+
+                if (registers14 != null)
+                {
+                    int addr406Value = registers14[0];
+                    Dispatcher.Invoke(() => txtPositivePIDTime.Text = addr406Value.ToString("F0"));
+                }
+
+
+                ushort[] registers15 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 314, 1)
+);
+
+                if (registers15 != null)
+                {
+                    int addr406Value = registers15[0];
+                    Dispatcher.Invoke(() => txtNegativePIDTime.Text = addr406Value.ToString("F0"));
+                }
+
+
+
+
+
+
+                ushort[] registers16 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 328, 1)
+);
+
+                if (registers16 != null)
+                {
+                    int addr406Value = registers16[0];
+                    Dispatcher.Invoke(() => txtPositiveDelay.Text = addr406Value.ToString("F0"));
+                }
+
+
+                ushort[] registers17 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 318, 1)
+);
+
+                if (registers17 != null)
+                {
+                    int addr406Value = registers17[0];
+                    Dispatcher.Invoke(() => txtNegativeDelay.Text = addr406Value.ToString("F0"));
+                }
+
+
+
+
+                ushort[] registers18 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 292, 2)
+);
+
+                if (registers18 != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers18[1], registers18[0]);
+                    Dispatcher.Invoke(() => txtPositivePIDPressure.Text = addr406Value.ToString("F2"));
+                }
+
+
+                ushort[] registers19 = await System.Threading.Tasks.Task.Run(() =>
+_modbusMaster?.ReadHoldingRegisters(1, 290, 2)
+);
+
+                if (registers19 != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers19[1], registers19[0]);
+                    Dispatcher.Invoke(() => txtNegativePIDPressure.Text = addr406Value.ToString("F2"));
+                }
+
+
+
+
+
+
+
+                ushort[] registers20 = await System.Threading.Tasks.Task.Run(() =>
+    _modbusMaster?.ReadHoldingRegisters(1, 1430, 2)
+    );
+
+                if (registers20 != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers20[1], registers20[0]);
+                    Dispatcher.Invoke(() => pressureDiff.Text = addr406Value.ToString("F2"));
+                }
+
+
+                ushort[] registers21 = await System.Threading.Tasks.Task.Run(() =>
+    _modbusMaster?.ReadHoldingRegisters(1, 1330, 2)
+    );
+
+                if (registers21 != null)
+                {
+                    float addr406Value = c.UshortToFloat(registers21[1], registers21[0]);
+                    Dispatcher.Invoke(() => flow.Text = addr406Value.ToString("F2"));
+                }
+
+
+                //                ushort[] registers22 = await System.Threading.Tasks.Task.Run(() =>
+                //_modbusMaster?.ReadHoldingRegisters(1, 390, 2)
+                //);
+
+                //                if (registers22 != null)
+                //                {
+                //                    int addr406Value = registers22[0];
+                //                    Dispatcher.Invoke(() => setsound.Text = addr406Value.ToString("F0"));
+                //                }
+
+
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"读取地址406失败：{ex.Message}");
+            }
+        }
+
+        private void ShowErrorMsg(string msg)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                MessageBox.Show(msg, "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+            });
+        }
+
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            string plcIp = "192.168.1.10";
+            bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+            if (!initSuccess)
+            {
+                MessageBox.Show("连接Modbus服务器失败！", "错误");
+                this.Close();
+                return;
+            }
+
+            // 检查连接状态
+            if (_tcpClient == null || !_tcpClient.Connected)
+            {
+                MessageBox.Show("Modbus连接异常！", "错误");
+                this.Close();
+                return;
+            }
+
+            ma = new Function(_modbusMaster);
+            //ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 64);
+            System.Threading.Tasks.Task.Delay(50);
+            _readTimer.Start();
+        }
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            // 停止定时器
+            _readTimer?.Stop();
+
+            // 停止ViewModel的定时器
+            if (DataContext is MainViewModel viewModel)
+            {
+                viewModel.StopTimer();
+            }
+
+            // 释放Modbus资源
+            ModbusResourceManager.Instance?.Dispose();
+
+            // 确保应用程序完全退出
+            Application.Current.Shutdown();
+        }
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            // 清理其他窗口实例
+            _mainWindow?.Close();
+            _mainWindow2?.Close();
+            _mainWindow3?.Close();
+            //_mainWindow4?.Close();
+
+            _mainWindow4?.Close();
+        }
+        // 重置为默认值
+        private void ResetToDefaults()
+        {
+            txtPressureDiffCoefficient.Text = "0.00";
+            txtUpperLimit.Text = "0.0";
+            txtLowerLimit.Text = "0.0";
+            txtLargeFlowCoefficient.Text = "0.00";
+            txtSmallFlowCoefficient.Text = "0.00";
+            //txtYear.Text = "0";
+            //txtMonth.Text = "0";
+            //txtDay.Text = "0";
+            //txtHour.Text = "0";
+            //txtMinute.Text = "0";
+            //txtSecond.Text = "0";
+            txtQualityThreshold.Text = "0.00";
+            txtExhaustTime.Text = "0";
+            txtPositiveError.Text = "0";
+            txtNegativeError.Text = "0";
+            txtPositivePIDTime.Text = "0";
+            txtNegativePIDTime.Text = "0";
+            txtPositiveDelay.Text = "0";
+            txtNegativeDelay.Text = "0";
+            txtPositivePIDPressure.Text = "0.00";
+            txtNegativePIDPressure.Text = "0.00";
+        }
+
+        private void txtPressureDiffCoefficient_TouchDown(object sender, System.Windows.Input.TouchEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtPressureDiffCoefficient.Text.Trim(), 1428, Function.DataType.浮点型);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+
+            t0.Focus();
+        }
+
+
+
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.复归型, 1301);
+        }
+
+        private void txtLargeFlowCoefficient2_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtLargeFlowCoefficient2.Text.Trim(), 490, Function.DataType.浮点型);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+
+        }
+
+        private void txtSmallFlowCoefficient2_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtSmallFlowCoefficient2.Text.Trim(), 492, Function.DataType.浮点型);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+
+            t0.Focus();
+        }
+
+        private void txtPressureDiffCoefficient_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtPressureDiffCoefficient.Text.Trim(), 1428, Function.DataType.浮点型);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void txtUpperLimit_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtUpperLimit.Text.Trim(), 484, Function.DataType.浮点型);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void txtLowerLimit_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtLowerLimit.Text.Trim(), 482, Function.DataType.浮点型);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void txtLargeFlowCoefficient_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtLargeFlowCoefficient.Text.Trim(), 1328, Function.DataType.浮点型);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void txtSmallFlowCoefficient_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtSmallFlowCoefficient.Text.Trim(), 1378, Function.DataType.浮点型);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.复归型, 1300);
+        }
+
+        private void txtQualityThreshold_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtQualityThreshold.Text.Trim(), 308, Function.DataType.浮点型);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void txtExhaustTime_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtExhaustTime.Text.Trim(), 330, Function.DataType.整形);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void txtPositiveError_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtPositiveError.Text.Trim(), 326, Function.DataType.整形);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        //private async void Button_Click_2(object sender, RoutedEventArgs e)
+        //{
+        //    ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 24);
+        //    bool[] b = await _modbusMaster.ReadCoilsAsync(1, 24, 1);
+        //    if (b != null && b.Length > 0)
+        //    {
+        //        if (!b[0])
+        //        {
+        //            closesound.Content = "关闭语音";
+        //        }
+        //        else
+        //        {
+        //            closesound.Content = "开启语音";
+        //        }
+        //    }
+        //}
+
+        private void Button_Click_3(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 25);
+        }
+
+
+        //private void setsound_GotFocus(object sender, RoutedEventArgs e)
+        //{
+        //    ma.WriteToPLCForNew(setsound.Text.Trim(), 390, Function.DataType.整形);
+
+        //    System.Threading.Tasks.Task.Delay(50);
+        //    _isManualInput = false; // 写入后恢复读取
+        //    t0.Focus();
+        //}
+
+
+
+        private void txtNegativeError_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtNegativeError.Text.Trim(), 316, Function.DataType.整形);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void txtPositivePIDTime_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtPositivePIDTime.Text.Trim(), 324, Function.DataType.整形);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void txtNegativePIDTime_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtNegativePIDTime.Text.Trim(), 314, Function.DataType.整形);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void txtPositiveDelay_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtPositiveDelay.Text.Trim(), 328, Function.DataType.整形);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void txtNegativeDelay_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtNegativeDelay.Text.Trim(), 318, Function.DataType.整形);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void txtPositivePIDPressure_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtPositivePIDPressure.Text.Trim(), 292, Function.DataType.浮点型);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        private void txtNegativePIDPressure_GotFocus(object sender, RoutedEventArgs e)
+        {
+            ma.WriteToPLCForNew(txtNegativePIDPressure.Text.Trim(), 290, Function.DataType.浮点型);
+
+            System.Threading.Tasks.Task.Delay(50);
+            _isManualInput = false; // 写入后恢复读取
+            t0.Focus();
+        }
+
+        //private void pressureDiff2_GotFocus(object sender, RoutedEventArgs e)
+        //{
+        //}
+
+
+        /// <summary>
+        /// 保存 AppSettings 配置到配置文件
+        /// </summary>
+        /// <param name="key">配置键名</param>
+        /// <param name="value">配置值</param>
+        /// <returns>是否保存成功</returns>
+        public bool SaveAppSetting(string key, string value)
+        {
+            try
+            {
+                // 1. 获取当前程序的配置文件路径（编译后的 exe.config）
+                string configPath = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
+
+                // 2. 加载配置文件（ExeConfigurationFileMap 指定配置路径）
+                ExeConfigurationFileMap configFileMap = new ExeConfigurationFileMap { ExeConfigFilename = configPath };
+                Configuration config = ConfigurationManager.OpenMappedExeConfiguration(configFileMap, ConfigurationUserLevel.None);
+
+                // 3. 处理 appSettings 节点
+                if (config.AppSettings.Settings[key] == null)
+                {
+                    // 键不存在 → 新增配置
+                    config.AppSettings.Settings.Add(key, value);
+                }
+                else
+                {
+                    // 键已存在 → 更新配置
+                    config.AppSettings.Settings[key].Value = value;
+                }
+
+                // 4. 保存配置（重要！否则修改不生效）
+                config.Save(ConfigurationSaveMode.Modified);
+
+                // 5. 刷新 ConfigurationManager 缓存（可选，让后续读取能立即获取新值）
+                ConfigurationManager.RefreshSection("appSettings");
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                // 捕获异常（如权限不足、文件被占用等）
+                MessageBox.Show($"保存配置失败：{ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+                return false;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..28182ca
--- /dev/null
+++ b/Properties/AssemblyInfo.cs
@@ -0,0 +1,52 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("自救器呼吸器综合检验仪")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("自救器呼吸器综合检验仪")]
+[assembly: AssemblyCopyright("Copyright ©  2025")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+//若要开始生成可本地化的应用程序，请设置
+//.csproj 文件中的 <UICulture>CultureYouAreCodingWith</UICulture>
+//在 <PropertyGroup> 中。例如，如果你使用的是美国英语。
+//使用的是美国英语，请将 <UICulture> 设置为 en-US。  然后取消
+//对以下 NeutralResourceLanguage 特性的注释。  更新
+//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //主题特定资源词典所处位置
+                                     //(未在页面中找到资源时使用，
+                                     //或应用程序资源字典中找到时使用)
+    ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
+                                              //(未在页面中找到资源时使用，
+                                              //、应用程序或任何主题专用资源字典中找到时使用)
+)]
+
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..e4f7c11
--- /dev/null
+++ b/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace 自救器呼吸器综合检验仪.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
+    /// </summary>
+    // 此类是由 StronglyTypedResourceBuilder
+    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   返回此类使用的缓存的 ResourceManager 实例。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("自救器呼吸器综合检验仪.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   重写当前线程的 CurrentUICulture 属性，对
+        ///   使用此强类型资源类的所有资源查找执行重写。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
new file mode 100644
index 0000000..af7dbeb
--- /dev/null
+++ b/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..74e484f
--- /dev/null
+++ b/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace 自救器呼吸器综合检验仪.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
new file mode 100644
index 0000000..033d7a5
--- /dev/null
+++ b/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/ReportWindow.xaml b/ReportWindow.xaml
new file mode 100644
index 0000000..e6b60b6
--- /dev/null
+++ b/ReportWindow.xaml
@@ -0,0 +1,45 @@
+<Window x:Class="自救器呼吸器综合检验仪.ReportWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="定量供氧检验报表" Height="900" Width="1280"
+        WindowStartupLocation="CenterScreen" Loaded="Window_Loaded" Closed="Window_Closed" Closing="Window_Closing" >
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- 标题 -->
+        <TextBlock Grid.Row="0" Text="定量供氧检验报表" FontSize="20" FontWeight="Bold" 
+                   HorizontalAlignment="Center" Margin="10" Foreground="#FF1976D2"/>
+
+        <!-- 数据表格 -->
+        <DataGrid Grid.Row="1" x:Name="dataGrid" AutoGenerateColumns="False" 
+                  IsReadOnly="True" Margin="10" FontSize="14">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="编号" Binding="{Binding Id}" Width="60"/>
+                <DataGridTextColumn Header="时间" Binding="{Binding Time}" Width="80"/>
+                <DataGridTextColumn Header="日期" Binding="{Binding Date}" Width="100"/>
+                <DataGridTextColumn Header="定量供氧流量(L/min)" Binding="{Binding FlowRate, StringFormat=F2}" Width="170"/>
+                <DataGridTextColumn Header="自动/手动补给供氧量(L/min)" Binding="{Binding FlowRate2, StringFormat=F2}" Width="200"/>
+                <DataGridTextColumn Header="样品编号" Binding="{Binding No, StringFormat=F2}" Width="200"/>
+
+                <DataGridTextColumn Header="测试时长" Binding="{Binding Duration}" Width="100"/>
+                <DataGridTextColumn Header="记录时间" Binding="{Binding CreateTime, StringFormat=yyyy/MM/dd HH:mm}" Width="150"/>
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <!-- 底部按钮 -->
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="10">
+            <Button Content="导出报表" x:Name="btnExport" Click="BtnExport_Click" 
+                    Width="100" Height="30" Margin="5" Background="#FF4CAF50" Foreground="White"/>
+            <Button Content="清空记录" x:Name="btnClear" Click="BtnClear_Click" 
+                    Width="100" Height="30" Margin="5" Background="#FFf44336" Foreground="White"/>
+            <Button Content="关闭" x:Name="btnClose" Click="BtnClose_Click" 
+                    Width="100" Height="30" Margin="5" Background="#FF607D8B" Foreground="White"/>
+            <Button Content="打印" x:Name="btnprint" Click="BtnPrint_Click"
+        Width="100" Height="30" Margin="5" Background="#FF4CAF50" Foreground="White"/>
+        </StackPanel>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/ReportWindow.xaml.cs b/ReportWindow.xaml.cs
new file mode 100644
index 0000000..03494b6
--- /dev/null
+++ b/ReportWindow.xaml.cs
@@ -0,0 +1,300 @@
+using Dapper;
+using Modbus.Device;
+using MySql.Data.MySqlClient;
+using System;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.IO;
+using System.Net.Sockets;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using 自救器呼吸器综合检验仪.Data;
+
+namespace 自救器呼吸器综合检验仪
+{
+
+    public partial class ReportWindow : Window
+    {
+        private MainWindow _mainWindow;
+        private ReportWindow _reportWindow;
+
+        public ObservableCollection<TestRecord> _records;
+        // 添加静态集合来保持数据
+        private static ObservableCollection<TestRecord> _staticRecords = new ObservableCollection<TestRecord>();
+
+        private static readonly string ReportFilePath = System.IO.Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+            "氧气自救器检验报表.csv");
+        Function ma;
+        private TcpClient _tcpClient => ModbusResourceManager.Instance.TcpClient;
+        private IModbusMaster _modbusMaster => ModbusResourceManager.Instance.ModbusMaster;
+        public ReportWindow()
+        {
+            InitializeComponent();
+            _records = new ObservableCollection<TestRecord>();
+            _records = _staticRecords;
+            dataGrid.ItemsSource = _records;
+        }
+
+        // 添加新记录
+        public void AddRecord(string time, string date, double flowRate, string duration, double flowRate2, string no)
+        {
+            var record = new TestRecord
+            {
+                Id = _records.Count + 1,
+                Time = time,
+                Date = date,
+                FlowRate = flowRate,
+                Duration = duration,
+                CreateTime = DateTime.Now,
+                FlowRate2 = flowRate2,
+                No = no
+
+            };
+
+            _records.Insert(0, record); // 新记录插入到最前面
+            SaveRecords(time, date, flowRate, duration, flowRate2, no);
+        }
+
+
+        // 保存记录到文件
+        private void SaveRecords(string time, string date, double flowRate, string duration, double flowRate2, string No)
+        {
+            try
+            {
+                using (var connection = new MySqlConnection(DatabaseConfig.ConnectionString))
+                {
+                    connection.Open();
+
+                    var sql = @"INSERT INTO test_records (Time, Date, FlowRate, Duration, CreateTime,FlowRate2,No,Type)
+                               VALUES (@Time, @Date, @FlowRate, @Duration, @CreateTime,@FlowRate2,@No,0)";
+
+                    var record = new TestRecord
+                    {
+                        Time = time,
+                        Date = date,
+                        FlowRate = flowRate,
+                        Duration = duration,
+                        CreateTime = DateTime.Now,
+                        FlowRate2 = flowRate2,
+                        No = No
+                    };
+
+                    connection.Execute(sql, record);
+
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"保存记录失败：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+        }
+
+        private void BtnExport_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                // 数据校验：无数据时给出友好提示
+                if (_records == null || _records.Count == 0)
+                {
+                    MessageBox.Show("没有数据可导出", "提示",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                    return;
+                }
+
+                // 保存文件对话框：后缀改为.xls，支持Excel直接打开
+                var saveDialog = new Microsoft.Win32.SaveFileDialog
+                {
+                    FileName = $"氧气自救器_供养量检验报表_{DateTime.Now:yyyyMMdd_HHmmss}.xls",
+                    Filter = "Excel文件 (*.xls)|*.xls|所有文件 (*.*)|*.*",
+                    Title = "导出供氧量检验报表"
+                };
+
+                if (saveDialog.ShowDialog() == true)
+                {
+                    // 构建HTML表格（核心：通过CSS定义居中、列宽、样式，Excel可识别）
+                    var htmlBuilder = new System.Text.StringBuilder();
+                    htmlBuilder.AppendLine("<html><body>");
+                    // 表格整体样式：带边框、边框合并、统一字体（微软雅黑）
+                    htmlBuilder.AppendLine("<table border='1' style='border-collapse:collapse; font-family:微软雅黑; font-size:11px;'>");
+
+                    // 1. 表头行：居中+加粗+加宽列宽（重点优化长内容列）
+                    htmlBuilder.AppendLine("<tr style='background-color:#f0f0f0;'>");
+                    htmlBuilder.AppendLine("<th style='width:100px; text-align:center; font-weight:bold; padding:6px;'>编号</th>");
+                    htmlBuilder.AppendLine("<th style='width:140px; text-align:center; font-weight:bold; padding:6px;'>日期</th>"); // 加宽
+                    htmlBuilder.AppendLine("<th style='width:100px; text-align:center; font-weight:bold; padding:6px;'>时间</th>");
+                    htmlBuilder.AppendLine("<th style='width:160px; text-align:center; font-weight:bold; padding:6px;'>定量供氧流量(L/min)</th>"); // 加宽（字段名较长）
+                    htmlBuilder.AppendLine("<th style='width:160px; text-align:center; font-weight:bold; padding:6px;'>自动/手动补给供氧量(L/min)</th>");
+                    htmlBuilder.AppendLine("<th style='width:90px; text-align:center; font-weight:bold; padding:6px;'>样品编号</th>");
+                    htmlBuilder.AppendLine("<th style='width:140px; text-align:center; font-weight:bold; padding:6px;'>测试时长</th>"); // 加宽（支持时长格式）
+                    htmlBuilder.AppendLine("<th style='width:160px; text-align:center; font-weight:bold; padding:6px;'>记录时间</th>"); // 加宽
+                    htmlBuilder.AppendLine("</tr>");
+
+                    // 2. 数据行：居中对齐+数值格式化（供氧流量保留2位小数）
+                    foreach (var record in _records)
+                    {
+                        htmlBuilder.AppendLine("<tr>");
+                        // 每个单元格强制居中，添加内边距避免拥挤
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.Id.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.Date?.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.Time?.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.FlowRate:F2}</td>"); // 供氧流量（2位小数，匹配单位）
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.FlowRate2:F2}</td>"); // 供氧流量（2位小数，匹配单位）
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.No?.ToString() ?? ""}</td>"); // 样品编号
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.Duration?.ToString() ?? ""}</td>"); // 测试时长
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.CreateTime:yyyy/MM/dd HH:mm:ss}</td>"); // 记录时间
+                        htmlBuilder.AppendLine("</tr>");
+                    }
+
+                    // 闭合HTML标签，确保格式正确
+                    htmlBuilder.AppendLine("</table></body></html>");
+
+                    // 保存文件（UTF-8编码，彻底避免中文乱码）
+                    System.IO.File.WriteAllText(saveDialog.FileName, htmlBuilder.ToString(), Encoding.UTF8);
+
+                    // 导出成功提示：明确告知用户格式已自动设置
+                    MessageBox.Show(
+                        $"报表已成功导出到：\n{saveDialog.FileName}\n\n",
+                        "导出成功（格式已自动设置）",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                // 异常捕获：给出具体错误信息，便于排查
+                MessageBox.Show($"导出失败：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+        private void BtnClear_Click(object sender, RoutedEventArgs e)
+        {
+            var result = MessageBox.Show("确定要清空所有记录吗？此操作不可恢复！",
+                "确认清空", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+
+            if (result == MessageBoxResult.Yes)
+            {
+                _records.Clear();
+                MessageBox.Show("记录已清空", "提示",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            string plcIp = "192.168.1.10";
+            bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+            if (!initSuccess)
+            {
+                MessageBox.Show("连接Modbus服务器失败！", "错误");
+                this.Close();
+                return;
+            }
+
+            // 检查连接状态
+            if (_tcpClient == null || !_tcpClient.Connected)
+            {
+                MessageBox.Show("Modbus连接异常！", "错误");
+                this.Close();
+                return;
+            }
+
+            ma = new Function(_modbusMaster);
+        }
+
+
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+
+            // 停止ViewModel的定时器
+            if (DataContext is MainViewModel viewModel)
+            {
+                viewModel.StopTimer();
+            }
+
+            // 释放Modbus资源
+            ModbusResourceManager.Instance?.Dispose();
+
+            // 确保应用程序完全退出
+            Application.Current.Shutdown();
+        }
+        private void Window_Closed(object sender, EventArgs e)
+        {
+
+            //_mainWindow4?.Close();
+            _mainWindow?.Close();
+        }
+
+        private void BtnPrint_Click(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 15);
+        }
+
+        private bool TryReconnect()
+        {
+            try
+            {
+                string plcIp = "192.168.1.10";
+                bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+                if (initSuccess)
+                {
+                    ma = new Function(_modbusMaster);
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"重新连接失败：{ex.Message}");
+            }
+            return false;
+        }
+
+        private void SwitchWindow<T>(ref T windowInstance, Func<T> createFunc) where T : Window, new()
+        {
+
+            // 2. 检查资源是否可用（添加重连机制）
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                // 尝试重新连接
+                bool reconnectSuccess = TryReconnect();
+                if (!reconnectSuccess)
+                {
+                    MessageBox.Show("TCP连接已断开，请重新连接！", "提示");
+                    return;
+                }
+            }
+
+            // 3. 复用窗口实例：不存在则创建，存在则激活
+            if (windowInstance == null)
+            {
+                windowInstance = createFunc();
+                // 添加窗口关闭事件处理
+                windowInstance.Closed += (s, args) =>
+                {
+                    // 窗口关闭时重新启动定时器并显示当前窗口
+
+                    this.Show();
+                    this.Activate();
+                };
+            }
+            else
+            {
+                // 激活已存在的窗口（前置显示）
+                windowInstance.Activate();
+                return;
+            }
+
+            // 4. 切换窗口：隐藏当前窗口，显示目标窗口（非模态）
+            this.Hide();
+            windowInstance.Show(); // 使用 Show() 而不是 ShowDialog()
+        }
+
+        private void BtnClose_Click(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow, () => new MainWindow());
+        }
+    }
+}
\ No newline at end of file
diff --git a/ReportWindow2.xaml b/ReportWindow2.xaml
new file mode 100644
index 0000000..7b4f7a5
--- /dev/null
+++ b/ReportWindow2.xaml
@@ -0,0 +1,46 @@
+<Window x:Class="自救器呼吸器综合检验仪.ReportWindow2"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="负压气密性检验报表" Height="900" Width="1280"
+        WindowStartupLocation="CenterScreen" Loaded="Window_Loaded" Closed="Window_Closed" Closing="Window_Closing">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- 标题 -->
+        <TextBlock Grid.Row="0" Text="负压气密性检验报表" FontSize="20" FontWeight="Bold" 
+                   HorizontalAlignment="Center" Margin="10" Foreground="#FF1976D2"/>
+
+        <!-- 数据表格 -->
+        <DataGrid Grid.Row="1" x:Name="dataGrid" AutoGenerateColumns="False" 
+                  IsReadOnly="True" Margin="10" FontSize="14">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="编号" Binding="{Binding Id}" Width="60"/>
+                <DataGridTextColumn Header="时间" Binding="{Binding Time}" Width="80"/>
+                <DataGridTextColumn Header="日期" Binding="{Binding Date}" Width="100"/>
+                <DataGridTextColumn Header="初始压力" Binding="{Binding  StartPress,StringFormat=F2}" Width="120"/>
+                <DataGridTextColumn Header="结束压力" Binding="{Binding EndPress,StringFormat=F2}" Width="100"/>
+                <DataGridTextColumn Header="压差" Binding="{Binding DiffPress,StringFormat=F2}" Width="100"/>
+               
+                <DataGridTextColumn Header="样品编号" Binding="{Binding No,StringFormat=F2}" Width="100"/>
+                <DataGridTextColumn Header="保压时间" Binding="{Binding ProtectTime}" Width="100"/>
+                <DataGridTextColumn Header="记录时间" Binding="{Binding CreateTime, StringFormat=yyyy/MM/dd HH:mm}" Width="150"/>
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <!-- 底部按钮 -->
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="10">
+            <Button Content="导出报表" x:Name="btnExport" Click="BtnExport_Click" 
+                    Width="100" Height="30" Margin="5" Background="#FF4CAF50" Foreground="White"/>
+            <Button Content="清空记录" x:Name="btnClear" Click="BtnClear_Click" 
+                    Width="100" Height="30" Margin="5" Background="#FFf44336" Foreground="White"/>
+            <Button Content="关闭" x:Name="btnClose" Click="BtnClose_Click" 
+                    Width="100" Height="30" Margin="5" Background="#FF607D8B" Foreground="White"/>
+            <Button Content="打印" x:Name="btnprint" Click="BtnPrint_Click"
+Width="100" Height="30" Margin="5" Background="#FF4CAF50" Foreground="White"/>
+        </StackPanel>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/ReportWindow2.xaml.cs b/ReportWindow2.xaml.cs
new file mode 100644
index 0000000..b1035f0
--- /dev/null
+++ b/ReportWindow2.xaml.cs
@@ -0,0 +1,320 @@
+using Dapper;
+using Modbus.Device;
+using MySql.Data.MySqlClient;
+using System;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.IO;
+using System.Net.Sockets;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using 自救器呼吸器综合检验仪.Data;
+
+namespace 自救器呼吸器综合检验仪
+{
+    public static class DatabaseConfig
+    {
+        public static string ConnectionString => ConfigurationManager.ConnectionStrings["MySqlConnection"].ConnectionString;
+    }
+
+    public partial class ReportWindow2 : Window
+    {
+
+        private MainWindow2 _mainWindow2;
+        private ReportWindow2 _reportWindow2;
+        //private MainWindow2 _mainWindow2;
+        //private MainWindow3 _mainWindow3;
+        //private MainWindow4 _mainWindow4;
+        public ObservableCollection<TestRecordForNegativePressure> _records;
+        // 添加静态集合来保持数据
+        //private static ObservableCollection<TestRecord> _staticRecords = new ObservableCollection<TestRecord>();
+
+        private static ObservableCollection<TestRecordForNegativePressure> _staticRecords = new ObservableCollection<TestRecordForNegativePressure>();
+
+        private static readonly string ReportFilePath = System.IO.Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+            "氧气自救器检验报表.csv");
+
+        Function ma;
+        private TcpClient _tcpClient => ModbusResourceManager.Instance.TcpClient;
+        private IModbusMaster _modbusMaster => ModbusResourceManager.Instance.ModbusMaster;
+
+        public ReportWindow2()
+        {
+            InitializeComponent();
+            _records = new ObservableCollection<TestRecordForNegativePressure>();
+            _records = _staticRecords;
+            dataGrid.ItemsSource = _records;
+        }
+
+        // 添加新记录
+        public void AddRecord(string time, string date, double StartPress, double EndPress, double DiffPress, double ProtectTime,string no)
+        {
+            var record = new TestRecordForNegativePressure
+            {
+                Id = _records.Count + 1,
+                Time = time,
+                Date = date,
+                DiffPress = DiffPress,
+                EndPress = EndPress,
+                ProtectTime = ProtectTime,
+                StartPress = StartPress,
+                CreateTime = DateTime.Now,
+                No = no
+            };
+
+            _records.Insert(0, record); // 新记录插入到最前面
+            SaveRecords(time, date, StartPress, EndPress, DiffPress, ProtectTime,no);
+        }
+
+
+        // 保存记录到文件
+        private void SaveRecords(string time, string date, double StartPress, double EndPress, double DiffPress, double ProtectTime,string no)
+        {
+            try
+            {
+                using (var connection = new MySqlConnection(DatabaseConfig.ConnectionString))
+                {
+                    connection.Open();
+
+                    var sql = @"INSERT INTO test_recordsForNegativePressure (Time, Date,StartPress,EndPress,DiffPress,ProtectTime,No, CreateTime,Type) 
+                               VALUES (@Time, @Date, @StartPress, @EndPress,@DiffPress,@ProtectTime,@No, @CreateTime,0)";
+
+                    var record = new TestRecordForNegativePressure
+                    {
+                        Time = time,
+                        Date = date,
+                        DiffPress = DiffPress,
+                        EndPress = EndPress,
+                        ProtectTime = ProtectTime,
+                        StartPress = StartPress,
+                        CreateTime = DateTime.Now,
+                        No = no
+                    };
+
+                    connection.Execute(sql, record);
+
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"保存记录失败：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+        }
+
+        private void BtnExport_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                // 数据校验：无数据时提示
+                if (_records == null || _records.Count == 0)
+                {
+                    MessageBox.Show("没有数据可导出", "提示",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                    return;
+                }
+
+                // 保存文件对话框：后缀改为.xls，Excel可直接打开
+                var saveDialog = new Microsoft.Win32.SaveFileDialog
+                {
+                    FileName = $"氧气自救器_负压检验报表_{DateTime.Now:yyyyMMdd_HHmmss}.xls",
+                    Filter = "Excel文件 (*.xls)|*.xls|所有文件 (*.*)|*.*",
+                    Title = "导出负压检验报表"
+                };
+
+                if (saveDialog.ShowDialog() == true)
+                {
+                    // 构建HTML表格（核心：通过CSS直接定义居中、列宽、样式）
+                    var htmlBuilder = new System.Text.StringBuilder();
+                    htmlBuilder.AppendLine("<html><body>");
+                    // 表格整体样式：带边框、边框合并、统一字体
+                    htmlBuilder.AppendLine("<table border='1' style='border-collapse:collapse; font-family:微软雅黑; font-size:11px;'>");
+
+                    // 1. 表头行：居中+加粗+加宽列宽（重点优化日期、保压时间、记录时间）
+                    htmlBuilder.AppendLine("<tr style='background-color:#f0f0f0;'>");
+                    htmlBuilder.AppendLine("<th style='width:100px; text-align:center; font-weight:bold; padding:6px;'>编号</th>");
+                    htmlBuilder.AppendLine("<th style='width:130px; text-align:center; font-weight:bold; padding:6px;'>日期</th>"); // 加宽
+                    htmlBuilder.AppendLine("<th style='width:100px; text-align:center; font-weight:bold; padding:6px;'>时间</th>");
+                    htmlBuilder.AppendLine("<th style='width:100px; text-align:center; font-weight:bold; padding:6px;'>初始压力</th>");
+                    htmlBuilder.AppendLine("<th style='width:100px; text-align:center; font-weight:bold; padding:6px;'>结束压力</th>");
+                    htmlBuilder.AppendLine("<th style='width:100px; text-align:center; font-weight:bold; padding:6px;'>压差</th>");
+                    htmlBuilder.AppendLine("<th style='width:100px; text-align:center; font-weight:bold; padding:6px;'>样品编号</th>");
+                    htmlBuilder.AppendLine("<th style='width:130px; text-align:center; font-weight:bold; padding:6px;'>保压时间</th>"); // 加宽
+                    htmlBuilder.AppendLine("<th style='width:180px; text-align:center; font-weight:bold; padding:6px;'>记录时间</th>"); // 加宽
+                    htmlBuilder.AppendLine("</tr>");
+
+                    // 2. 数据行：居中对齐+数值格式化（保留2位小数）
+                    foreach (var record in _records)
+                    {
+                        htmlBuilder.AppendLine("<tr>");
+                        // 每个单元格强制居中，添加内边距提升可读性
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.Id.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.Date?.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.Time?.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.StartPress:F2}</td>"); // 初始压力（2位小数）
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.EndPress:F2}</td>"); // 结束压力（2位小数）
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.DiffPress:F2}</td>"); // 压差（2位小数）
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.No?.ToString() ?? ""}</td>"); // 样品编号
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.ProtectTime:F2}</td>"); // 保压时间（2位小数）
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.CreateTime:yyyy/MM/dd HH:mm:ss}</td>"); // 记录时间
+                        htmlBuilder.AppendLine("</tr>");
+                    }
+
+                    // 闭合HTML标签
+                    htmlBuilder.AppendLine("</table></body></html>");
+
+                    // 保存文件（UTF-8编码，避免中文乱码）
+                    System.IO.File.WriteAllText(saveDialog.FileName, htmlBuilder.ToString(), Encoding.UTF8);
+
+                    // 导出成功提示（明确格式已生效）
+                    MessageBox.Show(
+                        $"报表已成功导出到：\n{saveDialog.FileName}\n\n",
+                        "导出成功（格式已自动设置）",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                // 异常捕获与提示
+                MessageBox.Show($"导出失败：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void BtnClear_Click(object sender, RoutedEventArgs e)
+        {
+            var result = MessageBox.Show("确定要清空所有记录吗？此操作不可恢复！",
+                "确认清空", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+
+            if (result == MessageBoxResult.Yes)
+            {
+                _records.Clear();
+                MessageBox.Show("记录已清空", "提示",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            string plcIp = "192.168.1.10";
+            bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+            if (!initSuccess)
+            {
+                MessageBox.Show("连接Modbus服务器失败！", "错误");
+                this.Close();
+                return;
+            }
+
+            // 检查连接状态
+            if (_tcpClient == null || !_tcpClient.Connected)
+            {
+                MessageBox.Show("Modbus连接异常！", "错误");
+                this.Close();
+                return;
+            }
+
+            ma = new Function(_modbusMaster);
+        }
+
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+
+            // 停止ViewModel的定时器
+            if (DataContext is MainViewModel viewModel)
+            {
+                viewModel.StopTimer();
+            }
+
+            // 释放Modbus资源
+            ModbusResourceManager.Instance?.Dispose();
+
+            // 确保应用程序完全退出
+            Application.Current.Shutdown();
+        }
+        private void Window_Closed(object sender, EventArgs e)
+        {
+
+            //_mainWindow4?.Close();
+            _reportWindow2?.Close();
+        }
+
+        //private void BtnClose_Click(object sender, RoutedEventArgs e)
+        //{
+        //    this.Close(); // 直接关闭当前窗口，不切换
+        //}
+
+
+        private void BtnPrint_Click(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 15);
+        }
+
+        private bool TryReconnect()
+        {
+            try
+            {
+                string plcIp = "192.168.1.10";
+                bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+                if (initSuccess)
+                {
+                    ma = new Function(_modbusMaster);
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"重新连接失败：{ex.Message}");
+            }
+            return false;
+        }
+
+        private void SwitchWindow<T>(ref T windowInstance, Func<T> createFunc) where T : Window, new()
+        {
+
+            // 2. 检查资源是否可用（添加重连机制）
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                // 尝试重新连接
+                bool reconnectSuccess = TryReconnect();
+                if (!reconnectSuccess)
+                {
+                    MessageBox.Show("TCP连接已断开，请重新连接！", "提示");
+                    return;
+                }
+            }
+
+            // 3. 复用窗口实例：不存在则创建，存在则激活
+            if (windowInstance == null)
+            {
+                windowInstance = createFunc();
+                // 添加窗口关闭事件处理
+                windowInstance.Closed += (s, args) =>
+                {
+                    // 窗口关闭时重新启动定时器并显示当前窗口
+
+                    this.Show();
+                    this.Activate();
+                };
+            }
+            else
+            {
+                // 激活已存在的窗口（前置显示）
+                windowInstance.Activate();
+                return;
+            }
+
+            // 4. 切换窗口：隐藏当前窗口，显示目标窗口（非模态）
+            this.Hide();
+            windowInstance.Show(); // 使用 Show() 而不是 ShowDialog()
+        }
+
+        private void BtnClose_Click(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow2, () => new MainWindow2());
+        }
+    }
+}
\ No newline at end of file
diff --git a/ReportWindow3.xaml b/ReportWindow3.xaml
new file mode 100644
index 0000000..4b8a196
--- /dev/null
+++ b/ReportWindow3.xaml
@@ -0,0 +1,46 @@
+<Window x:Class="自救器呼吸器综合检验仪.ReportWindow3"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="正压气密性检验报表" Height="900" Width="1280"
+        WindowStartupLocation="CenterScreen" Loaded="Window_Loaded" Closed="Window_Closed" Closing="Window_Closing">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- 标题 -->
+        <TextBlock Grid.Row="0" Text="正压气密性检验报表" FontSize="20" FontWeight="Bold" 
+                   HorizontalAlignment="Center" Margin="10" Foreground="#FF1976D2"/>
+
+        <!-- 数据表格 -->
+        <DataGrid Grid.Row="1" x:Name="dataGrid" AutoGenerateColumns="False" 
+                  IsReadOnly="True" Margin="10" FontSize="14">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="编号" Binding="{Binding Id}" Width="60"/>
+                <DataGridTextColumn Header="时间" Binding="{Binding Time}" Width="80"/>
+                <DataGridTextColumn Header="日期" Binding="{Binding Date}" Width="100"/>
+                <DataGridTextColumn Header="初始压力" Binding="{Binding  StartPress,StringFormat=F2}" Width="120"/>
+                <DataGridTextColumn Header="结束压力" Binding="{Binding EndPress,StringFormat=F2}" Width="100"/>
+                <DataGridTextColumn Header="压差" Binding="{Binding DiffPress,StringFormat=F2}" Width="100"/>
+                <DataGridTextColumn Header="样品编号" Binding="{Binding No,StringFormat=F2}" Width="100"/>
+                <!--<DataGridTextColumn Header="样品编号" Binding="{Binding No,StringFormat=F2}" Width="100"/>-->
+                <DataGridTextColumn Header="保压时间" Binding="{Binding ProtectTime}" Width="100"/>
+                <DataGridTextColumn Header="记录时间" Binding="{Binding CreateTime, StringFormat=yyyy/MM/dd HH:mm}" Width="150"/>
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <!-- 底部按钮 -->
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="10">
+            <Button Content="导出报表" x:Name="btnExport" Click="BtnExport_Click" 
+                    Width="100" Height="30" Margin="5" Background="#FF4CAF50" Foreground="White"/>
+            <Button Content="清空记录" x:Name="btnClear" Click="BtnClear_Click" 
+                    Width="100" Height="30" Margin="5" Background="#FFf44336" Foreground="White"/>
+            <Button Content="关闭" x:Name="btnClose" Click="BtnClose_Click" 
+                    Width="100" Height="30" Margin="5" Background="#FF607D8B" Foreground="White"/>
+            <Button Content="打印" x:Name="btnprint" Click="BtnPrint_Click"
+Width="100" Height="30" Margin="5" Background="#FF4CAF50" Foreground="White"/>
+        </StackPanel>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/ReportWindow3.xaml.cs b/ReportWindow3.xaml.cs
new file mode 100644
index 0000000..cf53515
--- /dev/null
+++ b/ReportWindow3.xaml.cs
@@ -0,0 +1,319 @@
+using Dapper;
+using Modbus.Device;
+using MySql.Data.MySqlClient;
+using System;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.IO;
+using System.Net.Sockets;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using 自救器呼吸器综合检验仪.Data;
+
+namespace 自救器呼吸器综合检验仪
+{
+
+    public partial class ReportWindow3 : Window
+    {
+
+        //private MainWindow _mainWindow;
+        private MainWindow3 _mainWindow3;
+        private ReportWindow3 _reportWindow3;
+        //private MainWindow3 _mainWindow3;
+        //private MainWindow4 _mainWindow4;
+        public ObservableCollection<TestRecordForNegativePressure> _records;
+        private static ObservableCollection<TestRecordForNegativePressure> _staticRecords = new ObservableCollection<TestRecordForNegativePressure>();
+
+        private static readonly string ReportFilePath = System.IO.Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+            "氧气自救器检验报表.csv");
+
+        Function ma;
+        private TcpClient _tcpClient => ModbusResourceManager.Instance.TcpClient;
+        private IModbusMaster _modbusMaster => ModbusResourceManager.Instance.ModbusMaster;
+
+        public ReportWindow3()
+        {
+            InitializeComponent();
+            _records = new ObservableCollection<TestRecordForNegativePressure>();
+            _records = _staticRecords;
+            dataGrid.ItemsSource = _records;
+        }
+
+        // 添加新记录
+        public void AddRecord(string time, string date, double StartPress, double EndPress, double DiffPress, double ProtectTime, string No)
+        {
+            var record = new TestRecordForNegativePressure
+            {
+                Id = _records.Count + 1,
+                Time = time,
+                Date = date,
+                DiffPress = DiffPress,
+                EndPress = EndPress,
+                ProtectTime = ProtectTime,
+                StartPress = StartPress,
+                CreateTime = DateTime.Now,
+                No = No
+            };
+
+            _records.Insert(0, record); // 新记录插入到最前面
+            SaveRecords(time, date, StartPress, EndPress, DiffPress, ProtectTime, No);
+        }
+
+
+        // 保存记录到文件
+        private void SaveRecords(string time, string date, double StartPress, double EndPress, double DiffPress, double ProtectTime, string No)
+        {
+            try
+            {
+                using (var connection = new MySqlConnection(DatabaseConfig.ConnectionString))
+                {
+                    connection.Open();
+
+                    var sql = @"INSERT INTO test_recordsForNegativePressure (Time, Date,StartPress,EndPress,DiffPress,ProtectTime,No, CreateTime,Type) 
+                               VALUES (@Time, @Date, @StartPress, @EndPress,@DiffPress,@ProtectTime,@No, @CreateTime,1)";
+
+                    var record = new TestRecordForNegativePressure
+                    {
+                        Time = time,
+                        Date = date,
+                        DiffPress = DiffPress,
+                        EndPress = EndPress,
+                        ProtectTime = ProtectTime,
+                        StartPress = StartPress,
+                        CreateTime = DateTime.Now,
+                        No = No
+                    };
+
+                    connection.Execute(sql, record);
+
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"保存记录失败：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+        }
+        private void BtnExport_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_records == null || _records.Count == 0)
+                {
+                    MessageBox.Show("没有数据可导出", "提示",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                    return;
+                }
+
+                var saveDialog = new Microsoft.Win32.SaveFileDialog
+                {
+                    FileName = $"氧气自救器_正压检验报表_{DateTime.Now:yyyyMMdd_HHmmss}.xls", // 后缀改为xls，Excel直接打开
+                    Filter = "Excel文件 (*.xls)|*.xls|所有文件 (*.*)|*.*"
+                };
+
+                if (saveDialog.ShowDialog() == true)
+                {
+                    // 用StringBuilder构建HTML表格（核心：直接定义居中+列宽样式）
+                    var htmlBuilder = new System.Text.StringBuilder();
+                    htmlBuilder.AppendLine("<html><body>");
+                    // 表格整体样式：带边框、边框合并，避免杂乱
+                    htmlBuilder.AppendLine("<table border='1' style='border-collapse:collapse; font-family:微软雅黑; font-size:11px;'>");
+
+                    // 1. 表头行：居中+加粗+加宽列宽（按需调整width值）
+                    htmlBuilder.AppendLine("<tr style='background-color:#f5f5f5;'>");
+                    // 列宽设置（单位px，重点加宽日期、保压时间、记录时间列）
+                    htmlBuilder.AppendLine("<th style='width:80px; text-align:center; font-weight:bold; padding:6px;'>编号</th>");
+                    htmlBuilder.AppendLine("<th style='width:120px; text-align:center; font-weight:bold; padding:6px;'>日期</th>");
+                    htmlBuilder.AppendLine("<th style='width:100px; text-align:center; font-weight:bold; padding:6px;'>时间</th>");
+                    htmlBuilder.AppendLine("<th style='width:80px; text-align:center; font-weight:bold; padding:6px;'>初始压力</th>");
+                    htmlBuilder.AppendLine("<th style='width:80px; text-align:center; font-weight:bold; padding:6px;'>结束压力</th>");
+                    htmlBuilder.AppendLine("<th style='width:80px; text-align:center; font-weight:bold; padding:6px;'>压差</th>");
+                    htmlBuilder.AppendLine("<th style='width:80px; text-align:center; font-weight:bold; padding:6px;'>样品编号</th>");
+                    htmlBuilder.AppendLine("<th style='width:120px; text-align:center; font-weight:bold; padding:6px;'>保压时间</th>"); // 加宽
+                    htmlBuilder.AppendLine("<th style='width:120px; text-align:center; font-weight:bold; padding:6px;'>记录时间</th>"); // 加宽
+                    htmlBuilder.AppendLine("</tr>");
+
+                    // 2. 数据行：居中对齐，继承表头列宽，数值保留2位小数
+                    foreach (var record in _records)
+                    {
+                        htmlBuilder.AppendLine("<tr>");
+                        // 每个单元格强制居中，添加内边距避免拥挤
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.Id.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.Date?.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.Time?.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.StartPress:F2}</td>"); // 初始压力（2位小数）
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.EndPress:F2}</td>"); // 结束压力（2位小数）
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.DiffPress:F2}</td>"); // 压差（2位小数）
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.No?.ToString() ?? ""}</td>"); // 样品编号
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.ProtectTime:F2}</td>"); // 保压时间（2位小数）
+                        htmlBuilder.AppendLine($"<td style='text-align:center; padding:6px;'>{record.CreateTime:yyyy/MM/dd HH:mm:ss}</td>"); // 记录时间
+                        htmlBuilder.AppendLine("</tr>");
+                    }
+
+                    // 闭合HTML标签
+                    htmlBuilder.AppendLine("</table></body></html>");
+
+                    // 保存文件（UTF-8编码，避免中文乱码）
+                    System.IO.File.WriteAllText(saveDialog.FileName, htmlBuilder.ToString(), Encoding.UTF8);
+
+                    MessageBox.Show(
+                        $"报表已成功导出到：\n{saveDialog.FileName}\n\n",
+                        "导出成功（格式已自动设置）",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"导出失败：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+        private void BtnClear_Click(object sender, RoutedEventArgs e)
+        {
+            var result = MessageBox.Show("确定要清空所有记录吗？此操作不可恢复！",
+                "确认清空", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+
+            if (result == MessageBoxResult.Yes)
+            {
+                _records.Clear();
+                MessageBox.Show("记录已清空", "提示",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+
+        //private void BtnClose_Click(object sender, RoutedEventArgs e)
+        //{
+        //    this.Close();
+        //}
+
+        private void BtnPrint_Click(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 15);
+        }
+
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            string plcIp = "192.168.1.10";
+            bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+            if (!initSuccess)
+            {
+                MessageBox.Show("连接Modbus服务器失败！", "错误");
+                this.Close();
+                return;
+            }
+
+            // 检查连接状态
+            if (_tcpClient == null || !_tcpClient.Connected)
+            {
+                MessageBox.Show("Modbus连接异常！", "错误");
+                this.Close();
+                return;
+            }
+
+            ma = new Function(_modbusMaster);
+        }
+
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+
+            // 停止ViewModel的定时器
+            if (DataContext is MainViewModel viewModel)
+            {
+                viewModel.StopTimer();
+            }
+
+            // 释放Modbus资源
+            ModbusResourceManager.Instance?.Dispose();
+
+            // 确保应用程序完全退出
+            Application.Current.Shutdown();
+        }
+        private void Window_Closed(object sender, EventArgs e)
+        {
+
+            //_mainWindow4?.Close();
+            _reportWindow3?.Close();
+        }
+
+        //private void BtnClose_Click(object sender, RoutedEventArgs e)
+        //{
+        //    this.Close(); // 直接关闭当前窗口，不切换
+        //}
+
+
+        //private void BtnPrint_Click(object sender, RoutedEventArgs e)
+        //{
+        //    ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 15);
+        //}
+
+        private bool TryReconnect()
+        {
+            try
+            {
+                string plcIp = "192.168.1.10";
+                bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+                if (initSuccess)
+                {
+                    ma = new Function(_modbusMaster);
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"重新连接失败：{ex.Message}");
+            }
+            return false;
+        }
+
+        private void SwitchWindow<T>(ref T windowInstance, Func<T> createFunc) where T : Window, new()
+        {
+
+            // 2. 检查资源是否可用（添加重连机制）
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                // 尝试重新连接
+                bool reconnectSuccess = TryReconnect();
+                if (!reconnectSuccess)
+                {
+                    MessageBox.Show("TCP连接已断开，请重新连接！", "提示");
+                    return;
+                }
+            }
+
+            // 3. 复用窗口实例：不存在则创建，存在则激活
+            if (windowInstance == null)
+            {
+                windowInstance = createFunc();
+                // 添加窗口关闭事件处理
+                windowInstance.Closed += (s, args) =>
+                {
+                    // 窗口关闭时重新启动定时器并显示当前窗口
+
+                    this.Show();
+                    this.Activate();
+                };
+            }
+            else
+            {
+                // 激活已存在的窗口（前置显示）
+                windowInstance.Activate();
+                return;
+            }
+
+            // 4. 切换窗口：隐藏当前窗口，显示目标窗口（非模态）
+            this.Hide();
+            windowInstance.Show(); // 使用 Show() 而不是 ShowDialog()
+        }
+
+        private void BtnClose_Click(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow3, () => new MainWindow3());
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/ReportWindow4.xaml b/ReportWindow4.xaml
new file mode 100644
index 0000000..005f04f
--- /dev/null
+++ b/ReportWindow4.xaml
@@ -0,0 +1,43 @@
+<Window x:Class="自救器呼吸器综合检验仪.ReportWindow4"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="排气阀检验报表" Height="900" Width="1280"
+        WindowStartupLocation="CenterScreen" Loaded="Window_Loaded" Closed="Window_Closed" Closing="Window_Closing" >
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- 标题 -->
+        <TextBlock Grid.Row="0" Text="排气阀检验报表" FontSize="20" FontWeight="Bold" 
+                   HorizontalAlignment="Center" Margin="10" Foreground="#FF1976D2"/>
+
+        <!-- 数据表格 -->
+        <DataGrid Grid.Row="1" x:Name="dataGrid" AutoGenerateColumns="False" 
+                  IsReadOnly="True" Margin="10" FontSize="14">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="编号" Binding="{Binding Id}" Width="60"/>
+                <DataGridTextColumn Header="时间" Binding="{Binding Time}" Width="80"/>
+                <DataGridTextColumn Header="日期" Binding="{Binding Date}" Width="100"/>
+                <DataGridTextColumn Header="样品编号" Binding="{Binding No,StringFormat=F2}" Width="100"/>
+                <DataGridTextColumn Header="排气阀开启压力pa" Binding="{Binding FlowRate, StringFormat=F2}" Width="140"/>
+                <!--<DataGridTextColumn Header="测试时长" Binding="{Binding Duration}" Width="100"/>-->
+                <DataGridTextColumn Header="记录时间" Binding="{Binding CreateTime, StringFormat=yyyy/MM/dd HH:mm}" Width="150"/>
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <!-- 底部按钮 -->
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="10">
+            <Button Content="导出报表" x:Name="btnExport" Click="BtnExport_Click" 
+                    Width="100" Height="30" Margin="5" Background="#FF4CAF50" Foreground="White"/>
+            <Button Content="清空记录" x:Name="btnClear" Click="BtnClear_Click" 
+                    Width="100" Height="30" Margin="5" Background="#FFf44336" Foreground="White"/>
+            <Button Content="关闭" x:Name="btnClose" Click="BtnClose_Click" 
+                    Width="100" Height="30" Margin="5" Background="#FF607D8B" Foreground="White"/>
+            <Button Content="打印" x:Name="btnprint" Click="BtnPrint_Click"
+Width="100" Height="30" Margin="5" Background="#FF4CAF50" Foreground="White"/>
+        </StackPanel>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/ReportWindow4.xaml.cs b/ReportWindow4.xaml.cs
new file mode 100644
index 0000000..3f677d9
--- /dev/null
+++ b/ReportWindow4.xaml.cs
@@ -0,0 +1,360 @@
+using Dapper;
+using Modbus.Device;
+using MySql.Data.MySqlClient;
+using System;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.IO;
+using System.Net.Sockets;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using 自救器呼吸器综合检验仪.Data;
+
+namespace 自救器呼吸器综合检验仪
+{
+
+    public partial class ReportWindow4 : Window
+    {
+
+        //private MainWindow _mainWindow;
+        //private MainWindow2 _mainWindow2;
+        //private MainWindow3 _mainWindow3;
+        private MainWindow4 _mainWindow4;
+        private ReportWindow4 _reportWindow4;
+
+
+        public ObservableCollection<TestRecord> _records;
+        // 添加静态集合来保持数据
+        private static ObservableCollection<TestRecord> _staticRecords = new ObservableCollection<TestRecord>();
+        private static readonly string ReportFilePath = System.IO.Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+            "氧气自救器检验报表.csv");
+
+        Function ma;
+        private TcpClient _tcpClient => ModbusResourceManager.Instance.TcpClient;
+        private IModbusMaster _modbusMaster => ModbusResourceManager.Instance.ModbusMaster;
+
+        public ReportWindow4()
+        {
+            InitializeComponent();
+            _records = new ObservableCollection<TestRecord>();
+            _records = _staticRecords;
+            dataGrid.ItemsSource = _records;
+        }
+
+        // 添加新记录
+        public void AddRecord(string time, string date, double flowRate, string duration, string No)
+        {
+            var record = new TestRecord
+            {
+                Id = _records.Count + 1,
+                Time = time,
+                Date = date,
+                FlowRate = flowRate,
+                Duration = duration,
+                CreateTime = DateTime.Now,
+                No = No
+            };
+
+            _records.Insert(0, record); // 新记录插入到最前面
+            SaveRecords(time, date, flowRate, duration, No);
+        }
+
+
+        // 保存记录到文件
+        private void SaveRecords(string time, string date, double flowRate, string duration, string No)
+        {
+            try
+            {
+                using (var connection = new MySqlConnection(DatabaseConfig.ConnectionString))
+                {
+                    connection.Open();
+
+                    var sql = @"INSERT INTO test_records (Time, Date, FlowRate, Duration,No, CreateTime,Type) 
+                               VALUES (@Time, @Date, @FlowRate, @Duration,@No, @CreateTime,1)";
+
+                    var record = new TestRecord
+                    {
+                        Time = time,
+                        Date = date,
+                        FlowRate = flowRate,
+                        Duration = duration,
+                        CreateTime = DateTime.Now,
+                        No = No
+                    };
+
+                    connection.Execute(sql, record);
+
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"保存记录失败：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+        }
+
+        //private void BtnExport_Click(object sender, RoutedEventArgs e)
+        //{
+        //    try
+        //    {
+        //        if (_records == null || _records.Count == 0)
+        //        {
+        //            MessageBox.Show("没有数据可导出", "提示",
+        //                MessageBoxButton.OK, MessageBoxImage.Information);
+        //            return;
+        //        }
+
+        //        var saveDialog = new Microsoft.Win32.SaveFileDialog
+        //        {
+        //            FileName = $"氧气自救器_排气阀检验报表_{DateTime.Now:yyyyMMdd_HHmmss}.csv",
+        //            Filter = "CSV文件 (*.csv)|*.csv"
+        //        };
+
+        //        if (saveDialog.ShowDialog() == true)
+        //        {
+        //            // 从_records直接生成CSV文件
+        //            using (var writer = new StreamWriter(saveDialog.FileName, false, Encoding.UTF8))
+        //            {
+        //                // 写入表头
+        //                writer.WriteLine("编号,日期,时间,排气阀开启压力pa,样品编号，测试时长,记录时间");
+
+        //                // 写入数据
+        //                foreach (var record in _records)
+        //                {
+        //                    writer.WriteLine($"{record.Id},{record.Date},{record.Time},{record.FlowRate:F2},{record.No},{record.Duration},{record.CreateTime:yyyy/MM/dd HH:mm:ss}");
+        //                }
+        //            }
+
+        //            MessageBox.Show($"报表已导出到：{saveDialog.FileName}", "导出成功",
+        //                MessageBoxButton.OK, MessageBoxImage.Information);
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        MessageBox.Show($"导出失败：{ex.Message}", "错误",
+        //            MessageBoxButton.OK, MessageBoxImage.Error);
+        //    }
+        //}
+        private void BtnExport_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_records == null || _records.Count == 0)
+                {
+                    MessageBox.Show("没有数据可导出", "提示",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                    return;
+                }
+
+                var saveDialog = new Microsoft.Win32.SaveFileDialog
+                {
+                    FileName = $"氧气自救器_排气阀检验报表_{DateTime.Now:yyyyMMdd_HHmmss}.xls", // 后缀设为xls，Excel直接打开
+                    Filter = "Excel文件 (*.xls)|*.xls|所有文件 (*.*)|*.*"
+                };
+
+                if (saveDialog.ShowDialog() == true)
+                {
+                    // 构建HTML表格（核心：直接定义样式，Excel能识别）
+                    var htmlBuilder = new System.Text.StringBuilder();
+                    // HTML头部：设置表格整体样式
+                    htmlBuilder.AppendLine("<html><body>");
+                    // 表格样式：边框+居中，列宽直接定义（单位：像素）
+                    htmlBuilder.AppendLine("<table border='1' style='border-collapse:collapse;'>");
+
+                    // 1. 表头行：居中+加粗+指定列宽
+                    htmlBuilder.AppendLine("<tr style='background-color:#f0f0f0;'>");
+                    // 编号（120px）、日期（180px，加宽）、时间（100px）、压力（180px）、样品编号（120px）、测试时长（160px，加宽）、记录时间（220px）
+                    htmlBuilder.AppendLine("<th style='width:120px;text-align:center;font-weight:bold;padding:5px;'>编号</th>");
+                    htmlBuilder.AppendLine("<th style='width:180px;text-align:center;font-weight:bold;padding:5px;'>日期</th>");
+                    htmlBuilder.AppendLine("<th style='width:100px;text-align:center;font-weight:bold;padding:5px;'>时间</th>");
+                    htmlBuilder.AppendLine("<th style='width:180px;text-align:center;font-weight:bold;padding:5px;'>排气阀开启压力pa</th>");
+                    htmlBuilder.AppendLine("<th style='width:120px;text-align:center;font-weight:bold;padding:5px;'>样品编号</th>");
+                    htmlBuilder.AppendLine("<th style='width:160px;text-align:center;font-weight:bold;padding:5px;'>测试时长</th>");
+                    htmlBuilder.AppendLine("<th style='width:220px;text-align:center;font-weight:bold;padding:5px;'>记录时间</th>");
+                    htmlBuilder.AppendLine("</tr>");
+
+                    // 2. 数据行：居中+与表头列宽对应
+                    foreach (var record in _records)
+                    {
+                        htmlBuilder.AppendLine("<tr>");
+                        // 每个单元格设置居中对齐，继承列宽
+                        htmlBuilder.AppendLine($"<td style='text-align:center;padding:5px;'>{record.Id.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center;padding:5px;'>{record.Date?.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center;padding:5px;'>{record.Time?.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center;padding:5px;'>{record.FlowRate:F2}</td>"); // 保留2位小数
+                        htmlBuilder.AppendLine($"<td style='text-align:center;padding:5px;'>{record.No?.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center;padding:5px;'>{record.Duration?.ToString() ?? ""}</td>");
+                        htmlBuilder.AppendLine($"<td style='text-align:center;padding:5px;'>{record.CreateTime:yyyy/MM/dd HH:mm:ss}</td>");
+                        htmlBuilder.AppendLine("</tr>");
+                    }
+
+                    // 闭合HTML标签
+                    htmlBuilder.AppendLine("</table></body></html>");
+
+                    // 保存为HTML格式文件（后缀.xls，Excel可直接打开）
+                    File.WriteAllText(saveDialog.FileName, htmlBuilder.ToString(), Encoding.UTF8);
+
+                    MessageBox.Show(
+                        $"报表已成功导出到：\n{saveDialog.FileName}\n\n",
+                        "导出成功（格式已自动设置）",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"导出失败：{ex.Message}", "错误",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+        private void BtnClear_Click(object sender, RoutedEventArgs e)
+        {
+            var result = MessageBox.Show("确定要清空所有记录吗？此操作不可恢复！",
+                "确认清空", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+
+            if (result == MessageBoxResult.Yes)
+            {
+                _records.Clear();
+                MessageBox.Show("记录已清空", "提示",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+
+        //private void BtnClose_Click(object sender, RoutedEventArgs e)
+        //{
+        //    this.Close(); // 直接关闭当前窗口，不切换
+        //}
+        //private void Window_Loaded(object sender, RoutedEventArgs e)
+        //{
+        //}
+
+
+        private void BtnPrint_Click(object sender, RoutedEventArgs e)
+        {
+            ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 15);
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            string plcIp = "192.168.1.10";
+            bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+            if (!initSuccess)
+            {
+                MessageBox.Show("连接Modbus服务器失败！", "错误");
+                this.Close();
+                return;
+            }
+
+            // 检查连接状态
+            if (_tcpClient == null || !_tcpClient.Connected)
+            {
+                MessageBox.Show("Modbus连接异常！", "错误");
+                this.Close();
+                return;
+            }
+
+            ma = new Function(_modbusMaster);
+        }
+
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+
+            // 停止ViewModel的定时器
+            if (DataContext is MainViewModel viewModel)
+            {
+                viewModel.StopTimer();
+            }
+
+            // 释放Modbus资源
+            ModbusResourceManager.Instance?.Dispose();
+
+            // 确保应用程序完全退出
+            Application.Current.Shutdown();
+        }
+        private void Window_Closed(object sender, EventArgs e)
+        {
+
+            //_mainWindow4?.Close();
+            _reportWindow4?.Close();
+        }
+
+        //private void BtnClose_Click(object sender, RoutedEventArgs e)
+        //{
+        //    this.Close(); // 直接关闭当前窗口，不切换
+        //}
+
+
+        //private void BtnPrint_Click(object sender, RoutedEventArgs e)
+        //{
+        //    ma.BtnClickFunctionForNew(Function.ButtonType.切换型, 15);
+        //}
+
+        private bool TryReconnect()
+        {
+            try
+            {
+                string plcIp = "192.168.1.10";
+                bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
+                if (initSuccess)
+                {
+                    ma = new Function(_modbusMaster);
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                //ShowErrorMsg($"重新连接失败：{ex.Message}");
+            }
+            return false;
+        }
+
+        private void SwitchWindow<T>(ref T windowInstance, Func<T> createFunc) where T : Window, new()
+        {
+
+            // 2. 检查资源是否可用（添加重连机制）
+            if (_tcpClient == null || !_tcpClient.Connected || _modbusMaster == null)
+            {
+                // 尝试重新连接
+                bool reconnectSuccess = TryReconnect();
+                if (!reconnectSuccess)
+                {
+                    MessageBox.Show("TCP连接已断开，请重新连接！", "提示");
+                    return;
+                }
+            }
+
+            // 3. 复用窗口实例：不存在则创建，存在则激活
+            if (windowInstance == null)
+            {
+                windowInstance = createFunc();
+                // 添加窗口关闭事件处理
+                windowInstance.Closed += (s, args) =>
+                {
+                    // 窗口关闭时重新启动定时器并显示当前窗口
+
+                    this.Show();
+                    this.Activate();
+                };
+            }
+            else
+            {
+                // 激活已存在的窗口（前置显示）
+                windowInstance.Activate();
+                return;
+            }
+
+            // 4. 切换窗口：隐藏当前窗口，显示目标窗口（非模态）
+            this.Hide();
+            windowInstance.Show(); // 使用 Show() 而不是 ShowDialog()
+        }
+
+        private void BtnClose_Click(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _mainWindow4, () => new MainWindow4());
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Resources/Noto/NotoSans-Bold.ttf b/Resources/Noto/NotoSans-Bold.ttf
new file mode 100644
index 0000000..54ad879
Binary files /dev/null and b/Resources/Noto/NotoSans-Bold.ttf differ
diff --git a/Resources/Noto/NotoSans-BoldItalic.ttf b/Resources/Noto/NotoSans-BoldItalic.ttf
new file mode 100644
index 0000000..530a828
Binary files /dev/null and b/Resources/Noto/NotoSans-BoldItalic.ttf differ
diff --git a/Resources/Noto/NotoSans-Italic.ttf b/Resources/Noto/NotoSans-Italic.ttf
new file mode 100644
index 0000000..27ff1ed
Binary files /dev/null and b/Resources/Noto/NotoSans-Italic.ttf differ
diff --git a/Resources/Noto/NotoSans-Regular.ttf b/Resources/Noto/NotoSans-Regular.ttf
new file mode 100644
index 0000000..10589e2
Binary files /dev/null and b/Resources/Noto/NotoSans-Regular.ttf differ
diff --git a/Resources/Roboto/Roboto-Black.ttf b/Resources/Roboto/Roboto-Black.ttf
new file mode 100644
index 0000000..fbde625
Binary files /dev/null and b/Resources/Roboto/Roboto-Black.ttf differ
diff --git a/Resources/Roboto/Roboto-BlackItalic.ttf b/Resources/Roboto/Roboto-BlackItalic.ttf
new file mode 100644
index 0000000..60f7782
Binary files /dev/null and b/Resources/Roboto/Roboto-BlackItalic.ttf differ
diff --git a/Resources/Roboto/Roboto-Bold.ttf b/Resources/Roboto/Roboto-Bold.ttf
new file mode 100644
index 0000000..a355c27
Binary files /dev/null and b/Resources/Roboto/Roboto-Bold.ttf differ
diff --git a/Resources/Roboto/Roboto-BoldItalic.ttf b/Resources/Roboto/Roboto-BoldItalic.ttf
new file mode 100644
index 0000000..3c9a7a3
Binary files /dev/null and b/Resources/Roboto/Roboto-BoldItalic.ttf differ
diff --git a/Resources/Roboto/Roboto-Italic.ttf b/Resources/Roboto/Roboto-Italic.ttf
new file mode 100644
index 0000000..ff6046d
Binary files /dev/null and b/Resources/Roboto/Roboto-Italic.ttf differ
diff --git a/Resources/Roboto/Roboto-Light.ttf b/Resources/Roboto/Roboto-Light.ttf
new file mode 100644
index 0000000..94c6bcc
Binary files /dev/null and b/Resources/Roboto/Roboto-Light.ttf differ
diff --git a/Resources/Roboto/Roboto-LightItalic.ttf b/Resources/Roboto/Roboto-LightItalic.ttf
new file mode 100644
index 0000000..04cc002
Binary files /dev/null and b/Resources/Roboto/Roboto-LightItalic.ttf differ
diff --git a/Resources/Roboto/Roboto-Medium.ttf b/Resources/Roboto/Roboto-Medium.ttf
new file mode 100644
index 0000000..39c63d7
Binary files /dev/null and b/Resources/Roboto/Roboto-Medium.ttf differ
diff --git a/Resources/Roboto/Roboto-MediumItalic.ttf b/Resources/Roboto/Roboto-MediumItalic.ttf
new file mode 100644
index 0000000..dc743f0
Binary files /dev/null and b/Resources/Roboto/Roboto-MediumItalic.ttf differ
diff --git a/Resources/Roboto/Roboto-Regular.ttf b/Resources/Roboto/Roboto-Regular.ttf
new file mode 100644
index 0000000..8c082c8
Binary files /dev/null and b/Resources/Roboto/Roboto-Regular.ttf differ
diff --git a/Resources/Roboto/Roboto-Thin.ttf b/Resources/Roboto/Roboto-Thin.ttf
new file mode 100644
index 0000000..d695550
Binary files /dev/null and b/Resources/Roboto/Roboto-Thin.ttf differ
diff --git a/Resources/Roboto/Roboto-ThinItalic.ttf b/Resources/Roboto/Roboto-ThinItalic.ttf
new file mode 100644
index 0000000..07172ff
Binary files /dev/null and b/Resources/Roboto/Roboto-ThinItalic.ttf differ
diff --git a/Resources/Roboto/RobotoCondensed-Bold.ttf b/Resources/Roboto/RobotoCondensed-Bold.ttf
new file mode 100644
index 0000000..fc28868
Binary files /dev/null and b/Resources/Roboto/RobotoCondensed-Bold.ttf differ
diff --git a/Resources/Roboto/RobotoCondensed-BoldItalic.ttf b/Resources/Roboto/RobotoCondensed-BoldItalic.ttf
new file mode 100644
index 0000000..e1a648f
Binary files /dev/null and b/Resources/Roboto/RobotoCondensed-BoldItalic.ttf differ
diff --git a/Resources/Roboto/RobotoCondensed-Italic.ttf b/Resources/Roboto/RobotoCondensed-Italic.ttf
new file mode 100644
index 0000000..97ff9f1
Binary files /dev/null and b/Resources/Roboto/RobotoCondensed-Italic.ttf differ
diff --git a/Resources/Roboto/RobotoCondensed-Light.ttf b/Resources/Roboto/RobotoCondensed-Light.ttf
new file mode 100644
index 0000000..2dae31e
Binary files /dev/null and b/Resources/Roboto/RobotoCondensed-Light.ttf differ
diff --git a/Resources/Roboto/RobotoCondensed-LightItalic.ttf b/Resources/Roboto/RobotoCondensed-LightItalic.ttf
new file mode 100644
index 0000000..da108d3
Binary files /dev/null and b/Resources/Roboto/RobotoCondensed-LightItalic.ttf differ
diff --git a/Resources/Roboto/RobotoCondensed-Regular.ttf b/Resources/Roboto/RobotoCondensed-Regular.ttf
new file mode 100644
index 0000000..c2304c1
Binary files /dev/null and b/Resources/Roboto/RobotoCondensed-Regular.ttf differ
diff --git a/Resources/sleep2.jpg b/Resources/sleep2.jpg
new file mode 100644
index 0000000..94557f6
Binary files /dev/null and b/Resources/sleep2.jpg differ
diff --git a/packages.config b/packages.config
new file mode 100644
index 0000000..d64707e
--- /dev/null
+++ b/packages.config
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="BouncyCastle.Cryptography" version="2.6.2" targetFramework="net48" />
+  <package id="Dapper" version="2.1.66" targetFramework="net48" />
+  <package id="EPPlus" version="4.5.3.3" targetFramework="net48" />
+  <package id="EPPlus.Interfaces" version="8.1.0" targetFramework="net48" />
+  <package id="Google.Protobuf" version="3.32.0" targetFramework="net48" />
+  <package id="K4os.Compression.LZ4" version="1.3.8" targetFramework="net48" />
+  <package id="K4os.Compression.LZ4.Streams" version="1.3.8" targetFramework="net48" />
+  <package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net48" />
+  <package id="MaterialDesignColors" version="5.3.0" targetFramework="net48" />
+  <package id="MaterialDesignThemes" version="5.3.0" targetFramework="net48" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.1" targetFramework="net48" />
+  <package id="Microsoft.IO.RecyclableMemoryStream" version="3.0.1" targetFramework="net48" />
+  <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.77" targetFramework="net48" />
+  <package id="MySql.Data" version="9.5.0" targetFramework="net48" />
+  <package id="NModbus4" version="2.1.0" targetFramework="net48" />
+  <package id="SunnyUI" version="3.8.9" targetFramework="net48" />
+  <package id="SunnyUI.Common" version="3.8.9" targetFramework="net48" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
+  <package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net48" />
+  <package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net48" />
+  <package id="System.IO.Pipelines" version="5.0.2" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Xml" version="8.0.2" targetFramework="net48" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
+  <package id="ZstdSharp.Port" version="0.8.6" targetFramework="net48" />
+</packages>
\ No newline at end of file
diff --git a/自救器呼吸器综合检验仪.csproj b/自救器呼吸器综合检验仪.csproj
new file mode 100644
index 0000000..56b8ceb
--- /dev/null
+++ b/自救器呼吸器综合检验仪.csproj
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{12DFE667-6A2E-4ED0-A1EC-C9FA8977664A}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>自救器呼吸器综合检验仪</RootNamespace>
+    <AssemblyName>自救器呼吸器综合检验仪</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    </Reference>
+    <Reference Include="Dapper, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Dapper.2.1.66\lib\net461\Dapper.dll</HintPath>
+    </Reference>
+    <Reference Include="EPPlus, Version=4.5.3.3, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
+      <HintPath>packages\EPPlus.4.5.3.3\lib\net40\EPPlus.dll</HintPath>
+    </Reference>
+    <Reference Include="Google.Protobuf, Version=3.32.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>packages\Google.Protobuf.3.32.0\lib\net45\Google.Protobuf.dll</HintPath>
+    </Reference>
+    <Reference Include="K4os.Compression.LZ4, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+      <HintPath>packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll</HintPath>
+    </Reference>
+    <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+      <HintPath>packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
+    </Reference>
+    <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
+      <HintPath>packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignColors, Version=5.3.0.0, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
+      <HintPath>packages\MaterialDesignColors.5.3.0\lib\net462\MaterialDesignColors.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignThemes.Wpf, Version=5.3.0.0, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
+      <HintPath>packages\MaterialDesignThemes.5.3.0\lib\net462\MaterialDesignThemes.Wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.IO.RecyclableMemoryStream.3.0.1\lib\netstandard2.0\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Xaml.Behaviors.Wpf.1.1.77\lib\net462\Microsoft.Xaml.Behaviors.dll</HintPath>
+    </Reference>
+    <Reference Include="MySql.Data, Version=9.5.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>packages\MySql.Data.9.5.0\lib\net48\MySql.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="NModbus4, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\NModbus4.2.1.0\lib\net40\NModbus4.dll</HintPath>
+    </Reference>
+    <Reference Include="SunnyUI, Version=3.8.9.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
+      <HintPath>packages\SunnyUI.3.8.9\lib\net472\SunnyUI.dll</HintPath>
+    </Reference>
+    <Reference Include="SunnyUI.Common, Version=3.8.9.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
+      <HintPath>packages\SunnyUI.Common.3.8.9\lib\net472\SunnyUI.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Pipelines, Version=5.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.IO.Pipelines.5.0.2\lib\net461\System.IO.Pipelines.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Xml, Version=8.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Security.Cryptography.Xml.8.0.2\lib\net462\System.Security.Cryptography.Xml.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="ZstdSharp, Version=0.8.6.0, Culture=neutral, PublicKeyToken=8d151af33a4ad5cf, processorArchitecture=MSIL">
+      <HintPath>packages\ZstdSharp.Port.0.8.6\lib\net462\ZstdSharp.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="Data\BaseWindow.xaml.cs">
+      <DependentUpon>BaseWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Data\ModbusResourceManager.cs" />
+    <Compile Include="DetectionMenuWindow.xaml.cs">
+      <DependentUpon>DetectionMenuWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ParameterSettingsWindow.xaml.cs">
+      <DependentUpon>ParameterSettingsWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ReportWindow4.xaml.cs">
+      <DependentUpon>ReportWindow4.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ReportWindow3.xaml.cs">
+      <DependentUpon>ReportWindow3.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ReportWindow2.xaml.cs">
+      <DependentUpon>ReportWindow2.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ReportWindow.xaml.cs">
+      <DependentUpon>ReportWindow.xaml</DependentUpon>
+    </Compile>
+    <Page Include="Data\BaseWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MainViewModel.cs" />
+    <Compile Include="MainWindow2.xaml.cs">
+      <DependentUpon>MainWindow2.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainWindow3.xaml.cs">
+      <DependentUpon>MainWindow3.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainWindow4.xaml.cs">
+      <DependentUpon>MainWindow4.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="NotifyPropertyChangedBase.cs" />
+    <Compile Include="Data\BoolSign.cs" />
+    <Compile Include="Data\DataChange.cs" />
+    <Compile Include="Data\ExperData.cs" />
+    <Compile Include="Data\Function.cs" />
+    <Compile Include="Data\keyboard.cs" />
+    <Compile Include="Data\LoginData.cs" />
+    <Compile Include="Data\PLC_Data.cs" />
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Page Include="DetectionMenuWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainWindow2.xaml">
+      <SubType>Designer</SubType>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
+    </Page>
+    <Page Include="MainWindow3.xaml">
+      <SubType>Designer</SubType>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
+    </Page>
+    <Page Include="MainWindow4.xaml">
+      <SubType>Designer</SubType>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
+    </Page>
+    <Page Include="ParameterSettingsWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ReportWindow4.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ReportWindow3.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ReportWindow2.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ReportWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Resource Include="Resources\Noto\NotoSans-Bold.ttf" />
+    <Resource Include="Resources\Noto\NotoSans-BoldItalic.ttf" />
+    <Resource Include="Resources\Noto\NotoSans-Italic.ttf" />
+    <Resource Include="Resources\Noto\NotoSans-Regular.ttf" />
+    <Resource Include="Resources\Roboto\Roboto-Black.ttf" />
+    <Resource Include="Resources\Roboto\Roboto-BlackItalic.ttf" />
+    <Resource Include="Resources\Roboto\Roboto-Bold.ttf" />
+    <Resource Include="Resources\Roboto\Roboto-BoldItalic.ttf" />
+    <Resource Include="Resources\Roboto\Roboto-Italic.ttf" />
+    <Resource Include="Resources\Roboto\Roboto-Light.ttf" />
+    <Resource Include="Resources\Roboto\Roboto-LightItalic.ttf" />
+    <Resource Include="Resources\Roboto\Roboto-Medium.ttf" />
+    <Resource Include="Resources\Roboto\Roboto-MediumItalic.ttf" />
+    <Resource Include="Resources\Roboto\Roboto-Regular.ttf" />
+    <Resource Include="Resources\Roboto\Roboto-Thin.ttf" />
+    <Resource Include="Resources\Roboto\Roboto-ThinItalic.ttf" />
+    <Resource Include="Resources\Roboto\RobotoCondensed-Bold.ttf" />
+    <Resource Include="Resources\Roboto\RobotoCondensed-BoldItalic.ttf" />
+    <Resource Include="Resources\Roboto\RobotoCondensed-Italic.ttf" />
+    <Resource Include="Resources\Roboto\RobotoCondensed-Light.ttf" />
+    <Resource Include="Resources\Roboto\RobotoCondensed-LightItalic.ttf" />
+    <Resource Include="Resources\Roboto\RobotoCondensed-Regular.ttf" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\sleep2.jpg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="packages\MaterialDesignThemes.5.3.0\build\MaterialDesignThemes.targets" Condition="Exists('packages\MaterialDesignThemes.5.3.0\build\MaterialDesignThemes.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\MaterialDesignThemes.5.3.0\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\MaterialDesignThemes.5.3.0\build\MaterialDesignThemes.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/自救器呼吸器综合检验仪.sln b/自救器呼吸器综合检验仪.sln
new file mode 100644
index 0000000..8561ee4
--- /dev/null
+++ b/自救器呼吸器综合检验仪.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.36327.8
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "自救器呼吸器综合检验仪", "自救器呼吸器综合检验仪.csproj", "{12DFE667-6A2E-4ED0-A1EC-C9FA8977664A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{12DFE667-6A2E-4ED0-A1EC-C9FA8977664A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12DFE667-6A2E-4ED0-A1EC-C9FA8977664A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12DFE667-6A2E-4ED0-A1EC-C9FA8977664A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12DFE667-6A2E-4ED0-A1EC-C9FA8977664A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B7D72910-5912-4E27-943A-131EFE5DB895}
+	EndGlobalSection
+EndGlobal