变量的更改

This commit is contained in:
2025-07-04 22:16:28 +08:00
parent 61035aaf2e
commit f703e18523
28 changed files with 3758 additions and 1525 deletions

View File

@@ -133,7 +133,7 @@
</StackPanel>
</Border>
<Border>
<Border Width="220">
<Border.Style>
<Style BasedOn="{StaticResource BoardStyle}" TargetType="Border">
<Style.Triggers>
@@ -143,34 +143,44 @@
</Style.Triggers>
</Style>
</Border.Style>
<StackPanel Style="{StaticResource StackPanelStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel Style="{StaticResource StackPanelStyle}">
<TextBlock
Margin="5,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Foreground="White"
Text="&#xe776;" />
<TextBlock
FontSize="16"
Foreground="White"
Text="PLC通信:" />
<TextBlock
Margin="5,0"
FontSize="16"
Foreground="White"
Text="{Binding MachineRtDataService.LinkState, Converter={StaticResource BoolOkStrConvert}}" />
<TextBlock
Margin="2,0"
FontSize="16"
Foreground="White"
Text="|" />
</StackPanel>
<TextBlock
Margin="5,0,5,0"
Grid.Column="1"
Margin="5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Foreground="White"
Text="&#xe776;" />
<TextBlock
FontSize="16"
Foreground="White"
Text="PLC通信:" />
<TextBlock
Margin="5,0"
FontSize="16"
Foreground="White"
Text="{Binding MachineRtDataService.LinkState, Converter={StaticResource BoolOkStrConvert}}" />
<TextBlock
Margin="2,0"
FontSize="16"
Foreground="White"
Text="|" />
<TextBlock
Margin="5,0"
FontSize="16"
Foreground="White"
Text="{Binding ConfigService.PlcCycleTime}" />
</StackPanel>
</Grid>
</Border>
<Border>
<Border.Style>

View File

@@ -172,7 +172,7 @@
HandValueSVParameter="{Binding EngSvValue}"
IsEnabled="False"
MeterName="{Binding NameNoUnit}"
PVValue="{Binding EngPvValue}"
PVValue="{Binding PVModel.EngValueStr}"
SVValue="{Binding EngSvValue}"
Unit="{Binding Unit}" />
</DataTemplate>
@@ -945,7 +945,7 @@
VerticalAlignment="Top"
CellTitle="转速"
CellUnit="{Binding SpeedTag.Unit}"
CellValue="{Binding SpeedTag.EngPvValueStr}" />
CellValue="{Binding SpeedTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="301"
Canvas.Top="120"
@@ -953,7 +953,7 @@
VerticalAlignment="Center"
CellTitle="电压"
CellUnit="{Binding ComCapBusVolTag.Unit}"
CellValue="{Binding ComCapBusVolTag.EngPvValueStr}" />
CellValue="{Binding ComCapBusVolTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="301"
Canvas.Top="170"
@@ -961,7 +961,7 @@
VerticalAlignment="Center"
CellTitle="电流"
CellUnit="{Binding ComCapBusCurTag.Unit}"
CellValue="{Binding ComCapBusCurTag.EngPvValueStr}" />
CellValue="{Binding ComCapBusCurTag.PVModel.EngValueStr}" />
<!-- CellUnit="{Binding ComCapPwTag.Unit}" -->
<Controls:ValueShow
Canvas.Left="301"
@@ -970,7 +970,7 @@
VerticalAlignment="Center"
CellTitle="功率"
CellUnit="{Binding ComCapPwTag.Unit}"
CellValue="{Binding ComCapPwTag.EngPvValueStr}" />
CellValue="{Binding ComCapPwTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="105"
Canvas.Top="147"
@@ -978,7 +978,7 @@
VerticalAlignment="Center"
CellTitle="排气口压力"
CellUnit="{Binding ExPressTag.Unit}"
CellValue="{Binding ExPressTag.EngPvValueStr}" />
CellValue="{Binding ExPressTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="106"
Canvas.Top="193"
@@ -986,7 +986,7 @@
VerticalAlignment="Center"
CellTitle="排气口温度"
CellUnit="{Binding ExTempTag.Unit}"
CellValue="{Binding ExTempTag.EngPvValueStr}" />
CellValue="{Binding ExTempTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="105"
Canvas.Top="292"
@@ -994,7 +994,7 @@
VerticalAlignment="Center"
CellTitle="吸气口压力"
CellUnit="{Binding InhPressTag.Unit}"
CellValue="{Binding InhPressTag.EngPvValueStr}" />
CellValue="{Binding InhPressTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="106"
Canvas.Top="338"
@@ -1002,7 +1002,7 @@
VerticalAlignment="Center"
CellTitle="吸气口温度"
CellUnit="{Binding InhTempTag.Unit}"
CellValue="{Binding InhTempTag.EngPvValueStr}" />
CellValue="{Binding InhTempTag.PVModel.EngValueStr}" />
<!--<Controls:ValueShow
Canvas.Left="551"
Canvas.Top="272"
@@ -1018,7 +1018,7 @@
VerticalAlignment="Center"
CellTitle="阀前温度"
CellUnit="{Binding TxvFrTempTag.Unit}"
CellValue="{Binding TxvFrTempTag.EngPvValueStr}" />
CellValue="{Binding TxvFrTempTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="1003"
Canvas.Top="239"
@@ -1026,7 +1026,7 @@
VerticalAlignment="Center"
CellTitle="阀前压力"
CellUnit="{Binding TxvFrPressTag.Unit}"
CellValue="{Binding TxvFrPressTag.EngPvValueStr}" />
CellValue="{Binding TxvFrPressTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="635"
Canvas.Top="420"
@@ -1034,7 +1034,7 @@
VerticalAlignment="Top"
CellTitle="吸气混合器温度"
CellUnit="{Binding OS2TempTag.Unit}"
CellValue="{Binding OS2TempTag.EngPvValueStr}" />
CellValue="{Binding OS2TempTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="1076"
Canvas.Top="360"
@@ -1042,7 +1042,7 @@
VerticalAlignment="Top"
CellTitle="冷凝器进水温"
CellUnit="{Binding CondInTempTag.Unit}"
CellValue="{Binding CondInTempTag.EngPvValueStr}" />
CellValue="{Binding CondInTempTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="1194"
Canvas.Top="360"
@@ -1050,7 +1050,7 @@
VerticalAlignment="Top"
CellTitle="冷凝器出水温"
CellUnit="{Binding Cond1TempTag.Unit}"
CellValue="{Binding Cond1TempTag.EngPvValueStr}" />
CellValue="{Binding Cond1TempTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="1217"
Canvas.Top="136"
@@ -1105,11 +1105,11 @@
Margin="0,2,2,2"
BorderBrush="Gray"
BorderThickness="2">
<ListView FontSize="16" ItemsSource="{Binding ListTag}">
<ListView FontSize="14" ItemsSource="{Binding ListTag}">
<ListView.View>
<GridView ColumnHeaderContainerStyle="{StaticResource myHeaderStyle1}">
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding EngPvValueStr}" Header="实时值" />
<GridViewColumn DisplayMemberBinding="{Binding PVModel.EngValueStr}" Header="实时值" />
<!-- DisplayMemberBinding="{Binding EngPvValue, Converter={StaticResource ValuePrecisionConverter}, ConverterParameter={Binding Path=DecimalPoint}}" -->
<!--<GridViewColumn Header="实时值">
<GridViewColumn.DisplayMemberBinding>
@@ -1124,7 +1124,8 @@
<ListView.ItemContainerStyle>
<Style TargetType="ListViewItem">
<!--<Setter Property="Background" Value="Transparent" />-->
<Setter Property="Height" Value="20" />
<Setter Property="Height" Value="15.5" />
<Setter Property="FontSize" Value="12" />
</Style>
</ListView.ItemContainerStyle>
</ListView>