新增加热带配置和数据显示
更新版本号
修改流量统计
This commit is contained in:
hanqiangqiang
2026-09-01 08:59:34 +08:00
parent cb8aaad77a
commit 4a18b570a0
11 changed files with 197 additions and 40 deletions
@@ -373,6 +373,11 @@
<IoGasBoxTemp id="HeatoutsidePanelTemp" display="outsidePanelTemp(ATC-4)" aiHeatTMA="AI_HeatoutsidePanel" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区4" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/> <IoGasBoxTemp id="HeatoutsidePanelTemp" display="outsidePanelTemp(ATC-4)" aiHeatTMA="AI_HeatoutsidePanel" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区4" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatoutsideSHTemp" display="outsideSHTemp(ATC-5)" aiHeatTMA="AI_HeatoutsideSH" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区5" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/> <IoGasBoxTemp id="HeatoutsideSHTemp" display="outsideSHTemp(ATC-5)" aiHeatTMA="AI_HeatoutsideSH" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区5" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatLeakBypassTemp" display="LeakBypassTemp(ATC-6)" aiHeatTMA="AI_HeatLeakBypass" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区6" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/> <IoGasBoxTemp id="HeatLeakBypassTemp" display="LeakBypassTemp(ATC-6)" aiHeatTMA="AI_HeatLeakBypass" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区6" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatH2SPipingTemp" display="LeakBypassTemp(ATC-7)" aiHeatTMA="AI_HeatH2SPiping" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区7" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatH2SePipingTemp" display="LeakBypassTemp(ATC-8)" aiHeatTMA="AI_HeatH2SePiping" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区8" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatSO2PipingTemp" display="LeakBypassTemp(ATC-9)" aiHeatTMA="AI_HeatSO2Piping" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区9" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatO2PipingTemp" display="LeakBypassTemp(ATC-10)" aiHeatTMA="AI_HeatO2Piping" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区10" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
</IoGasBoxTemps> </IoGasBoxTemps>
<IoPumps classType="Aitex.Core.RT.Device.Devices.IoPump" assembly="MECF.Framework.RT.EquipmentLibrary"> <IoPumps classType="Aitex.Core.RT.Device.Devices.IoPump" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoPump id="Pump" module="" display="Pump" schematicId="Pump" unit="" aioType="" diDryPumpAlarm="DI_DryPumpAlarm" diPumpExhaustPress="DI_PumpExhaustPressSW" diDryPumpFlow="DI_DryPumpFlowSW" diDryPump1Running="DI_DryPump1Running" diDryPump1Warning="DI_DryPump1Warning" /> <IoPump id="Pump" module="" display="Pump" schematicId="Pump" unit="" aioType="" diDryPumpAlarm="DI_DryPumpAlarm" diPumpExhaustPress="DI_PumpExhaustPressSW" diDryPumpFlow="DI_DryPumpFlowSW" diDryPump1Running="DI_DryPump1Running" diDryPump1Warning="DI_DryPump1Warning" />
@@ -418,7 +423,7 @@
<IoSensor id="SensorChamAtSafeProcessPressSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_ChamAtSafeProcessPressSW" infoText="Information1 Chamber At Safe Process Press [DI-5]" warningText="" alarmText="" /> <IoSensor id="SensorChamAtSafeProcessPressSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_ChamAtSafeProcessPressSW" infoText="Information1 Chamber At Safe Process Press [DI-5]" warningText="" alarmText="" />
<IoSensor id="SensorDORPressVacSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_DORPressVacSW" infoText="Information2 DOR Press Vac [DI-6]" warningText="" alarmText="" /> <IoSensor id="SensorDORPressVacSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_DORPressVacSW" infoText="Information2 DOR Press Vac [DI-6]" warningText="" alarmText="" />
<IoSensor id="SensorDORPressATMSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_DORPressATMSW" infoText="" warningText="Warning4 DOR Press ATM [DI-7]" alarmText="" /> <IoSensor id="SensorDORPressATMSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_DORPressATMSW" infoText="" warningText="Warning4 DOR Press ATM [DI-7]" alarmText="" />
<IoSensor id="SensorPMH2SDetector1SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMH2SDetector1SW" infoText="" warningText="" alarmText="Alarm3 PM H2 Leak Detect [DI-8]" /> <IoSensor id="SensorPMH2SDetector1SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMH2SDetector1SW" infoText="" warningText="" alarmText="Alarm3 PM H2 Detector [DI-8]" />
<IoSensor id="SensorPMATMSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMATMSW" infoText="Information3 PM At ATM [DI-9]" warningText="" alarmText="" /> <IoSensor id="SensorPMATMSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMATMSW" infoText="Information3 PM At ATM [DI-9]" warningText="" alarmText="" />
<IoSensor id="SensorHeaterTempUpLimitSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_HeaterTempUpLimitSW" infoText="" warningText="" alarmText="Alarm4 Heater Controller1 Present Temp High [DI-10]" /> <IoSensor id="SensorHeaterTempUpLimitSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_HeaterTempUpLimitSW" infoText="" warningText="" alarmText="Alarm4 Heater Controller1 Present Temp High [DI-10]" />
<IoSensor id="SensorHeaterTempLowLimitSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_HeaterTempLowLimitSW" infoText="Information4 Heater Temp Below 900C [DI-11]" warningText="" alarmText="" /> <IoSensor id="SensorHeaterTempLowLimitSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_HeaterTempLowLimitSW" infoText="Information4 Heater Temp Below 900C [DI-11]" warningText="" alarmText="" />
@@ -515,6 +515,10 @@
<AI_ITEM Index="23" Name="AI_HeatoutsidePanel" BufferOffset="23" Addr="23" Description="" /> <AI_ITEM Index="23" Name="AI_HeatoutsidePanel" BufferOffset="23" Addr="23" Description="" />
<AI_ITEM Index="24" Name="AI_HeatoutsideSH" BufferOffset="24" Addr="24" Description="" /> <AI_ITEM Index="24" Name="AI_HeatoutsideSH" BufferOffset="24" Addr="24" Description="" />
<AI_ITEM Index="25" Name="AI_HeatLeakBypass" BufferOffset="25" Addr="25" Description="" /> <AI_ITEM Index="25" Name="AI_HeatLeakBypass" BufferOffset="25" Addr="25" Description="" />
<AI_ITEM Index="26" Name="AI_HeatH2SPiping" BufferOffset="26" Addr="26" Description="" />
<AI_ITEM Index="27" Name="AI_HeatH2SePiping" BufferOffset="27" Addr="27" Description="" />
<AI_ITEM Index="28" Name="AI_HeatSO2Piping" BufferOffset="28" Addr="28" Description="" />
<AI_ITEM Index="29" Name="AI_HeatO2Piping" BufferOffset="29" Addr="29" Description="" />
<AI_ITEM Index="32" Name="AI_M1" BufferOffset="32" Addr="32" Description="" /> <AI_ITEM Index="32" Name="AI_M1" BufferOffset="32" Addr="32" Description="" />
<AI_ITEM Index="34" Name="AI_M3" BufferOffset="34" Addr="34" Description="" /> <AI_ITEM Index="34" Name="AI_M3" BufferOffset="34" Addr="34" Description="" />
<AI_ITEM Index="35" Name="AI_M4" BufferOffset="35" Addr="35" Description="" /> <AI_ITEM Index="35" Name="AI_M4" BufferOffset="35" Addr="35" Description="" />
@@ -502,6 +502,10 @@
<AI_ITEM Index="23" Name="AI_HeatoutsidePanel" BufferOffset="23" Addr="23" Description="" /> <AI_ITEM Index="23" Name="AI_HeatoutsidePanel" BufferOffset="23" Addr="23" Description="" />
<AI_ITEM Index="24" Name="AI_HeatoutsideSH" BufferOffset="24" Addr="24" Description="" /> <AI_ITEM Index="24" Name="AI_HeatoutsideSH" BufferOffset="24" Addr="24" Description="" />
<AI_ITEM Index="25" Name="AI_HeatLeakBypass" BufferOffset="25" Addr="25" Description="" /> <AI_ITEM Index="25" Name="AI_HeatLeakBypass" BufferOffset="25" Addr="25" Description="" />
<AI_ITEM Index="26" Name="AI_HeatH2SPiping" BufferOffset="26" Addr="26" Description="" />
<AI_ITEM Index="27" Name="AI_HeatH2SePiping" BufferOffset="27" Addr="27" Description="" />
<AI_ITEM Index="28" Name="AI_HeatSO2Piping" BufferOffset="28" Addr="28" Description="" />
<AI_ITEM Index="29" Name="AI_HeatO2Piping" BufferOffset="29" Addr="29" Description="" />
<AI_ITEM Index="32" Name="AI_M1" BufferOffset="32" Addr="32" Description="" /> <AI_ITEM Index="32" Name="AI_M1" BufferOffset="32" Addr="32" Description="" />
<AI_ITEM Index="34" Name="AI_M3" BufferOffset="34" Addr="34" Description="" /> <AI_ITEM Index="34" Name="AI_M3" BufferOffset="34" Addr="34" Description="" />
<AI_ITEM Index="35" Name="AI_M4" BufferOffset="35" Addr="35" Description="" /> <AI_ITEM Index="35" Name="AI_M4" BufferOffset="35" Addr="35" Description="" />
+4
View File
@@ -1205,6 +1205,10 @@
<config default="70" name="加热带温区4" description="HeatoutsidePane 温度上限,设为0忽略报警" max="100" min="0" paramter="" tag="" unit="℃" type="Double" /> <config default="70" name="加热带温区4" description="HeatoutsidePane 温度上限,设为0忽略报警" max="100" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="70" name="加热带温区5" description="HeatoutsideSH 温度上限,设为0忽略报警" max="100" min="0" paramter="" tag="" unit="℃" type="Double" /> <config default="70" name="加热带温区5" description="HeatoutsideSH 温度上限,设为0忽略报警" max="100" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="70" name="加热带温区6" description="HeatLeakBypass 温度上限,设为0忽略报警" max="100" min="0" paramter="" tag="" unit="℃" type="Double" /> <config default="70" name="加热带温区6" description="HeatLeakBypass 温度上限,设为0忽略报警" max="100" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="70" name="加热带温区7" description="HeatLeakBypass 温度上限,设为0忽略报警" max="100" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="70" name="加热带温区8" description="HeatLeakBypass 温度上限,设为0忽略报警" max="100" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="70" name="加热带温区9" description="HeatLeakBypass 温度上限,设为0忽略报警" max="100" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="70" name="加热带温区10" description="HeatLeakBypass 温度上限,设为0忽略报警" max="100" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="0" name="PumpLineTempLimt" description="PumpLineTempLimt 温度上限,设为0忽略报警" max="200" min="0" paramter="" tag="" unit="℃" type="Double" /> <config default="0" name="PumpLineTempLimt" description="PumpLineTempLimt 温度上限,设为0忽略报警" max="200" min="0" paramter="" tag="" unit="℃" type="Double" />
<config default="Warning" name="PumpLineTempAlarm" description="报警等级(加热带温区1-6固定为Warning)" max="" min="" paramter="Warning;Alarm" tag="ReadOnlySelection" unit="" type="String" visible="true" /> <config default="Warning" name="PumpLineTempAlarm" description="报警等级(加热带温区1-6固定为Warning)" max="" min="" paramter="Warning;Alarm" tag="ReadOnlySelection" unit="" type="String" visible="true" />
+1 -1
View File
@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
[assembly: AssemblyVersion("1.1.0.60826")] [assembly: AssemblyVersion("1.1.0.60828")]
[assembly: AssemblyInformationalVersion("MoS2(无EFEM)")] [assembly: AssemblyInformationalVersion("MoS2(无EFEM)")]
+4
View File
@@ -515,6 +515,10 @@
<AI_ITEM Index="23" Name="AI_HeatoutsidePanel" BufferOffset="23" Addr="23" Description="" /> <AI_ITEM Index="23" Name="AI_HeatoutsidePanel" BufferOffset="23" Addr="23" Description="" />
<AI_ITEM Index="24" Name="AI_HeatoutsideSH" BufferOffset="24" Addr="24" Description="" /> <AI_ITEM Index="24" Name="AI_HeatoutsideSH" BufferOffset="24" Addr="24" Description="" />
<AI_ITEM Index="25" Name="AI_HeatLeakBypass" BufferOffset="25" Addr="25" Description="" /> <AI_ITEM Index="25" Name="AI_HeatLeakBypass" BufferOffset="25" Addr="25" Description="" />
<AI_ITEM Index="26" Name="AI_HeatH2SPiping" BufferOffset="26" Addr="26" Description="" />
<AI_ITEM Index="27" Name="AI_HeatH2SePiping" BufferOffset="27" Addr="27" Description="" />
<AI_ITEM Index="28" Name="AI_HeatSO2Piping" BufferOffset="28" Addr="28" Description="" />
<AI_ITEM Index="29" Name="AI_HeatO2Piping" BufferOffset="29" Addr="29" Description="" />
<AI_ITEM Index="32" Name="AI_M1" BufferOffset="32" Addr="32" Description="" /> <AI_ITEM Index="32" Name="AI_M1" BufferOffset="32" Addr="32" Description="" />
<AI_ITEM Index="34" Name="AI_M3" BufferOffset="34" Addr="34" Description="" /> <AI_ITEM Index="34" Name="AI_M3" BufferOffset="34" Addr="34" Description="" />
<AI_ITEM Index="35" Name="AI_M4" BufferOffset="35" Addr="35" Description="" /> <AI_ITEM Index="35" Name="AI_M4" BufferOffset="35" Addr="35" Description="" />
+1 -1
View File
@@ -55,6 +55,6 @@ using System.Windows;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.1.0.60826")] [assembly: AssemblyVersion("1.1.0.60828")]
[assembly: AssemblyInformationalVersion("MoS2(无EFEM)")] [assembly: AssemblyInformationalVersion("MoS2(无EFEM)")]
@@ -60,5 +60,12 @@ namespace MECF.Framework.Common.Aitex.Core.Common.DeviceData
InvokePropertyChanged(); InvokePropertyChanged();
} }
} }
public void Clear()
{
_runVolume = 0;
_ventVolume = 0;
_volume = 0;
}
} }
} }
@@ -2,17 +2,17 @@
x:Class="MECF.Framework.UI.Client.CenterViews.Modules.PM.PMHeaterView" x:Class="MECF.Framework.UI.Client.CenterViews.Modules.PM.PMHeaterView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 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:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core" xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:lex="http://wpflocalizeextension.codeplex.com" xmlns:lex="http://wpflocalizeextension.codeplex.com"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 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: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:Background="#91b0cd"
d:DataContext="{d:DesignInstance Type=view:PMHeaterViewModel, d:DataContext="{d:DesignInstance Type=view:PMHeaterViewModel,
IsDesignTimeCreatable=False}" IsDesignTimeCreatable=False}"
@@ -21,16 +21,18 @@
lex:LocalizeDictionary.DesignCulture="zh" lex:LocalizeDictionary.DesignCulture="zh"
lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization" lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization"
lex:ResxLocalizationProvider.DefaultDictionary="lang_pm_heater" lex:ResxLocalizationProvider.DefaultDictionary="lang_pm_heater"
mc:Ignorable="d" SnapsToDevicePixels="True"
SnapsToDevicePixels="True"> mc:Ignorable="d">
<UserControl.Resources> <UserControl.Resources>
<converters:DoubleToStringConverter x:Key="DoubleToStringConverter"/> <converters:DoubleToStringConverter x:Key="DoubleToStringConverter" />
<converters:EnumDisplayConverter x:Key="EnumDisplayConverter"/> <converters:EnumDisplayConverter x:Key="EnumDisplayConverter" />
<ObjectDataProvider x:Key="EnumHeatStrategy" MethodName="GetValues" <ObjectDataProvider
ObjectType="{x:Type sys:Enum}"> x:Key="EnumHeatStrategy"
MethodName="GetValues"
ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters> <ObjectDataProvider.MethodParameters>
<x:Type TypeName="rt:HeatStrategy"/> <x:Type TypeName="rt:HeatStrategy" />
</ObjectDataProvider.MethodParameters> </ObjectDataProvider.MethodParameters>
</ObjectDataProvider> </ObjectDataProvider>
</UserControl.Resources> </UserControl.Resources>
@@ -693,8 +695,8 @@
BorderBrush="{DynamicResource Table_BD}" BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1"> BorderThickness="1,0,1,1">
<Label <Label
VerticalContentAlignment="Center"
HorizontalContentAlignment="Right" HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="{lex:Loc ID_TXT_Heater_Mode}" Content="{lex:Loc ID_TXT_Heater_Mode}"
FontSize="14" /> FontSize="14" />
</Border> </Border>
@@ -707,9 +709,10 @@
Background="{DynamicResource Table_BG_Content}" Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}" BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1"> BorderThickness="0,0,1,1">
<Label HorizontalContentAlignment="Center" <Label
VerticalContentAlignment="Center" HorizontalContentAlignment="Center"
FontSize="14"> VerticalContentAlignment="Center"
FontSize="14">
<TextBlock Text="{lex:Loc {Binding HeaterModeSP, FallbackValue=Unknown}}" /> <TextBlock Text="{lex:Loc {Binding HeaterModeSP, FallbackValue=Unknown}}" />
</Label> </Label>
</Border> </Border>
@@ -1090,8 +1093,11 @@
Background="{DynamicResource Table_BG_Content}" Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}" BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,1,1,1"> BorderThickness="0,1,1,1">
<Label HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="14"> <Label
<TextBlock Text="{lex:Loc {Binding HeaterModeSP, FallbackValue=Unknown}}" VerticalAlignment="Center" /> HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontSize="14">
<TextBlock VerticalAlignment="Center" Text="{lex:Loc {Binding HeaterModeSP, FallbackValue=Unknown}}" />
</Label> </Label>
</Border> </Border>
<Border <Border
@@ -1101,12 +1107,10 @@
Background="{DynamicResource Table_BG_Content}" Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}" BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,1,1,1"> BorderThickness="0,1,1,1">
<ComboBox <ComboBox ItemsSource="{Binding Source={StaticResource EnumHeatStrategy}}" SelectedItem="{Binding SelectedPSUHeatStrategy}">
ItemsSource="{Binding Source={StaticResource EnumHeatStrategy}}"
SelectedItem="{Binding SelectedPSUHeatStrategy}" >
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding Converter={StaticResource EnumDisplayConverter}}"/> <TextBlock Text="{Binding Converter={StaticResource EnumDisplayConverter}}" />
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
@@ -1466,7 +1470,7 @@
Padding="5,1" Padding="5,1"
Background="{DynamicResource Table_BG_Content}" Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}" BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1"/> BorderThickness="0,0,1,1" />
<Border <Border
Grid.Row="20" Grid.Row="20"
@@ -1498,7 +1502,7 @@
Padding="5,1" Padding="5,1"
Background="{DynamicResource Table_BG_Content}" Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}" BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1"/> BorderThickness="0,0,1,1" />
<Border <Border
Grid.Row="21" Grid.Row="21"
@@ -1531,7 +1535,7 @@
Padding="5,1" Padding="5,1"
Background="{DynamicResource Table_BG_Content}" Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}" BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1"/> BorderThickness="0,0,1,1" />
<Border <Border
@@ -1565,7 +1569,7 @@
Padding="5,1" Padding="5,1"
Background="{DynamicResource Table_BG_Content}" Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}" BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1"/> BorderThickness="0,0,1,1" />
<!--<Border <!--<Border
Grid.Row="19" Grid.Row="19"
Grid.Column="0" Grid.Column="0"
@@ -2726,8 +2730,8 @@
BorderBrush="{DynamicResource Table_BD}" BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1"> BorderThickness="1,0,1,1">
<Label <Label
VerticalContentAlignment="Center"
HorizontalContentAlignment="Right" HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="{lex:Loc ID_TXT_Heater_Mode}" Content="{lex:Loc ID_TXT_Heater_Mode}"
FontSize="14" /> FontSize="14" />
</Border> </Border>
@@ -2740,9 +2744,9 @@
Background="{DynamicResource Table_BG_Content}" Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}" BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1"> BorderThickness="0,0,1,1">
<Label <Label
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
FontSize="14"> FontSize="14">
<TextBlock Text="{lex:Loc {Binding HeaterModeSP2, FallbackValue=Unknown}}" /> <TextBlock Text="{lex:Loc {Binding HeaterModeSP2, FallbackValue=Unknown}}" />
</Label> </Label>
@@ -3003,8 +3007,8 @@
BorderBrush="{DynamicResource Table_BD}" BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,1,1,1"> BorderThickness="1,1,1,1">
<Label <Label
VerticalContentAlignment="Center"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
VerticalContentAlignment="Center"
Content="{lex:Loc ID_TXT_Heater_Mode}" Content="{lex:Loc ID_TXT_Heater_Mode}"
FontSize="14" /> FontSize="14" />
</Border> </Border>
@@ -3030,12 +3034,10 @@
Background="{DynamicResource Table_BG_Content}" Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}" BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,1,1,1"> BorderThickness="0,1,1,1">
<ComboBox <ComboBox ItemsSource="{Binding Source={StaticResource EnumHeatStrategy}}" SelectedItem="{Binding SelectedSCRHeatStrategy}">
ItemsSource="{Binding Source={StaticResource EnumHeatStrategy}}"
SelectedItem="{Binding SelectedSCRHeatStrategy}" >
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding Converter={StaticResource EnumDisplayConverter}}"/> <TextBlock Text="{Binding Converter={StaticResource EnumDisplayConverter}}" />
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
@@ -3408,6 +3410,10 @@
<RowDefinition Height="35" /> <RowDefinition Height="35" />
<RowDefinition Height="35" /> <RowDefinition Height="35" />
<RowDefinition Height="35" /> <RowDefinition Height="35" />
<RowDefinition Height="35" />
<RowDefinition Height="35" />
<RowDefinition Height="35" />
<RowDefinition Height="35" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="200" /> <ColumnDefinition Width="200" />
@@ -3599,6 +3605,110 @@
FontSize="14" /> FontSize="14" />
</Border> </Border>
<Border
Grid.Row="7"
Grid.Column="0"
Padding="5,1"
Background="{DynamicResource Table_BG_Title}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Label
HorizontalContentAlignment="Right"
Content="{Binding ATC7.LineHeaterLaber}"
FontSize="14" />
</Border>
<Border
Grid.Row="7"
Grid.Column="1"
Padding="5,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<Label
HorizontalContentAlignment="Center"
Content="{Binding ATC7.TempValue}"
ContentStringFormat="{}{0:F1}"
FontSize="14" />
</Border>
<Border
Grid.Row="8"
Grid.Column="0"
Padding="5,1"
Background="{DynamicResource Table_BG_Title}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Label
HorizontalContentAlignment="Right"
Content="{Binding ATC8.LineHeaterLaber}"
FontSize="14" />
</Border>
<Border
Grid.Row="8"
Grid.Column="1"
Padding="5,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<Label
HorizontalContentAlignment="Center"
Content="{Binding ATC8.TempValue}"
ContentStringFormat="{}{0:F1}"
FontSize="14" />
</Border>
<Border
Grid.Row="9"
Grid.Column="0"
Padding="5,1"
Background="{DynamicResource Table_BG_Title}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Label
HorizontalContentAlignment="Right"
Content="{Binding ATC9.LineHeaterLaber}"
FontSize="14" />
</Border>
<Border
Grid.Row="9"
Grid.Column="1"
Padding="5,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<Label
HorizontalContentAlignment="Center"
Content="{Binding ATC9.TempValue}"
ContentStringFormat="{}{0:F1}"
FontSize="14" />
</Border>
<Border
Grid.Row="10"
Grid.Column="0"
Padding="5,1"
Background="{DynamicResource Table_BG_Title}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Label
HorizontalContentAlignment="Right"
Content="{Binding ATC10.LineHeaterLaber}"
FontSize="14" />
</Border>
<Border
Grid.Row="10"
Grid.Column="1"
Padding="5,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<Label
HorizontalContentAlignment="Center"
Content="{Binding ATC10.TempValue}"
ContentStringFormat="{}{0:F1}"
FontSize="14" />
</Border>
</Grid> </Grid>
<Grid Grid.Column="1" Margin="20"> <Grid Grid.Column="1" Margin="20">
@@ -462,6 +462,19 @@ namespace MECF.Framework.UI.Client.CenterViews.Modules.PM
[Subscription("HeatLeakBypassTemp.LineHeaterData")] [Subscription("HeatLeakBypassTemp.LineHeaterData")]
public LineHeaterData ATC6 { get; set; } public LineHeaterData ATC6 { get; set; }
[Subscription("HeatH2SPipingTemp.LineHeaterData")]
public LineHeaterData ATC7 { get; set; }
[Subscription("HeatH2SePipingTemp.LineHeaterData")]
public LineHeaterData ATC8 { get; set; }
[Subscription("HeatSO2PipingTemp.LineHeaterData")]
public LineHeaterData ATC9 { get; set; }
[Subscription("HeatO2PipingTemp.LineHeaterData")]
public LineHeaterData ATC10 { get; set; }
[Subscription("OmronTemp.Enable")] [Subscription("OmronTemp.Enable")]
public bool OmronTempEnable { get; set; } public bool OmronTempEnable { get; set; }
@@ -1746,6 +1746,12 @@ namespace MECF.Framework.UI.Client.CenterViews.Modules.PM
_busyIndicatorContentExport.Report(new ProgressUpdatingEventArgs(200, 200, $"{daySlice}")); _busyIndicatorContentExport.Report(new ProgressUpdatingEventArgs(200, 200, $"{daySlice}"));
} }
foreach (var item in _RTGasFlowSumList)
{
item.Clear();
}
List<GasFlowSum> dayGasFlowList = _RTGasFlowSumList; List<GasFlowSum> dayGasFlowList = _RTGasFlowSumList;
//解析数据库返回的数据 //解析数据库返回的数据
@@ -1765,8 +1771,8 @@ namespace MECF.Framework.UI.Client.CenterViews.Modules.PM
double baseValue = 0.0166667 * Math.Pow(10, -6); double baseValue = 0.0166667 * Math.Pow(10, -6);
foreach (var item in dayGasFlowList) foreach (var item in dayGasFlowList)
{ {
item.RunVolume = item.RunVolume * baseValue; item.RunVolume = item.RunVolume * baseValue / 60;
item.VentVolume = item.VentVolume * baseValue; item.VentVolume = item.VentVolume * baseValue / 60;
item.Volume = item.RunVolume + item.VentVolume; item.Volume = item.RunVolume + item.VentVolume;
} }