更新
This commit is contained in:
@@ -182,6 +182,29 @@
|
|||||||
<Setter Property="Margin" Value="0,8,0,0"/>
|
<Setter Property="Margin" Value="0,8,0,0"/>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
|
<Style TargetType="Border" x:Key="FooterItem">
|
||||||
|
<Setter Property="Background" Value="#F8FBFD"/>
|
||||||
|
<Setter Property="BorderBrush" Value="#DFE7EF"/>
|
||||||
|
<Setter Property="BorderThickness" Value="1"/>
|
||||||
|
<Setter Property="CornerRadius" Value="5"/>
|
||||||
|
<Setter Property="Padding" Value="12,7"/>
|
||||||
|
<Setter Property="MinHeight" Value="36"/>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<Style TargetType="TextBlock" x:Key="FooterLabel">
|
||||||
|
<Setter Property="Foreground" Value="#647487"/>
|
||||||
|
<Setter Property="FontSize" Value="13"/>
|
||||||
|
<Setter Property="FontWeight" Value="SemiBold"/>
|
||||||
|
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<Style TargetType="TextBlock" x:Key="FooterValue">
|
||||||
|
<Setter Property="Foreground" Value="#102A43"/>
|
||||||
|
<Setter Property="FontSize" Value="14"/>
|
||||||
|
<Setter Property="FontWeight" Value="SemiBold"/>
|
||||||
|
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||||
|
</Style>
|
||||||
|
|
||||||
<DataTemplate x:Key="StationCardTemplate">
|
<DataTemplate x:Key="StationCardTemplate">
|
||||||
<Border BorderBrush="{StaticResource PanelBorderBrush}"
|
<Border BorderBrush="{StaticResource PanelBorderBrush}"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
@@ -550,34 +573,67 @@
|
|||||||
Content="{Binding Tester}"
|
Content="{Binding Tester}"
|
||||||
ContentTemplate="{StaticResource StationCardTemplate}"/>
|
ContentTemplate="{StaticResource StationCardTemplate}"/>
|
||||||
|
|
||||||
<StatusBar Grid.Row="2" Background="#FFF" BorderBrush="#DDD" BorderThickness="0,1,0,0" Padding="8">
|
<Border Grid.Row="2"
|
||||||
<StatusBarItem>
|
Background="#FFFFFF"
|
||||||
<StackPanel Orientation="Horizontal">
|
BorderBrush="#DCE5EE"
|
||||||
<Ellipse Width="10" Height="10" Fill="{Binding PlcStatus, Converter={StaticResource StatusColorConverter}}" Margin="0,0,5,0"/>
|
BorderThickness="1"
|
||||||
<TextBlock Text="PLC: "/>
|
CornerRadius="6"
|
||||||
<TextBlock Text="{Binding PlcStatus}"/>
|
Padding="8">
|
||||||
</StackPanel>
|
<Grid>
|
||||||
</StatusBarItem>
|
<Grid.ColumnDefinitions>
|
||||||
<Separator/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<StatusBarItem>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<StackPanel Orientation="Horizontal">
|
<ColumnDefinition Width="*"/>
|
||||||
<TextBlock Text="当前时间: "/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<TextBlock Text="{Binding CurrentTime}"/>
|
</Grid.ColumnDefinitions>
|
||||||
</StackPanel>
|
|
||||||
</StatusBarItem>
|
<Border Grid.Column="0" Style="{StaticResource FooterItem}" Margin="0,0,8,0">
|
||||||
<Separator/>
|
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
|
||||||
<StatusBarItem>
|
<Ellipse Width="10"
|
||||||
<StackPanel Orientation="Horizontal">
|
Height="10"
|
||||||
<TextBlock Text="⚠ " Foreground="#FF5722"/>
|
Fill="{Binding PlcStatus, Converter={StaticResource StatusColorConverter}}"
|
||||||
<TextBlock Text="{Binding GlobalAlarm}" Foreground="Red"/>
|
Margin="0,0,8,0"/>
|
||||||
</StackPanel>
|
<TextBlock Text="PLC" Style="{StaticResource FooterLabel}" Margin="0,0,8,0"/>
|
||||||
</StatusBarItem>
|
<TextBlock Text="{Binding PlcStatus}" Style="{StaticResource FooterValue}"/>
|
||||||
<Button Background="Transparent"
|
</StackPanel>
|
||||||
BorderThickness="0"
|
</Border>
|
||||||
Margin="10"
|
|
||||||
Width="80"
|
<Border Grid.Column="1" Style="{StaticResource FooterItem}" Margin="0,0,8,0">
|
||||||
Height="30"
|
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
|
||||||
Command="{Binding ShowDataCommand}"/>
|
<TextBlock Text="当前时间" Style="{StaticResource FooterLabel}" Margin="0,0,8,0"/>
|
||||||
</StatusBar>
|
<TextBlock Text="{Binding CurrentTime}" Style="{StaticResource FooterValue}"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<Border Grid.Column="2" Style="{StaticResource FooterItem}">
|
||||||
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="Auto"/>
|
||||||
|
<ColumnDefinition Width="*"/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<TextBlock Text="报警"
|
||||||
|
Style="{StaticResource FooterLabel}"
|
||||||
|
Foreground="#B33A3A"
|
||||||
|
Margin="0,0,8,0"/>
|
||||||
|
<TextBlock Grid.Column="1"
|
||||||
|
Text="{Binding GlobalAlarm}"
|
||||||
|
Foreground="#C62828"
|
||||||
|
FontSize="14"
|
||||||
|
FontWeight="SemiBold"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
TextTrimming="CharacterEllipsis"/>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<Button Grid.Column="3"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
Opacity="0"
|
||||||
|
Width="18"
|
||||||
|
Height="18"
|
||||||
|
Margin="8,0,0,0"
|
||||||
|
Command="{Binding ShowDataCommand}"/>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
|
|||||||
Reference in New Issue
Block a user