This commit is contained in:
GukSang.Jin
2026-04-05 17:04:48 +08:00
parent c4d6a58bf4
commit d8e8e61e7e
3 changed files with 13 additions and 8 deletions

View File

@@ -26,14 +26,19 @@
MouseLeftButtonDown="CloseHotspot_OnMouseLeftButtonDown" MouseLeftButtonDown="CloseHotspot_OnMouseLeftButtonDown"
MouseLeftButtonUp="CloseHotspot_OnMouseLeftButtonUp" MouseLeftButtonUp="CloseHotspot_OnMouseLeftButtonUp"
MouseLeave="CloseHotspot_OnMouseLeave" /> MouseLeave="CloseHotspot_OnMouseLeave" />
<TextBlock FontSize="20" FontWeight="Bold" Foreground="White" Text="工程寄存器" /> <TextBlock FontSize="20"
FontWeight="Bold"
Foreground="White"
Text="工程寄存器" />
<TextBlock Margin="0,6,0,0" <TextBlock Margin="0,6,0,0"
FontSize="12" FontSize="12"
Foreground="#EFFAFC" Foreground="#EFFAFC"
Text="长按左上角空白区可关闭窗。D1330 / D1380 为只读显示值;其余地址支持读写,写入后自动回读并刷新实时值。" Text="长按左上角空白区可关闭窗。D1330 / D1380 为只读显示值;其余地址支持读写,写入后自动回读并刷新。"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
</StackPanel> </StackPanel>
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Center"> <StackPanel DockPanel.Dock="Right"
Orientation="Horizontal"
VerticalAlignment="Center">
<Button Padding="12,6" <Button Padding="12,6"
Command="{Binding RefreshEngineeringRegistersCommand}" Command="{Binding RefreshEngineeringRegistersCommand}"
Content="刷新寄存器" Content="刷新寄存器"
@@ -62,7 +67,7 @@
<DataGridTextColumn Header="名称" Binding="{Binding Name}" IsReadOnly="True" Width="180" /> <DataGridTextColumn Header="名称" Binding="{Binding Name}" IsReadOnly="True" Width="180" />
<DataGridTextColumn Header="地址" Binding="{Binding AddressDisplay}" IsReadOnly="True" Width="80" /> <DataGridTextColumn Header="地址" Binding="{Binding AddressDisplay}" IsReadOnly="True" Width="80" />
<DataGridTextColumn Header="权限" Binding="{Binding AccessDisplay}" IsReadOnly="True" Width="80" /> <DataGridTextColumn Header="权限" Binding="{Binding AccessDisplay}" IsReadOnly="True" Width="80" />
<DataGridTemplateColumn Header="当前值 / 写入值" Width="200"> <DataGridTemplateColumn Header="写入值" Width="200">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<Grid> <Grid>
@@ -75,7 +80,7 @@
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTextColumn Header="PLC 当前值" Binding="{Binding CurrentValue}" IsReadOnly="True" Width="140" /> <DataGridTextColumn Header="当前值" Binding="{Binding CurrentValue}" IsReadOnly="True" Width="140" />
<DataGridTextColumn Header="状态" Binding="{Binding StatusText}" IsReadOnly="True" Width="120" /> <DataGridTextColumn Header="状态" Binding="{Binding StatusText}" IsReadOnly="True" Width="120" />
<DataGridTemplateColumn Header="操作" Width="100"> <DataGridTemplateColumn Header="操作" Width="100">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>

View File

@@ -1972,7 +1972,7 @@
<TextBlock Margin="8,6,8,0" Text="/" /> <TextBlock Margin="8,6,8,0" Text="/" />
<TextBox Width="80" Text="{Binding Rs485WriteTimeoutMs, UpdateSourceTrigger=PropertyChanged}" /> <TextBox Width="80" Text="{Binding Rs485WriteTimeoutMs, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel> </StackPanel>
<StackPanel Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Orientation="Horizontal"> <WrapPanel Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Margin="0,2,0,0">
<CheckBox Margin="0,4,16,0" <CheckBox Margin="0,4,16,0"
IsChecked="{Binding Rs485AutoSwitchPresetMode, UpdateSourceTrigger=PropertyChanged}" IsChecked="{Binding Rs485AutoSwitchPresetMode, UpdateSourceTrigger=PropertyChanged}"
Content="写入时自动切到 485 预设速度模式" /> Content="写入时自动切到 485 预设速度模式" />
@@ -1986,7 +1986,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource CaptionStyle}" Style="{StaticResource CaptionStyle}"
Text="8 泵启停固定由伺服器 RS485 主控" /> Text="8 泵启停固定由伺服器 RS485 主控" />
</StackPanel> </WrapPanel>
</Grid> </Grid>
<TextBlock Margin="0,10,0,0" <TextBlock Margin="0,10,0,0"
Style="{StaticResource CaptionStyle}" Style="{StaticResource CaptionStyle}"

View File

@@ -159,4 +159,4 @@
"MaxFlowLpm": 7 "MaxFlowLpm": 7
} }
] ]
} }