Skip to content

H
hemei
Commit 7b0d8ff0 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

添加 全部error数据浏览

parent 3f406aa1
Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 2 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/FLY.Thick.Blowing.UI.Fix.Client.csproj
View file @ 7b0d8ff0
......@@ -91,6 +91,9 @@
</Compile>
<Compile Include="BlowingDetectCore.cs" />
<Compile Include="CalFilmLen.cs" />
<Compile Include="PgErrorAllTable.xaml.cs">
<DependentUpon>PgErrorAllTable.xaml</DependentUpon>
</Compile>
<Compile Include="PgBlowing.xaml.cs">
<DependentUpon>PgBlowing.xaml</DependentUpon>
</Compile>
......@@ -162,6 +165,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="PgErrorAllTable.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="PgBlowing.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgCustom.xaml
View file @ 7b0d8ff0
......@@ -116,7 +116,6 @@
</Border>
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<Button Content="清空缓存" Style="{StaticResource ResourceKey=ButtonStyle2}" Click="button_clear_Click" />
<Button Content="清空bulk" Style="{StaticResource ResourceKey=ButtonStyle2}" Click="button_bulkdata_Click" />
</StackPanel>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgErrorAllTable.xaml 0 → 100644
View file @ 7b0d8ff0
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.PgErrorAllTable"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FLY.Thick.Blowing.UI.Fix.Client"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d"
d:DesignHeight="900" d:DesignWidth="960" Background="White"
Title="Page_ErrorTable">
<Page.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
<Style TargetType="Control" x:Key="iconPackStyle">
<Setter Property="Width" Value="25"/>
<Setter Property="Height" Value="25"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
<Style TargetType="FrameworkElement" x:Key="backPackStyle">
<Setter Property="Width" Value="50"/>
<Setter Property="Height" Value="50"/>
</Style>
<Style TargetType="TextBlock" x:Key="titlePackStyle">
<Setter Property="Margin" Value="2"/>
<Setter Property="FontSize" Value="16"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style TargetType="Button" x:Key="buttonStyle" BasedOn="{StaticResource ButtonStyle_empty}">
<Setter Property="Margin" Value="20,0"/>
</Style>
</ResourceDictionary>
</Page.Resources>
<Grid Name="root_grid" >
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="496*" />
</Grid.RowDefinitions>
<Grid Background="{StaticResource Background_Title}">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" >
<Button Style="{StaticResource ButtonStyle_back2}" Click="button_back_Click" />
<TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="报警"/>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" >
<Button Style="{StaticResource buttonStyle}" Click="button_clear_click" >
<StackPanel Orientation="Vertical">
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Style="{StaticResource backPackStyle}" Fill="White"/>
<iconPacks:PackIconMaterialDesign Kind="Clear" Style="{StaticResource iconPackStyle}" Foreground="#FFEE3232"/>
</Grid>
<TextBlock Text="清空" Style="{StaticResource titlePackStyle}"/>
</StackPanel>
</Button>
</StackPanel>
</Grid>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Border Width="150" Background="{StaticResource Color_theme_activity}" Margin="0,5,5,5" >
<TextBlock Style="{StaticResource TextBlockStyle_ItemHeader}" Text="历史报警&#x0a;列表" />
</Border>
<Grid Grid.Column="1" x:Name="grid_window">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="751*"/>
<ColumnDefinition Width="54*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Margin="5">
<Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="button_prepage_Click" Width="40" Height="40" Margin="5">
<Path Data="{StaticResource Geometry_arrow-left}" Fill="{StaticResource Color_theme_activity}" Stretch="Uniform"/>
</Button>
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="第"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding CurrentPage}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="页"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="/"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="共"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding TotalPages}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="页"/>
</StackPanel>
<Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="button_nextpage_Click" Width="40" Height="40" Margin="5">
<Path Data="{StaticResource Geometry_arrow-right}" Fill="{StaticResource Color_theme_activity}" Stretch="Uniform"/>
</Button>
<Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="button_newest_Click" Width="40" Height="40" Margin="5">
<Path Data="{StaticResource Geometry_arrow-collapse-right}" Fill="{StaticResource Color_theme_activity}" Stretch="Uniform"/>
</Button>
<StackPanel Orientation="Horizontal" Margin="20,5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="显示"/>
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Size}" MinWidth="40"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="行"/>
</StackPanel>
</StackPanel>
</Grid>
<DataGrid Grid.Row="1" ItemsSource="{Binding Record}" AutoGenerateColumns="False" IsReadOnly="True" Grid.ColumnSpan="2" >
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="FontSize" Value="20"/>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding Time,StringFormat={}{0:MM/dd HH:mm}}" >
<DataGridTextColumn.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="时间" />
</StackPanel>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Binding="{Binding State}" >
<DataGridTextColumn.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="状态" />
</StackPanel>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Binding="{Binding Description}" >
<DataGridTextColumn.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="报警描述" />
</StackPanel>
</DataGridTextColumn.Header>
</DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
</Grid>
</Grid>
</Grid>
</Page>
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgErrorAllTable.xaml.cs 0 → 100644
View file @ 7b0d8ff0

using FLY.OBJComponents.Client;
using FLY.OBJComponents.Common;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace FLY.Thick.Blowing.UI.Fix.Client
{
/// <summary>
/// Page_Flow.xaml 的交互逻辑
/// </summary>
public partial class PgErrorAllTable : Page
{
WarningServiceClient mWarningService;
BufferWindow<FlyData_WarningHistory> mWindow;
TDGage gage;
public PgErrorAllTable()
{
InitializeComponent();
Init();
}
void Init()
{
gage = Application.Current.Properties["Gage"] as TDGage;
var sysparam = gage.mSysParam as SysParam;
mWarningService = gage.mWarningService;
mWindow = new BufferWindow<FlyData_WarningHistory>(mWarningService.NewestList, sysparam.WindowSize);
mWindow.PropertyChanged += (s, e) =>
{
if (e.PropertyName == "Size")
{
(gage.mSysParam as SysParam).WindowSize = mWindow.Size;
gage.mSysParam.Save();
}
};
grid_window.DataContext = mWindow;
}
private void button_back_Click(object sender, RoutedEventArgs e)
{
NavigationService.GoBack();
}
private void button_clear_click(object sender, RoutedEventArgs e)
{
if (FLY.ControlLibrary.MyMessageBox.Show("确定是否清空全部历史数据?") == true)
{
mWarningService.NewestList.Reset();
FLY.ControlLibrary.Window_Tip.Show("成功", "清除完毕!", TimeSpan.FromSeconds(2));
}
}
private void button_prepage_Click(object sender, RoutedEventArgs e)
{
mWindow.MovePrePage();
}
private void button_nextpage_Click(object sender, RoutedEventArgs e)
{
mWindow.MoveNextPage();
}
private void button_newest_Click(object sender, RoutedEventArgs e)
{
mWindow.MoveNewest();
}
}
}
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgErrorTable.xaml
View file @ 7b0d8ff0
......@@ -69,6 +69,15 @@
<TextBlock Text="授权" Style="{StaticResource titlePackStyle}"/>
</StackPanel>
</Button>
<Button Style="{StaticResource buttonStyle}" Click="button_database_click" >
<StackPanel Orientation="Vertical">
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Style="{StaticResource backPackStyle}" Fill="{StaticResource Color_theme_static}" />
<iconPacks:PackIconMaterial Kind="DatabaseSearch" Style="{StaticResource iconPackStyle}" Foreground="White"/>
</Grid>
<TextBlock Text="查询" Style="{StaticResource titlePackStyle}"/>
</StackPanel>
</Button>
<Button Style="{StaticResource buttonStyle}" Click="button_reset_click" >
<StackPanel Orientation="Vertical">
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgErrorTable.xaml.cs
View file @ 7b0d8ff0
......@@ -71,5 +71,16 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
{
mWarningService.Silence();
}
private void button_database_click(object sender, RoutedEventArgs e)
{
NavigationService ns = Application.Current.Properties["NavigationService"] as NavigationService;
if (ns != null)
{
PgErrorAllTable p = new PgErrorAllTable();
ns.Navigate(p);
}
}
}
}
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/SysParam.cs
View file @ 7b0d8ff0
......@@ -14,7 +14,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
public class SysParam : ThickTcpUiInWindow.SysParam
{
#region 数据文件需要保存的数据项
public int WindowSize { get; set; } = 30;
#endregion
......@@ -24,5 +24,14 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
}
public override string[] GetSavePropertyNames()
{
List<string> propertynames = new List<string>();
propertynames.AddRange(base.GetSavePropertyNames());
propertynames.AddRange(new string[]{
"WindowSize"
});
return propertynames.ToArray();
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment