From ea6ae3f1abbef64475722bb0ae40696393085762 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Thu, 10 Nov 2022 14:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=80=BB=E5=A4=A7=E5=B1=8Fya?=
 =?UTF-8?q?ng=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../分餐机/ScreenSplitMealsControl1.xaml   |  6 ++---
 .../分餐机/ScreenSplitMealsControl2.xaml   |  6 ++---
 .../分餐机/ScreenSplitMealsControl3.xaml   |  6 ++---
 .../总监视大屏/ScreenALLControl.xaml     | 25 ++++++++++++++++---
 .../炒锅/ScreenMaxWokControl.xaml           |  6 ++---
 .../炒锅/ScreenMinWokControl.xaml           |  6 ++---
 .../煮面机/ScreenMorksControl.xaml         |  6 ++---
 7 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
index 12575faf..8cfb8fd9 100644
--- a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
+++ b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
@@ -92,12 +92,12 @@
                     <wv2:WebView2 Name="webView" Source="{Binding GgAdder,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                 </Grid>
             </GroupBox>
-            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="告警信息展示区域" Style="{DynamicResource  from}">
+            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="信息通知区域" Style="{DynamicResource  from}">
                 <DataGrid Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Width="250">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="告警时间" Foreground="White"/>
+                                <TextBlock Text="信息时间" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
@@ -107,7 +107,7 @@
                         </DataGridTemplateColumn>
                         <DataGridTemplateColumn Width="*">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="告警描述" Foreground="White"/>
+                                <TextBlock Text="详细描述" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
diff --git a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml
index 16ed5e3f..58fe2d18 100644
--- a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml
+++ b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml
@@ -92,12 +92,12 @@
                     <wv2:WebView2 Name="webView" Source="{Binding GgAdder,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                 </Grid>
             </GroupBox>
-            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="告警信息展示区域" Style="{DynamicResource  from}">
+            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="信息通知区域" Style="{DynamicResource  from}">
                 <DataGrid Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Width="250">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="告警时间" Foreground="White"/>
+                                <TextBlock Text="信息时间" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
@@ -107,7 +107,7 @@
                         </DataGridTemplateColumn>
                         <DataGridTemplateColumn Width="*">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="告警描述" Foreground="White"/>
+                                <TextBlock Text="详细描述" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
diff --git a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml
index 81c0df1e..6447a3ea 100644
--- a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml
+++ b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml
@@ -92,12 +92,12 @@
                     <wv2:WebView2 Name="webView" Source="{Binding GgAdder,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                 </Grid>
             </GroupBox>
-            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="告警信息展示区域" Style="{DynamicResource  from}">
+            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="信息通知区域" Style="{DynamicResource  from}">
                 <DataGrid Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Width="250">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="告警时间" Foreground="White"/>
+                                <TextBlock Text="信息时间" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
@@ -107,7 +107,7 @@
                         </DataGridTemplateColumn>
                         <DataGridTemplateColumn Width="*">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="告警描述" Foreground="White"/>
+                                <TextBlock Text="详细描述" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
diff --git a/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml b/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml
index be430e01..69fafb1d 100644
--- a/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml
+++ b/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml
@@ -373,12 +373,31 @@
             </GroupBox>
         </StackPanel>
         <Grid Grid.Column="1" >
-            <Grid>
                <Grid VerticalAlignment="Top" Margin="0,-30,0,0">
                    <Image Style="{DynamicResource imagezhu}"></Image>
                    <Image Style="{DynamicResource image中1}" Margin="0,400,0,0"></Image>
                    <GroupBox Margin="600,100,0,500" Header="{Binding GZallCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="累计故障数" Content="次" Width="100"/>
                    <GroupBox Margin="600,400,0,0" Header="{Binding SplitMealsCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="食堂累计刷卡次数" Content="次" Width="160"/>
                    <GroupBox Margin="-500,100,0,0" Header="{Binding UserCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="日总接待人数" Content="人" Width="160"/>
                  
                </Grid>
                <GroupBox Margin="0,0,0,10" Height="310" Width="950" VerticalAlignment="Bottom" Header="告警信息展示区域" Style="{DynamicResource  from}">
+            <Grid>
                <Grid VerticalAlignment="Top" Margin="0,-30,0,0">
                    <Image Style="{DynamicResource imagezhu}"></Image>
                    <Image Style="{DynamicResource image中1}" Margin="0,400,0,0"></Image>
                    <GroupBox Margin="600,100,0,500" Header="{Binding GZallCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="累计故障数" Content="次" Width="100"/>
                    <GroupBox Margin="600,400,0,0" Header="{Binding SplitMealsCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="食堂累计刷卡次数" Content="次" Width="160"/>
                    <GroupBox Margin="-500,100,0,0" Header="{Binding UserCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="日总接待人数" Content="人" Width="160"/>
                  
                </Grid>
                <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="信息通知区域" VerticalAlignment="Bottom" Style="{DynamicResource  from}">
+                    <!--<ListBox Margin="10,-10,10,10" ScrollViewer.VerticalScrollBarVisibility="Disabled" ItemsSource="{Binding AlarmAll,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <WrapPanel>
+                                    <Border Style="{DynamicResource border阴影边框}" Width="850" Height="50" Margin="20,10,0,5" >
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="300"/>
+                                                <ColumnDefinition/>
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock Grid.Column="0" Margin="0,0,10,0" HorizontalAlignment="Right" Foreground="{DynamicResource HorizontalSliderThumbHoverBackgroundInverted }" VerticalAlignment="Center" Text="{Binding AlarmTime,StringFormat={}{0}}" FontSize="24"></TextBlock>
+                                            <TextBlock></TextBlock>
+                                            <TextBlock Grid.Column="1" Margin="40,0,0,0" HorizontalAlignment="Left" Foreground="{DynamicResource HorizontalSliderThumbHoverBackgroundInverted}" VerticalAlignment="Center" Text="{Binding AlarmMs}" FontSize="24"></TextBlock>
+                                        </Grid>
+                                    </Border>
+                                </WrapPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>-->
                     <DataGrid Margin="10,10,10,0" ItemsSource="{Binding AlarmAll,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                         <DataGrid.Columns>
                             <DataGridTemplateColumn Width="250">
                                 <DataGridTemplateColumn.Header>
-                                    <TextBlock Text="告警时间" Foreground="White"/>
+                                    <TextBlock Text="信息时间" Foreground="White"/>
                                 </DataGridTemplateColumn.Header>
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
@@ -388,7 +407,7 @@
                             </DataGridTemplateColumn>
                             <DataGridTemplateColumn Width="*">
                                 <DataGridTemplateColumn.Header>
-                                    <TextBlock Text="告警描述" Foreground="White"/>
+                                    <TextBlock Text="详细描述" Foreground="White"/>
                                 </DataGridTemplateColumn.Header>
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
diff --git a/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml b/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml
index 0c2ecf02..631068bd 100644
--- a/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml
+++ b/BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml
@@ -201,12 +201,12 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="告警信息展示区域" Style="{DynamicResource  from}">
+            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="信息通知区域" Style="{DynamicResource  from}">
                 <DataGrid Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Width="250">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="告警时间" Foreground="White"/>
+                                <TextBlock Text="信息时间" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
@@ -216,7 +216,7 @@
                         </DataGridTemplateColumn>
                         <DataGridTemplateColumn Width="*">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="告警描述" Foreground="White"/>
+                                <TextBlock Text="详细描述" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
diff --git a/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml b/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml
index a54a7acd..402c3304 100644
--- a/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml
+++ b/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml
@@ -201,12 +201,12 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="告警信息展示区域" Style="{DynamicResource  from}">
+            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="信息通知区域" Style="{DynamicResource  from}">
                 <DataGrid Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Width="250">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="告警时间" Foreground="White"/>
+                                <TextBlock Text="信息时间" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
@@ -216,7 +216,7 @@
                         </DataGridTemplateColumn>
                         <DataGridTemplateColumn Width="*">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="告警描述" Foreground="White"/>
+                                <TextBlock Text="详细描述" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
diff --git a/BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml b/BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml
index 59fb2f97..c03ac645 100644
--- a/BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml
+++ b/BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml
@@ -123,12 +123,12 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="告警信息展示区域" Style="{DynamicResource  from}">
+            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="信息通知区域" Style="{DynamicResource  from}">
                 <DataGrid Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <DataGrid.Columns>
                         <DataGridTemplateColumn Width="250">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="告警时间" Foreground="White"/>
+                                <TextBlock Text="信息时间" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
@@ -138,7 +138,7 @@
                         </DataGridTemplateColumn>
                         <DataGridTemplateColumn Width="*">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="告警描述" Foreground="White"/>
+                                <TextBlock Text="详细描述" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>