From 1aad18aee265300321d76612be0fd9b614b49a32 Mon Sep 17 00:00:00 2001 From: hanqiangqiang <1364346467@qq.com> Date: Wed, 29 Jul 2026 16:53:26 +0800 Subject: [PATCH] =?UTF-8?q?1.PC=E9=85=8D=E7=BD=AE=E3=80=81=E4=BB=BF?= =?UTF-8?q?=E7=9C=9F=E9=85=8D=E7=BD=AE=202.=E4=BF=AE=E6=94=B9PC=E4=BB=BF?= =?UTF-8?q?=E7=9C=9F=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=203.=E6=95=B4?= =?UTF-8?q?=E7=90=86=E6=B0=94=E8=B7=AF=E7=95=8C=E9=9D=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=92=8C=E5=90=8E=E5=8F=B0=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=204.=E4=BF=AE=E6=94=B9IO=E8=A1=A8=E4=B8=ADPC=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Config/PM/PM1/DeviceModelPM1.xml | 13 +++ .../SicModules/Config/PM/PM1/_ioDefinePM1.xml | 102 ++++++++++-------- .../SicModules/Config/PM/PM2/_ioDefinePM2.xml | 18 ++-- App/SicSimulator/Config/DevicePM.xml | 19 +++- App/SicSimulator/Config/_ioDefinePM.xml | 84 ++++++++------- App/SicUI/Models/PMs/PMOperationView.xaml | 20 ++-- App/SicUI/Models/PMs/PMOperationViewModel.cs | 36 +++---- .../IoPressure/SimulatorPressure.cs | 2 +- 8 files changed, 173 insertions(+), 121 deletions(-) diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml index 6964e5e..d280dbd 100644 --- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml @@ -121,4 +121,17 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml index f07404d..42032b9 100644 --- a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml @@ -281,15 +281,15 @@ - - - - - - - - - + + + + + + + + + @@ -509,13 +509,15 @@ - - - - - - - + + + + + + + + + @@ -530,13 +532,17 @@ - - - - - - - + + + + + + + + + + + @@ -584,15 +590,17 @@ - - - - - - - + + + + + + + + + - + @@ -719,13 +727,15 @@ - - - - - - - + + + + + + + + + @@ -771,13 +781,15 @@ - - - - - - - + + + + + + + + + diff --git a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml index 7514d67..59660b5 100644 --- a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml +++ b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml @@ -281,15 +281,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/App/SicSimulator/Config/DevicePM.xml b/App/SicSimulator/Config/DevicePM.xml index 7f2b938..e0a658e 100644 --- a/App/SicSimulator/Config/DevicePM.xml +++ b/App/SicSimulator/Config/DevicePM.xml @@ -195,7 +195,22 @@ - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/App/SicSimulator/Config/_ioDefinePM.xml b/App/SicSimulator/Config/_ioDefinePM.xml index f07404d..5184125 100644 --- a/App/SicSimulator/Config/_ioDefinePM.xml +++ b/App/SicSimulator/Config/_ioDefinePM.xml @@ -509,13 +509,15 @@ - - - - - - - + + + + + + + + + @@ -530,13 +532,17 @@ - - - - - - - + + + + + + + + + + + @@ -584,15 +590,17 @@ - - - - - - - + + + + + + + + + - + @@ -719,13 +727,15 @@ - - - - - - - + + + + + + + + + @@ -771,13 +781,15 @@ - - - - - - - + + + + + + + + + diff --git a/App/SicUI/Models/PMs/PMOperationView.xaml b/App/SicUI/Models/PMs/PMOperationView.xaml index e3eeeb7..320029a 100644 --- a/App/SicUI/Models/PMs/PMOperationView.xaml +++ b/App/SicUI/Models/PMs/PMOperationView.xaml @@ -2904,27 +2904,27 @@ Height="25" Margin="0,0,89,0" BackColor="Blue" - DeviceData="{Binding PT3Data}" + DeviceData="{Binding PC3}" HideDialog="false" /> @@ -3659,7 +3659,7 @@ Width="54" Height="25" BackColor="Blue" - DeviceData="{Binding PT5Data}" + DeviceData="{Binding PC5}" HideDialog="false" /> + DeviceData="{Binding PC1}" + HideDialog="true" /> diff --git a/App/SicUI/Models/PMs/PMOperationViewModel.cs b/App/SicUI/Models/PMs/PMOperationViewModel.cs index 0ded127..d5a4a71 100644 --- a/App/SicUI/Models/PMs/PMOperationViewModel.cs +++ b/App/SicUI/Models/PMs/PMOperationViewModel.cs @@ -206,29 +206,29 @@ namespace SicUI.Models.PMs #endregion #region Pressure - [Subscription("Pressure1.DeviceData")] - public AITPressureMeterData PT1Data { get; set; } + [Subscription("PC1.DeviceData")] + public AITPressureMeterData PC1 { get; set; } - [Subscription("Pressure2.DeviceData")] - public AITPressureMeterData PT2Data { get; set; } - [Subscription("Pressure3.DeviceData")] - public AITPressureMeterData PT3Data { get; set; } + [Subscription("PC2.DeviceData")] + public AITPressureMeterData PC2 { get; set; } + [Subscription("PC3.DeviceData")] + public AITPressureMeterData PC3 { get; set; } - [Subscription("Pressure4.DeviceData")] - public AITPressureMeterData PT4Data { get; set; } - [Subscription("Pressure5.DeviceData")] - public AITPressureMeterData PT5Data { get; set; } - [Subscription("Pressure6.DeviceData")] - public AITPressureMeterData PT6Data { get; set; } + [Subscription("PC4.DeviceData")] + public AITPressureMeterData PC4 { get; set; } + [Subscription("PC5.DeviceData")] + public AITPressureMeterData PC5 { get; set; } + [Subscription("PC6.DeviceData")] + public AITPressureMeterData PC6 { get; set; } - [Subscription("Pressure7.DeviceData")] - public AITPressureMeterData PT7Data { get; set; } + [Subscription("PC7.DeviceData")] + public AITPressureMeterData PC7 { get; set; } - [Subscription("Pressure8.DeviceData")] - public AITPressureMeterData PT8Data { get; set; } - [Subscription("Pressure9.DeviceData")] - public AITPressureMeterData PT9Data { get; set; } + [Subscription("PC8.DeviceData")] + public AITPressureMeterData PC8 { get; set; } + [Subscription("PC9.DeviceData")] + public AITPressureMeterData PC9 { get; set; } [Subscription("PT1.DeviceData")] public AITPressureMeterData ChamPress { get; set; } diff --git a/Framework/SimulatorCore/IoPressure/SimulatorPressure.cs b/Framework/SimulatorCore/IoPressure/SimulatorPressure.cs index 7e0db33..91b7fbe 100644 --- a/Framework/SimulatorCore/IoPressure/SimulatorPressure.cs +++ b/Framework/SimulatorCore/IoPressure/SimulatorPressure.cs @@ -24,7 +24,7 @@ namespace MECF.Framework.Simulator.Core /// protected override void InitializeIValve(XmlElement node) { - XmlNodeList valveNodes = node.GetElementsByTagName("IoPressureMeter"); + XmlNodeList valveNodes = node.GetElementsByTagName("IoPressure"); foreach (XmlElement xmlElement in valveNodes) { string aiValue = xmlElement.GetAttribute("aiValue");