This commit is contained in:
xyy
2026-04-09 10:49:28 +08:00
parent a1532d7954
commit ae7b329792
5 changed files with 123 additions and 2 deletions

View File

@@ -92,7 +92,26 @@
</Window.Resources>
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<DockPanel>
<!-- 报警栏(放在最顶部) -->
<Border DockPanel.Dock="Top" Background="#FF4444"
Visibility="{Binding HasAlarm, Converter={StaticResource BooleanToVisibilityConverter}}"
Padding="10,5" Margin="0,0,0,5">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<TextBlock Text="⚠️ 报警:" Foreground="White" FontWeight="Bold" Margin="0,0,10,0"/>
<ItemsControl ItemsSource="{Binding AlarmMessages}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding}" Foreground="White" Margin="0,0,15,0"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel>
</Border>
<!-- 顶部历史记录栏 -->
<Border DockPanel.Dock="Top" Background="White" BorderBrush="#E9ECF0" BorderThickness="0,0,0,1" Padding="10,5">
<StackPanel Orientation="Horizontal">

View File

@@ -121,7 +121,7 @@
<Border Grid.Row="0" Background="White" CornerRadius="6" Padding="10" Margin="0,0,0,10" BorderBrush="#E9ECF0" BorderThickness="1">
<StackPanel Orientation="Horizontal">
<TextBlock Text="工位:" VerticalAlignment="Center" Margin="5"/>
<ComboBox x:Name="cmbStation" Width="80">
<ComboBox x:Name="cmbStation" Width="80" SelectionChanged="CmbStation_SelectionChanged">
<ComboBoxItem IsSelected="True" Content="工位1"/>
<ComboBoxItem Content="工位2"/>
<ComboBoxItem Content="工位3"/>