TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新了Tag的字段属性和Can配置的修复

Browse Source
This commit is contained in:
Tyrone CT
2025-01-06 10:06:36 +08:00
parent 3a5674054d
commit e5ebd9113a
11 changed files with 166 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CapMachine.Wpf/Views/MonitorView.xaml
View File

@@ -492,10 +492,10 @@
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="26"
Foreground="OrangeRed"
Foreground="Red"
Text="" />
<TextBlock
Foreground="OrangeRed"
FontSize="20"
Style="{StaticResource TitelStyle}"
Text="报警:" />
@@ -824,7 +824,7 @@
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<!-- HandValueParameter="{Binding MVValue}" -->
<!-- HandValueParameter="{Binding MVValue}" IsEnabled="{Binding MachineRtDataService.AutoHandSwtichConditionState.IsCanSwitch}" -->
<DataTemplate>
<StackPanel Margin="0,2,2,2" Orientation="Horizontal">
<ToggleButton
@@ -1019,16 +1019,16 @@
HorizontalAlignment="Center"
VerticalAlignment="Top"
CellTitle="冷凝器进水温"
CellUnit="{Binding Cond1TempTag.Unit}"
CellValue="{Binding Cond1TempTag.EngPvValueStr}" />
CellUnit="{Binding CondInTempTag.Unit}"
CellValue="{Binding CondInTempTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="1194"
Canvas.Top="360"
HorizontalAlignment="Center"
VerticalAlignment="Top"
CellTitle="冷凝器出水温"
CellUnit="{Binding CondInTempTag.Unit}"
CellValue="{Binding CondInTempTag.EngPvValueStr}" />
CellUnit="{Binding Cond1TempTag.Unit}"
CellValue="{Binding Cond1TempTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="1217"
Canvas.Top="136"