当前页面数据布局

This commit is contained in:
MoYue 2024-07-03 09:20:23 +08:00
parent f67ded57d4
commit 970e528b98

View File

@ -79,7 +79,6 @@
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition/> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -96,15 +95,8 @@
<TextBlock Grid.Column="2" Text="{Binding CurrentSequentiual.Sequentiual1Status}" FontSize="15" Margin="15,0" FontWeight="Normal" VerticalAlignment="Center" /> <TextBlock Grid.Column="2" Text="{Binding CurrentSequentiual.Sequentiual1Status}" FontSize="15" Margin="15,0" FontWeight="Normal" VerticalAlignment="Center" />
<TextBlock Grid.Column="3" Text="时序2状态:" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground="#00BFFF" VerticalAlignment="Center" /> <TextBlock Grid.Column="3" Text="时序2状态:" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground="#00BFFF" VerticalAlignment="Center" />
<TextBlock Grid.Column="4" Text="{Binding CurrentSequentiual.Sequentiual2Status}" FontSize="15" Margin="15,0" FontWeight="Normal" VerticalAlignment="Center" /> <TextBlock Grid.Column="4" Text="{Binding CurrentSequentiual.Sequentiual2Status}" FontSize="15" Margin="15,0" FontWeight="Normal" VerticalAlignment="Center" />
<Button Content="刷新" Grid.Column="5" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshSeCommand}" Width="60" Margin="5,0" Background="#88409EFE" Name="Refresh"> <TextBlock Grid.Column="5" Text="时序3状态:" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground="#00BFFF" VerticalAlignment="Center" />
<Button.CommandParameter> <TextBlock Grid.Column="6" Text="{Binding CurrentSequentiual.Sequentiual3Status}" FontSize="15" Margin="15,0" FontWeight="Normal" VerticalAlignment="Center" />
<MultiBinding Converter="{StaticResource ResourceKey=BtnConvert}">
<MultiBinding.Bindings>
<Binding ElementName="Refresh" Path="Name" />
</MultiBinding.Bindings>
</MultiBinding>
</Button.CommandParameter>
</Button>
</Grid> </Grid>
<Grid Grid.Row="1" Margin="0,20,0,0"> <Grid Grid.Row="1" Margin="0,20,0,0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -116,25 +108,20 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Column="1" Text="时序3状态:" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground="#00BFFF" VerticalAlignment="Center" /> <TextBlock Grid.Column="1" Text="时序4状态:" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground="#00BFFF" VerticalAlignment="Center" />
<TextBlock Grid.Column="2" Text="{Binding CurrentSequentiual.Sequentiual3Status}" FontSize="15" Margin="15,0" FontWeight="Normal" VerticalAlignment="Center" /> <TextBlock Grid.Column="2" Text="{Binding CurrentSequentiual.Sequentiual4Status}" FontSize="15" Margin="15,0" FontWeight="Normal" VerticalAlignment="Center" />
<TextBlock Grid.Column="3" Text="时序4状态:" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground="#00BFFF" VerticalAlignment="Center" /> <TextBlock Grid.Column="3" Text="时序5状态:" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground="#00BFFF" VerticalAlignment="Center" />
<TextBlock Grid.Column="4" Text="{Binding CurrentSequentiual.Sequentiual4Status}" FontSize="15" Margin="15,0" FontWeight="Normal" VerticalAlignment="Center" /> <TextBlock Grid.Column="4" Text="{Binding CurrentSequentiual.Sequentiual5Status}" FontSize="15" Margin="15,0" FontWeight="Normal" VerticalAlignment="Center" />
<Button Content="刷新" Grid.Column="5" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshSeCommand}" Width="60" HorizontalAlignment="Left" Background="#88409EFE" Name="Refresh">
<Button.CommandParameter>
<MultiBinding Converter="{StaticResource ResourceKey=BtnConvert}">
<MultiBinding.Bindings>
<Binding ElementName="Refresh" Path="Name" />
</MultiBinding.Bindings>
</MultiBinding>
</Button.CommandParameter>
</Button>
</Grid> </Grid>
<Grid Grid.Row="2" Margin="0,20,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150"/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="1" Text="时序5状态:" FontSize="15" Margin="15,0" FontWeight="Normal" Foreground="#00BFFF" VerticalAlignment="Center" />
<TextBlock Grid.Column="2" Text="{Binding CurrentSequentiual.Sequentiual5Status}" FontSize="15" Margin="15,0" FontWeight="Normal" VerticalAlignment="Center" />
</Grid>
</Grid> </Grid>
</Grid> </Grid>