From 4a18b570a0828e52afd3ca8b7aabec3e2030e4b1 Mon Sep 17 00:00:00 2001 From: hanqiangqiang <1364346467@qq.com> Date: Tue, 1 Sep 2026 08:59:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EIO=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=83=AD=E5=B8=A6=E9=85=8D=E7=BD=AE=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=20=E4=BF=AE=E6=94=B9=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Config/PM/PM1/DeviceModelPM1.xml | 7 +- .../SicModules/Config/PM/PM1/_ioDefinePM1.xml | 4 + .../SicModules/Config/PM/PM2/_ioDefinePM2.xml | 4 + App/SicRT/Config/System.sccfg | 4 + App/SicRT/Properties/AssemblyInfo.cs | 2 +- App/SicSimulator/Config/_ioDefinePM.xml | 4 + App/SicUI/Properties/AssemblyInfo.cs | 2 +- .../Core/Common/DeviceData/GasFlowSum.cs | 7 + .../CenterViews/Modules/PM/PMHeaterView.xaml | 180 ++++++++++++++---- .../Modules/PM/PMHeaterViewModel.cs | 13 ++ .../Modules/PM/PMProcessViewModel.cs | 10 +- 11 files changed, 197 insertions(+), 40 deletions(-) diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml index ead3dd3..e9b4e5e 100644 --- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml @@ -373,6 +373,11 @@ + + + + + @@ -418,7 +423,7 @@ - + diff --git a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml index 3d1fb29..b63cc5d 100644 --- a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml @@ -515,6 +515,10 @@ + + + + diff --git a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml index a1b5e0c..1600747 100644 --- a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml +++ b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml @@ -502,6 +502,10 @@ + + + + diff --git a/App/SicRT/Config/System.sccfg b/App/SicRT/Config/System.sccfg index 550eede..eb61d7e 100644 --- a/App/SicRT/Config/System.sccfg +++ b/App/SicRT/Config/System.sccfg @@ -1205,6 +1205,10 @@ + + + + diff --git a/App/SicRT/Properties/AssemblyInfo.cs b/App/SicRT/Properties/AssemblyInfo.cs index 3111b69..a5edcb8 100644 --- a/App/SicRT/Properties/AssemblyInfo.cs +++ b/App/SicRT/Properties/AssemblyInfo.cs @@ -51,7 +51,7 @@ using System.Windows; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : -[assembly: AssemblyVersion("1.1.0.60826")] +[assembly: AssemblyVersion("1.1.0.60828")] [assembly: AssemblyInformationalVersion("MoS2(无EFEM)")] diff --git a/App/SicSimulator/Config/_ioDefinePM.xml b/App/SicSimulator/Config/_ioDefinePM.xml index 41bb86d..55a3498 100644 --- a/App/SicSimulator/Config/_ioDefinePM.xml +++ b/App/SicSimulator/Config/_ioDefinePM.xml @@ -515,6 +515,10 @@ + + + + diff --git a/App/SicUI/Properties/AssemblyInfo.cs b/App/SicUI/Properties/AssemblyInfo.cs index dd1b3ad..d114446 100644 --- a/App/SicUI/Properties/AssemblyInfo.cs +++ b/App/SicUI/Properties/AssemblyInfo.cs @@ -55,6 +55,6 @@ using System.Windows; // by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.0.60826")] +[assembly: AssemblyVersion("1.1.0.60828")] [assembly: AssemblyInformationalVersion("MoS2(无EFEM)")] diff --git a/Framework/MECF.Framework.Common/Aitex/Core/Common/DeviceData/GasFlowSum.cs b/Framework/MECF.Framework.Common/Aitex/Core/Common/DeviceData/GasFlowSum.cs index dd0dccf..da2340d 100644 --- a/Framework/MECF.Framework.Common/Aitex/Core/Common/DeviceData/GasFlowSum.cs +++ b/Framework/MECF.Framework.Common/Aitex/Core/Common/DeviceData/GasFlowSum.cs @@ -60,5 +60,12 @@ namespace MECF.Framework.Common.Aitex.Core.Common.DeviceData InvokePropertyChanged(); } } + + public void Clear() + { + _runVolume = 0; + _ventVolume = 0; + _volume = 0; + } } } diff --git a/Framework/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMHeaterView.xaml b/Framework/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMHeaterView.xaml index 46e9477..e14fdd6 100644 --- a/Framework/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMHeaterView.xaml +++ b/Framework/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMHeaterView.xaml @@ -2,17 +2,17 @@ x:Class="MECF.Framework.UI.Client.CenterViews.Modules.PM.PMHeaterView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:cal="clr-namespace:Caliburn.Micro" + xmlns:controls="clr-namespace:OpenSEMI.Ctrlib.Controls" + xmlns:converters="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:lex="http://wpflocalizeextension.codeplex.com" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:cal="clr-namespace:Caliburn.Micro" - xmlns:view="clr-namespace:MECF.Framework.UI.Client.CenterViews.Modules.PM" - xmlns:controls="clr-namespace:OpenSEMI.Ctrlib.Controls" - xmlns:converters="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core" - xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:rt="clr-namespace:Aitex.Core.RT.Device.PmDevices;assembly=MECF.Framework.RT.EquipmentLibrary" + xmlns:sys="clr-namespace:System;assembly=mscorlib" + xmlns:view="clr-namespace:MECF.Framework.UI.Client.CenterViews.Modules.PM" d:Background="#91b0cd" d:DataContext="{d:DesignInstance Type=view:PMHeaterViewModel, IsDesignTimeCreatable=False}" @@ -21,16 +21,18 @@ lex:LocalizeDictionary.DesignCulture="zh" lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization" lex:ResxLocalizationProvider.DefaultDictionary="lang_pm_heater" - mc:Ignorable="d" - SnapsToDevicePixels="True"> - + SnapsToDevicePixels="True" + mc:Ignorable="d"> + - - - + + + - + @@ -693,8 +695,8 @@ BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1">