新增加热带配置和数据显示
更新版本号
修改流量统计
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
@@ -60,5 +60,12 @@ namespace MECF.Framework.Common.Aitex.Core.Common.DeviceData
InvokePropertyChanged();
}
}
public void Clear()
{
_runVolume = 0;
_ventVolume = 0;
_volume = 0;
}
}
}
@@ -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">
<UserControl.Resources>
<converters:DoubleToStringConverter x:Key="DoubleToStringConverter"/>
<converters:EnumDisplayConverter x:Key="EnumDisplayConverter"/>
<ObjectDataProvider x:Key="EnumHeatStrategy" MethodName="GetValues"
ObjectType="{x:Type sys:Enum}">
<converters:DoubleToStringConverter x:Key="DoubleToStringConverter" />
<converters:EnumDisplayConverter x:Key="EnumDisplayConverter" />
<ObjectDataProvider
x:Key="EnumHeatStrategy"
MethodName="GetValues"
ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="rt:HeatStrategy"/>
<x:Type TypeName="rt:HeatStrategy" />
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
</UserControl.Resources>
@@ -693,8 +695,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Label
VerticalContentAlignment="Center"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="{lex:Loc ID_TXT_Heater_Mode}"
FontSize="14" />
</Border>
@@ -707,9 +709,10 @@
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<Label HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontSize="14">
<Label
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontSize="14">
<TextBlock Text="{lex:Loc {Binding HeaterModeSP, FallbackValue=Unknown}}" />
</Label>
</Border>
@@ -1090,8 +1093,11 @@
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,1,1,1">
<Label HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="14">
<TextBlock Text="{lex:Loc {Binding HeaterModeSP, FallbackValue=Unknown}}" VerticalAlignment="Center" />
<Label
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontSize="14">
<TextBlock VerticalAlignment="Center" Text="{lex:Loc {Binding HeaterModeSP, FallbackValue=Unknown}}" />
</Label>
</Border>
<Border
@@ -1101,12 +1107,10 @@
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,1,1,1">
<ComboBox
ItemsSource="{Binding Source={StaticResource EnumHeatStrategy}}"
SelectedItem="{Binding SelectedPSUHeatStrategy}" >
<ComboBox ItemsSource="{Binding Source={StaticResource EnumHeatStrategy}}" SelectedItem="{Binding SelectedPSUHeatStrategy}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Converter={StaticResource EnumDisplayConverter}}"/>
<TextBlock Text="{Binding Converter={StaticResource EnumDisplayConverter}}" />
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
@@ -1466,7 +1470,7 @@
Padding="5,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1"/>
BorderThickness="0,0,1,1" />
<Border
Grid.Row="20"
@@ -1498,7 +1502,7 @@
Padding="5,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1"/>
BorderThickness="0,0,1,1" />
<Border
Grid.Row="21"
@@ -1531,7 +1535,7 @@
Padding="5,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1"/>
BorderThickness="0,0,1,1" />
<Border
@@ -1565,7 +1569,7 @@
Padding="5,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1"/>
BorderThickness="0,0,1,1" />
<!--<Border
Grid.Row="19"
Grid.Column="0"
@@ -2726,8 +2730,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Label
VerticalContentAlignment="Center"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="{lex:Loc ID_TXT_Heater_Mode}"
FontSize="14" />
</Border>
@@ -2740,9 +2744,9 @@
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,1,1">
<Label
<Label
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Center"
FontSize="14">
<TextBlock Text="{lex:Loc {Binding HeaterModeSP2, FallbackValue=Unknown}}" />
</Label>
@@ -3003,8 +3007,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,1,1,1">
<Label
VerticalContentAlignment="Center"
HorizontalContentAlignment="Left"
VerticalContentAlignment="Center"
Content="{lex:Loc ID_TXT_Heater_Mode}"
FontSize="14" />
</Border>
@@ -3030,12 +3034,10 @@
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,1,1,1">
<ComboBox
ItemsSource="{Binding Source={StaticResource EnumHeatStrategy}}"
SelectedItem="{Binding SelectedSCRHeatStrategy}" >
<ComboBox ItemsSource="{Binding Source={StaticResource EnumHeatStrategy}}" SelectedItem="{Binding SelectedSCRHeatStrategy}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Converter={StaticResource EnumDisplayConverter}}"/>
<TextBlock Text="{Binding Converter={StaticResource EnumDisplayConverter}}" />
</DataTemplate>
</ComboBox.ItemTemplate>
</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" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="200" />
@@ -3599,6 +3605,110 @@
FontSize="14" />
</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.Column="1" Margin="20">
@@ -462,6 +462,19 @@ namespace MECF.Framework.UI.Client.CenterViews.Modules.PM
[Subscription("HeatLeakBypassTemp.LineHeaterData")]
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")]
public bool OmronTempEnable { get; set; }
@@ -1746,6 +1746,12 @@ namespace MECF.Framework.UI.Client.CenterViews.Modules.PM
_busyIndicatorContentExport.Report(new ProgressUpdatingEventArgs(200, 200, $"{daySlice}"));
}
foreach (var item in _RTGasFlowSumList)
{
item.Clear();
}
List<GasFlowSum> dayGasFlowList = _RTGasFlowSumList;
//解析数据库返回的数据
@@ -1765,8 +1771,8 @@ namespace MECF.Framework.UI.Client.CenterViews.Modules.PM
double baseValue = 0.0166667 * Math.Pow(10, -6);
foreach (var item in dayGasFlowList)
{
item.RunVolume = item.RunVolume * baseValue;
item.VentVolume = item.VentVolume * baseValue;
item.RunVolume = item.RunVolume * baseValue / 60;
item.VentVolume = item.VentVolume * baseValue / 60;
item.Volume = item.RunVolume + item.VentVolume;
}