TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加报警

Browse Source
This commit is contained in:
Tyrone CT
2025-01-01 17:41:48 +08:00
parent f26bf28181
commit 7b5df5877d
16 changed files with 896 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
CapMachine.Wpf/Views/ActionLogView.xaml
View File

@@ -8,14 +8,14 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:prism="http://prismlibrary.com/"
Width="1920"
Height="980"
Height="960"
prism:ViewModelLocator.AutoWireViewModel="True">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="220" />
<RowDefinition Height="160" />
<RowDefinition />
</Grid.RowDefinitions>
<GroupBox Margin="5,10,5,10" Header="日志查询条件">
<GroupBox Margin="3,5,3,3" Header="日志/历史报警查询">
<StackPanel Margin="0,0,0,0" Orientation="Vertical">
<StackPanel.Resources>
<Style TargetType="StackPanel">
@@ -35,23 +35,20 @@
</StackPanel.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="9*" />
<RowDefinition Height="3*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel
Grid.Column="0"
Margin="0,0,0,20"
HorizontalAlignment="Center"
Orientation="Horizontal">
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<StackPanel
Margin="20"
Margin="20,5"
HorizontalAlignment="Center"
Orientation="Horizontal">
<Label
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Content="分类:" />
Content="分类:"
FontSize="20" />
<DockPanel x:Name="Combbox1">
<StackPanel>
<!--<ComboBox Width="200" HorizontalAlignment="Left" ItemsSource="{Binding CombboxList}" SelectedItem="{Binding CombboxItem}" DisplayMemberPath="Text" SelectedValuePath="Key" ></ComboBox>-->
@@ -59,18 +56,23 @@
Width="120"
materialDesign:HintAssist.Hint="分类"
DisplayMemberPath="Text"
FontSize="18"
ItemsSource="{Binding CategoryComboBoxList}"
SelectedValue="{Binding SearchCategory}"
SelectedValuePath="Text" />
</StackPanel>
</DockPanel>
</StackPanel>
<StackPanel Margin="20">
<Label HorizontalContentAlignment="Center" Content="创建时间:" />
<StackPanel Margin="20,5">
<Label
HorizontalContentAlignment="Center"
Content="创建时间:"
FontSize="20" />
<DatePicker
Width="120"
Margin="0,0,10,0"
materialDesign:HintAssist.Hint="开始时间"
FontSize="16"
Language="zh-CN"
SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
@@ -78,78 +80,95 @@
Width="120"
Margin="10,0,10,0"
materialDesign:HintAssist.Hint="结束时间"
FontSize="16"
Language="zh-CN"
SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
</StackPanel>
</StackPanel>
<StackPanel
Grid.Row="1"
Background=" AliceBlue"
Orientation="Horizontal">
<StackPanel Grid.Row="1" Orientation="Horizontal">
<Button
Width="120"
Height="30"
Margin="10,10,10,10"
HorizontalAlignment="Center"
Background="Green"
Command="{Binding SearchCmd}"
Content="搜索"
Foreground="White" />
<Button
Foreground="White">
<StackPanel
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock
Margin="0,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="18"
Text="&#xe75a;" />
<TextBlock
Margin="0,0,5,0"
VerticalAlignment="Center"
FontSize="18"
Text="搜索" />
</StackPanel>
</Button>
<!--<Button
Width="120"
Height="30"
Margin="10,10,10,10"
HorizontalAlignment="Center"
Background="Orange"
Command="{Binding OutputDataCmd}"
Content="导出数据"
Foreground="White" />
Foreground="White" />-->
</StackPanel>
</Grid>
</StackPanel>
</GroupBox>
<Grid Grid.Row="1" Margin="8">
<DataGrid
x:Name="dg1"
Grid.ColumnSpan="2"
AutoGenerateColumns="False"
IsReadOnly="True"
ItemsSource="{Binding ListModelDto}"
SelectionMode="Single"
SelectionUnit="Cell">
<!--<i:Interaction.Triggers>
<i:EventTrigger EventName="SelectionChanged">
<i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
</i:EventTrigger>
</i:Interaction.Triggers>-->
<DataGrid.Columns>
<Border
Grid.Row="1"
Margin="2"
BorderBrush="Gray"
BorderThickness="1"
CornerRadius="3">
<Grid>
<DataGrid
x:Name="dg1"
VerticalAlignment="Stretch"
AutoGenerateColumns="True"
AutoGeneratingColumn="dg1_AutoGeneratingColumn"
IsReadOnly="True"
ItemsSource="{Binding ListModelDto}"
ScrollViewer.HorizontalScrollBarVisibility="Auto"
SelectionMode="Extended">
<!--<i:Interaction.Triggers>
<i:EventTrigger EventName="SelectionChanged">
<i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
</i:EventTrigger>
</i:Interaction.Triggers>-->
<!--<DataGrid.Columns>
<DataGridTextColumn
Width="100"
Binding="{Binding Level}"
Header="等级" />
<DataGridTextColumn
Width="100"
Binding="{Binding Level}"
Header="等级" />
<DataGridTextColumn
Width="200"
Binding="{Binding Category}"
Header="分类" />
<DataGridTextColumn
Width="200"
Binding="{Binding Category}"
Header="分类" />
<DataGridTextColumn
Width="1200"
Binding="{Binding Content}"
Header="内容" />
<DataGridTextColumn
Width="1200"
Binding="{Binding Content}"
Header="内容" />
<DataGridTextColumn
Width="180"
Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
Header="创建时间" />
</DataGrid.Columns>-->
</DataGrid>
</Grid>
</Border>
<DataGridTextColumn
Width="180"
Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
Header="创建时间" />
</DataGrid.Columns>
</DataGrid>
</Grid>
</Grid>
</UserControl>