修改PC相关问题

This commit is contained in:
hanqiangqiang 2026-08-19 14:04:50 +08:00
parent b1d5fda352
commit 8406d68957
3 changed files with 151 additions and 150 deletions

View File

@ -413,7 +413,7 @@
<DO_ITEM Index="130" Name="DO_ServoReset" BufferOffset="130" Addr="130" Description="" />
<DO_ITEM Index="131" Name="DO_PSU1Enable" BufferOffset="131" Addr="131" Description="" />
<DO_ITEM Index="132" Name="DO_PSU2Enable" BufferOffset="132" Addr="132" Description="" />
<DO_ITEM Index="133" Name="DO_PSU3Enable" OfflineOffline="133" Addr="133" Description="" />
<DO_ITEM Index="133" Name="DO_PSU3Enable" BufferOffset="133" Addr="133" Description="" />
<DO_ITEM Index="134" Name="DO_SCR1Enable" BufferOffset="134" Addr="134" Description="" />
<DO_ITEM Index="135" Name="DO_SCR2Enable" BufferOffset="135" Addr="135" Description="" />
<DO_ITEM Index="136" Name="DO_SCR3Enable" BufferOffset="136" Addr="136" Description="" />

View File

@ -11,16 +11,16 @@
xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:industrialcontrol="clr-namespace:MECF.Framework.UI.Client.IndustrialControl;assembly=MECF.Framework.UI.Client"
xmlns:lex="http://wpflocalizeextension.codeplex.com"
xmlns:m2c4parts="clr-namespace:SicUI.Controls.M2C4Parts"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:unitControls="clr-namespace:MECF.Framework.UI.Client.Ctrlib.UnitControls;assembly=MECF.Framework.UI.Client"
xmlns:lex="http://wpflocalizeextension.codeplex.com"
d:DesignHeight="800"
d:DesignWidth="1920"
mc:Ignorable="d"
lex:LocalizeDictionary.DesignCulture="en"
lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization"
lex:ResxLocalizationProvider.DefaultDictionary="lang_common">
lex:ResxLocalizationProvider.DefaultDictionary="lang_common"
mc:Ignorable="d">
<UserControl.Resources>
<Color x:Key="EdgeColorWhite">DimGray</Color>
<Color x:Key="CenterColorWhite">LightGray</Color>
@ -88,8 +88,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -172,8 +172,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -219,16 +219,16 @@
</Button>
</StackPanel>
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
Width="100"
HorizontalAlignment="Right"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
TextAlignment="Left"
TextWrapping="Wrap">
<Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding PM1PurgeLoop, StringFormat=0.00 ,Mode=OneWay}" FontSize="12"/>
<Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding PM1PurgeLoop, StringFormat=0.00, Mode=OneWay}" />
</TextBlock>
</Grid>
</Border>
@ -240,8 +240,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -304,8 +304,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -497,8 +497,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -581,8 +581,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -628,16 +628,16 @@
</Button>
</StackPanel>
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
Width="100"
HorizontalAlignment="Right"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
TextAlignment="Left"
TextWrapping="Wrap">
<Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding PM2PurgeLoop, StringFormat=0.00,Mode=OneWay}" FontSize="12"/>
<Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding PM2PurgeLoop, StringFormat=0.00, Mode=OneWay}" />
</TextBlock>
</Grid>
</Border>
@ -649,8 +649,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -713,8 +713,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1361,8 +1361,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1446,9 +1446,9 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
Margin="0,7,0,0"
VerticalAlignment="Top"
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1492,17 +1492,17 @@
</i:Interaction.Triggers>
</Button>
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
Width="100"
Margin="15,0,0,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
TextAlignment="Left"
TextWrapping="Wrap">
<Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding LLPurgeLoop, StringFormat=0.00,Mode=OneWay}" FontSize="12"/>
<Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding LLPurgeLoop, StringFormat=0.00, Mode=OneWay}" />
</TextBlock>
</StackPanel>
</Border>
@ -1600,8 +1600,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1651,51 +1651,52 @@
</Border>
<Border
Grid.Row="5"
Padding="5,1,0,1"
Background="{DynamicResource Table_BG_Title}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
Grid.Row="5"
Padding="5,1,0,1"
Background="{DynamicResource Table_BG_Title}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_efemview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
Text="{lex:Loc ID_TXT_Door}"
TextWrapping="Wrap" />
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_efemview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
Text="{lex:Loc ID_TXT_Door}"
TextWrapping="Wrap" />
</Border>
<Border
Grid.Row="5"
Grid.Column="1"
Padding="5,1,0,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock Margin="0,7,0,0"
VerticalAlignment="Top"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
Text="LeftSide"
TextAlignment="Center"
TextWrapping="Wrap" />
Grid.Row="5"
Grid.Column="1"
Padding="5,1,0,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock
Margin="0,7,0,0"
VerticalAlignment="Top"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
Text="LeftSide"
TextAlignment="Center"
TextWrapping="Wrap" />
</Border>
<Border
Grid.Row="5"
Grid.Column="2"
Padding="5,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
Grid.Row="5"
Grid.Column="2"
Padding="5,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<StackPanel Orientation="Horizontal">
<Button
Width="80"
Height="25"
Margin="10,0"
HorizontalAlignment="Left"
Content="{lex:Loc ID_BTN_Open_Content}"
IsEnabled="{Binding IsLLEnableManualOperation}">
Width="80"
Height="25"
Margin="10,0"
HorizontalAlignment="Left"
Content="{lex:Loc ID_BTN_Open_Content}"
IsEnabled="{Binding IsLLEnableManualOperation}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<cal:ActionMessage MethodName="LoadOpenSlitValve" />
@ -1703,17 +1704,17 @@ TextWrapping="Wrap" />
</i:Interaction.Triggers>
</Button>
<deviceControl:AITSensor
HorizontalAlignment="Center"
VerticalAlignment="Center"
GreenColor="True"
LightOnValue="{Binding LoadLockLSideDoorOpenSensor}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
GreenColor="True"
LightOnValue="{Binding LoadLockLSideDoorOpenSensor}" />
<Button
Width="80"
Height="25"
Margin="10,0"
HorizontalAlignment="Left"
Content="{lex:Loc ID_BTN_Close_Content}"
IsEnabled="{Binding IsLLEnableManualOperation}">
Width="80"
Height="25"
Margin="10,0"
HorizontalAlignment="Left"
Content="{lex:Loc ID_BTN_Close_Content}"
IsEnabled="{Binding IsLLEnableManualOperation}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<cal:ActionMessage MethodName="LoadCloseSlitValve" />
@ -1721,65 +1722,65 @@ TextWrapping="Wrap" />
</i:Interaction.Triggers>
</Button>
<deviceControl:AITSensor
HorizontalAlignment="Center"
VerticalAlignment="Center"
GreenColor="True"
LightOnValue="{Binding LoadLockLSideDoorCloseSensor}" />
HorizontalAlignment="Center"
VerticalAlignment="Center"
GreenColor="True"
LightOnValue="{Binding LoadLockLSideDoorCloseSensor}" />
</StackPanel>
</Border>
<Border
Grid.Row="6"
Padding="5,1,0,1"
Background="{DynamicResource Table_BG_Title}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
Grid.Row="6"
Padding="5,1,0,1"
Background="{DynamicResource Table_BG_Title}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_efemview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
Text="{lex:Loc ID_TXT_Lift}"
TextWrapping="Wrap" />
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_efemview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
Text="{lex:Loc ID_TXT_Lift}"
TextWrapping="Wrap" />
</Border>
<Border
Grid.Row="6"
Grid.Column="1"
Padding="5,1,0,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
Grid.Row="6"
Grid.Column="1"
Padding="5,1,0,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
Text=""
TextAlignment="Center"
TextWrapping="Wrap" />
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
Text=""
TextAlignment="Center"
TextWrapping="Wrap" />
</Border>
<Border
Grid.Row="6"
Grid.Column="2"
Padding="5,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
Grid.Row="6"
Grid.Column="2"
Padding="5,1"
Background="{DynamicResource Table_BG_Content}"
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<StackPanel Orientation="Horizontal">
<deviceControl:AITSensor
Margin="10,0,0,0"
HorizontalAlignment="Center"
GreenColor="True"
LightOnValue="{Binding LoadLiftUpSensor}" />
Margin="10,0,0,0"
HorizontalAlignment="Center"
GreenColor="True"
LightOnValue="{Binding LoadLiftUpSensor}" />
<Button
Width="80"
Height="24"
Margin="10,0"
HorizontalAlignment="Left"
lex:ResxLocalizationProvider.DefaultDictionary="lang_efemview"
Content="{lex:Loc ID_BTN_Up_Content}"
IsEnabled="{Binding IsLLEnableManualOperation}">
Width="80"
Height="24"
Margin="10,0"
HorizontalAlignment="Left"
lex:ResxLocalizationProvider.DefaultDictionary="lang_efemview"
Content="{lex:Loc ID_BTN_Up_Content}"
IsEnabled="{Binding IsLLEnableManualOperation}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<cal:ActionMessage MethodName="LLLiftUp" />
@ -1787,18 +1788,18 @@ TextWrapping="Wrap" />
</i:Interaction.Triggers>
</Button>
<deviceControl:AITSensor
Margin="60,0,0,0"
HorizontalAlignment="Center"
GreenColor="True"
LightOnValue="{Binding LoadLiftDownSensor}" />
Margin="60,0,0,0"
HorizontalAlignment="Center"
GreenColor="True"
LightOnValue="{Binding LoadLiftDownSensor}" />
<Button
Width="80"
Height="24"
Margin="10,0"
HorizontalAlignment="Left"
lex:ResxLocalizationProvider.DefaultDictionary="lang_efemview"
Content="{lex:Loc ID_BTN_Down_Content}"
IsEnabled="{Binding IsLLEnableManualOperation}">
Width="80"
Height="24"
Margin="10,0"
HorizontalAlignment="Left"
lex:ResxLocalizationProvider.DefaultDictionary="lang_efemview"
Content="{lex:Loc ID_BTN_Down_Content}"
IsEnabled="{Binding IsLLEnableManualOperation}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<cal:ActionMessage MethodName="LLLiftDown" />
@ -2922,8 +2923,8 @@ TextWrapping="Wrap" />
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -3006,8 +3007,8 @@ TextWrapping="Wrap" />
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -3052,17 +3053,17 @@ TextWrapping="Wrap" />
</Button>
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
Width="97"
Margin="47,0,0,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
TextAlignment="Left"
TextWrapping="Wrap">
<Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding TMPurgeLoop, StringFormat=0.00 ,Mode=OneWay}" FontSize="12"/>
<Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding TMPurgeLoop, StringFormat=0.00, Mode=OneWay}" />
</TextBlock>
</StackPanel>
@ -3160,8 +3161,8 @@ TextWrapping="Wrap" />
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -3238,8 +3239,8 @@ TextWrapping="Wrap" />
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -3349,10 +3350,10 @@ TextWrapping="Wrap" />
</i:Interaction.Triggers>
</Button>
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
Width="120"
Height="25"
Margin="10,0"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
Content="{lex:Loc ID_BTN_ServoPressure_Content}"
IsEnabled="{Binding IsTMEnableManualOperation}">
<i:Interaction.Triggers>
@ -3416,8 +3417,8 @@ TextWrapping="Wrap" />
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -3501,8 +3502,8 @@ TextWrapping="Wrap" />
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -3627,8 +3628,8 @@ TextWrapping="Wrap" />
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -3659,9 +3660,9 @@ TextWrapping="Wrap" />
BorderThickness="1,0,1,1">
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
<Label
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
Background="{DynamicResource Table_BG_Title}"
BorderBrush="{DynamicResource Table_BD}"
Content="{lex:Loc ID_TXT_RemainTime}"
@ -3687,8 +3688,8 @@ TextWrapping="Wrap" />
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -3719,9 +3720,9 @@ TextWrapping="Wrap" />
BorderThickness="1,0,1,1">
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
<Label
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
Background="{DynamicResource Table_BG_Title}"
BorderBrush="{DynamicResource Table_BD}"
Content="{lex:Loc ID_TXT_RemainTime}"
@ -3747,8 +3748,8 @@ TextWrapping="Wrap" />
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -3779,9 +3780,9 @@ TextWrapping="Wrap" />
BorderThickness="1,0,1,1">
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
<Label
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
Background="{DynamicResource Table_BG_Title}"
BorderBrush="{DynamicResource Table_BD}"
Content="{lex:Loc ID_TXT_RemainTime}"

View File

@ -206,28 +206,28 @@ namespace SicUI.Models.PMs
#endregion
#region Pressure
[Subscription("PC1.DeviceData")]
[Subscription("Pressure1.DeviceData")]
public AITPressureMeterData PC1 { get; set; }
[Subscription("PC2.DeviceData")]
[Subscription("Pressure2.DeviceData")]
public AITPressureMeterData PC2 { get; set; }
[Subscription("PC3.DeviceData")]
[Subscription("Pressure3.DeviceData")]
public AITPressureMeterData PC3 { get; set; }
[Subscription("PC4.DeviceData")]
[Subscription("Pressure4.DeviceData")]
public AITPressureMeterData PC4 { get; set; }
[Subscription("PC5.DeviceData")]
[Subscription("Pressure5.DeviceData")]
public AITPressureMeterData PC5 { get; set; }
[Subscription("PC6.DeviceData")]
[Subscription("Pressure6.DeviceData")]
public AITPressureMeterData PC6 { get; set; }
[Subscription("PC7.DeviceData")]
[Subscription("Pressure7.DeviceData")]
public AITPressureMeterData PC7 { get; set; }
[Subscription("PC8.DeviceData")]
[Subscription("Pressure8.DeviceData")]
public AITPressureMeterData PC8 { get; set; }
[Subscription("PC9.DeviceData")]
[Subscription("Pressure9.DeviceData")]
public AITPressureMeterData PC9 { get; set; }
[Subscription("PT1.DeviceData")]