From 3c8453bf82475e25a3a9a2d6faaa301c6e6228e3 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Fri, 18 Aug 2023 22:00:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E9=85=8D=E6=96=B9?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/View/AlarmView.xaml                      | 14 ++++++++++----
 .../Pages/View/RecipeCompleteView.xaml             |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/BPASmartClient.CustomResource/Pages/View/AlarmView.xaml b/BPASmartClient.CustomResource/Pages/View/AlarmView.xaml
index d7341ee9..f9d449b7 100644
--- a/BPASmartClient.CustomResource/Pages/View/AlarmView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/AlarmView.xaml
@@ -239,11 +239,14 @@
 
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="139*"/>
-                    <ColumnDefinition Width="641*"/>
+                    <ColumnDefinition Width="139*" />
+                    <ColumnDefinition Width="641*" />
                 </Grid.ColumnDefinitions>
                 <!--#region 实时报警信息-->
-                <ItemsControl ItemsSource="{Binding AlarmInfos}" Visibility="{Binding CurrentDataVis}" Grid.ColumnSpan="2">
+                <ItemsControl
+                    Grid.ColumnSpan="2"
+                    ItemsSource="{Binding AlarmInfos}"
+                    Visibility="{Binding CurrentDataVis}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
                             <Grid x:Name="gr" Height="30">
@@ -309,7 +312,10 @@
                 <!--#endregion-->
 
                 <!--#region  历史报警信息-->
-                <ItemsControl ItemsSource="{Binding HistoryAlarm}" Visibility="{Binding HistoryDataVis}" Grid.ColumnSpan="2">
+                <ItemsControl
+                    Grid.ColumnSpan="2"
+                    ItemsSource="{Binding HistoryAlarm}"
+                    Visibility="{Binding HistoryDataVis}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
                             <Grid x:Name="gr" Height="30">
diff --git a/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml b/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml
index db6b3f59..b67fcafa 100644
--- a/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml
@@ -265,7 +265,7 @@
                                     Margin="10,0,0,0"
                                     HorizontalAlignment="Left"
                                     Style="{StaticResource DataTextBlockStyle}"
-                                    Text="{Binding RunLogInfo}"
+                                    Text="{Binding RecipeName}"
                                     TextWrapping="Wrap" />
 
                                 <Border