fyf
2 years ago
7 changed files with 40 additions and 21 deletions
Unified View
Diff Options
-
+3 -3BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
-
+3 -3BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml
-
+3 -3BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml
-
+22 -3BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml
-
+3 -3BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml
-
+3 -3BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml
-
+3 -3BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml
+ 3
- 3
BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
View File
| @@ -92,12 +92,12 @@ | |||||
| <wv2:WebView2 Name="webView" Source="{Binding GgAdder,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> | <wv2:WebView2 Name="webView" Source="{Binding GgAdder,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> | ||||
| </Grid> | </Grid> | ||||
| </GroupBox> | </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 Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"> | ||||
| <DataGrid.Columns> | <DataGrid.Columns> | ||||
| <DataGridTemplateColumn Width="250"> | <DataGridTemplateColumn Width="250"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警时间" Foreground="White"/> | |||||
| <TextBlock Text="信息时间" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
| @@ -107,7 +107,7 @@ | |||||
| </DataGridTemplateColumn> | </DataGridTemplateColumn> | ||||
| <DataGridTemplateColumn Width="*"> | <DataGridTemplateColumn Width="*"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警描述" Foreground="White"/> | |||||
| <TextBlock Text="详细描述" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
+ 3
- 3
BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml
View File
| @@ -92,12 +92,12 @@ | |||||
| <wv2:WebView2 Name="webView" Source="{Binding GgAdder,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> | <wv2:WebView2 Name="webView" Source="{Binding GgAdder,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> | ||||
| </Grid> | </Grid> | ||||
| </GroupBox> | </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 Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"> | ||||
| <DataGrid.Columns> | <DataGrid.Columns> | ||||
| <DataGridTemplateColumn Width="250"> | <DataGridTemplateColumn Width="250"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警时间" Foreground="White"/> | |||||
| <TextBlock Text="信息时间" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
| @@ -107,7 +107,7 @@ | |||||
| </DataGridTemplateColumn> | </DataGridTemplateColumn> | ||||
| <DataGridTemplateColumn Width="*"> | <DataGridTemplateColumn Width="*"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警描述" Foreground="White"/> | |||||
| <TextBlock Text="详细描述" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
+ 3
- 3
BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml
View File
| @@ -92,12 +92,12 @@ | |||||
| <wv2:WebView2 Name="webView" Source="{Binding GgAdder,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> | <wv2:WebView2 Name="webView" Source="{Binding GgAdder,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> | ||||
| </Grid> | </Grid> | ||||
| </GroupBox> | </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 Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"> | ||||
| <DataGrid.Columns> | <DataGrid.Columns> | ||||
| <DataGridTemplateColumn Width="250"> | <DataGridTemplateColumn Width="250"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警时间" Foreground="White"/> | |||||
| <TextBlock Text="信息时间" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
| @@ -107,7 +107,7 @@ | |||||
| </DataGridTemplateColumn> | </DataGridTemplateColumn> | ||||
| <DataGridTemplateColumn Width="*"> | <DataGridTemplateColumn Width="*"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警描述" Foreground="White"/> | |||||
| <TextBlock Text="详细描述" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
+ 22
- 3
BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml
View File
| @@ -373,12 +373,31 @@ | |||||
| </GroupBox> | </GroupBox> | ||||
| </StackPanel> | </StackPanel> | ||||
| <Grid Grid.Column="1" > | <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 Margin="10,10,10,0" ItemsSource="{Binding AlarmAll,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"> | ||||
| <DataGrid.Columns> | <DataGrid.Columns> | ||||
| <DataGridTemplateColumn Width="250"> | <DataGridTemplateColumn Width="250"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警时间" Foreground="White"/> | |||||
| <TextBlock Text="信息时间" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
| @@ -388,7 +407,7 @@ | |||||
| </DataGridTemplateColumn> | </DataGridTemplateColumn> | ||||
| <DataGridTemplateColumn Width="*"> | <DataGridTemplateColumn Width="*"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警描述" Foreground="White"/> | |||||
| <TextBlock Text="详细描述" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
+ 3
- 3
BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml
View File
| @@ -201,12 +201,12 @@ | |||||
| </Grid> | </Grid> | ||||
| </GroupBox> | </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 Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"> | ||||
| <DataGrid.Columns> | <DataGrid.Columns> | ||||
| <DataGridTemplateColumn Width="250"> | <DataGridTemplateColumn Width="250"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警时间" Foreground="White"/> | |||||
| <TextBlock Text="信息时间" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
| @@ -216,7 +216,7 @@ | |||||
| </DataGridTemplateColumn> | </DataGridTemplateColumn> | ||||
| <DataGridTemplateColumn Width="*"> | <DataGridTemplateColumn Width="*"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警描述" Foreground="White"/> | |||||
| <TextBlock Text="详细描述" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
+ 3
- 3
BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml
View File
| @@ -201,12 +201,12 @@ | |||||
| </Grid> | </Grid> | ||||
| </GroupBox> | </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 Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"> | ||||
| <DataGrid.Columns> | <DataGrid.Columns> | ||||
| <DataGridTemplateColumn Width="250"> | <DataGridTemplateColumn Width="250"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警时间" Foreground="White"/> | |||||
| <TextBlock Text="信息时间" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
| @@ -216,7 +216,7 @@ | |||||
| </DataGridTemplateColumn> | </DataGridTemplateColumn> | ||||
| <DataGridTemplateColumn Width="*"> | <DataGridTemplateColumn Width="*"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警描述" Foreground="White"/> | |||||
| <TextBlock Text="详细描述" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
+ 3
- 3
BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml
View File
| @@ -123,12 +123,12 @@ | |||||
| </Grid> | </Grid> | ||||
| </GroupBox> | </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 Margin="10,10,10,0" ItemsSource="{Binding ViewData.Alarm,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"> | ||||
| <DataGrid.Columns> | <DataGrid.Columns> | ||||
| <DataGridTemplateColumn Width="250"> | <DataGridTemplateColumn Width="250"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警时间" Foreground="White"/> | |||||
| <TextBlock Text="信息时间" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
| @@ -138,7 +138,7 @@ | |||||
| </DataGridTemplateColumn> | </DataGridTemplateColumn> | ||||
| <DataGridTemplateColumn Width="*"> | <DataGridTemplateColumn Width="*"> | ||||
| <DataGridTemplateColumn.Header> | <DataGridTemplateColumn.Header> | ||||
| <TextBlock Text="告警描述" Foreground="White"/> | |||||
| <TextBlock Text="详细描述" Foreground="White"/> | |||||
| </DataGridTemplateColumn.Header> | </DataGridTemplateColumn.Header> | ||||
| <DataGridTemplateColumn.CellTemplate> | <DataGridTemplateColumn.CellTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||