Browse Source

1. 修改配方记录界面显示信息。

master
ZhaoGang 1 year ago
parent
commit
3c8453bf82
2 changed files with 11 additions and 5 deletions
  1. +10
    -4
      BPASmartClient.CustomResource/Pages/View/AlarmView.xaml
  2. +1
    -1
      BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml

+ 10
- 4
BPASmartClient.CustomResource/Pages/View/AlarmView.xaml View File

@@ -239,11 +239,14 @@


<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="139*"/>
<ColumnDefinition Width="641*"/>
<ColumnDefinition Width="139*" />
<ColumnDefinition Width="641*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--#region 实时报警信息--> <!--#region 实时报警信息-->
<ItemsControl ItemsSource="{Binding AlarmInfos}" Visibility="{Binding CurrentDataVis}" Grid.ColumnSpan="2">
<ItemsControl
Grid.ColumnSpan="2"
ItemsSource="{Binding AlarmInfos}"
Visibility="{Binding CurrentDataVis}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid x:Name="gr" Height="30"> <Grid x:Name="gr" Height="30">
@@ -309,7 +312,10 @@
<!--#endregion--> <!--#endregion-->


<!--#region 历史报警信息--> <!--#region 历史报警信息-->
<ItemsControl ItemsSource="{Binding HistoryAlarm}" Visibility="{Binding HistoryDataVis}" Grid.ColumnSpan="2">
<ItemsControl
Grid.ColumnSpan="2"
ItemsSource="{Binding HistoryAlarm}"
Visibility="{Binding HistoryDataVis}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid x:Name="gr" Height="30"> <Grid x:Name="gr" Height="30">


+ 1
- 1
BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml View File

@@ -265,7 +265,7 @@
Margin="10,0,0,0" Margin="10,0,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Style="{StaticResource DataTextBlockStyle}" Style="{StaticResource DataTextBlockStyle}"
Text="{Binding RunLogInfo}"
Text="{Binding RecipeName}"
TextWrapping="Wrap" /> TextWrapping="Wrap" />


<Border <Border


Loading…
Cancel
Save