From 12e606635c42ea20f4b7c2bdda5204237a4b4c96 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 02 三月 2026 16:14:49 +0800
Subject: [PATCH] 优化
---
HMI.AlermInfoManage/AlarmInfoManage.xaml | 191 ++++++++++++++++++++++++++++-------------------
1 files changed, 114 insertions(+), 77 deletions(-)
diff --git a/HMI.AlermInfoManage/AlarmInfoManage.xaml b/HMI.AlermInfoManage/AlarmInfoManage.xaml
index 2d892d9..8ca01e9 100644
--- a/HMI.AlermInfoManage/AlarmInfoManage.xaml
+++ b/HMI.AlermInfoManage/AlarmInfoManage.xaml
@@ -10,7 +10,7 @@
xmlns:pw="https://opensource.panuon.com/wpf"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
mc:Ignorable="d"
- Background="{StaticResource WorkspaceBackground}"
+ Background="{DynamicResource WorkspaceBackground}"
Loaded="UserControl_Loaded"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
@@ -30,18 +30,17 @@
<StackPanel DockPanel.Dock="Right" Style="{StaticResource ButtonGroup}">
<Button Style="{StaticResource SettingBtn}" x:Name="settingBtn" Click="Button_Click"/>
<Button Style="{StaticResource RfhBtn}" x:Name="refreshBtn" Click="Button_Click"/>
- <Button Style="{StaticResource ImportBtn}" x:Name="importBtn" Click="Button_Click"/>
+ <!--<Button Style="{StaticResource ImportBtn}" x:Name="importBtn" Click="Button_Click"/>-->
</StackPanel>
+ <!--<TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}"
+ VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource Alm.Title}"/>-->
<TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}"
- VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource Alm.Title}"/>
+ VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource Alm.Record}"/>
</DockPanel>
-
- <TabControl Grid.Row="1" Style="{StaticResource HeaderTabControl}">
- <TabItem Header="鎶ヨ璁板綍">
- <DockPanel>
- <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
- <pu:Pagination
+ <DockPanel Grid.Row="1">
+ <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
+ <pu:Pagination
Height="36" Margin="10"
HorizontalAlignment="Left"
Foreground="Black"
@@ -51,78 +50,112 @@
x:Name="page"
CurrentPage="{Binding CurrentPage}"
MaxPage="{Binding MaxPage}"/>
- </StackPanel>
- <ListView x:Name="table" Style="{StaticResource DefaultListTable}"
+ </StackPanel>
+ <!--<ListView x:Name="table" Style="{StaticResource DefaultListTable}"
VirtualizingPanel.VirtualizationMode="Standard"
ItemsSource="{Binding Datasource}">
- <ListView.View>
- <GridView>
- <GridViewColumn Width="50">
- <GridViewColumn.Header>
- <TextBlock Text="#"/>
- </GridViewColumn.Header>
- <GridViewColumn.CellTemplate>
- <DataTemplate>
- <TextBlock Text="{Binding Converter={StaticResource lvRowNumber},
+ <ListView.View>
+ <GridView>
+ <GridViewColumn Width="50">
+ <GridViewColumn.Header>
+ <TextBlock Text="#"/>
+ </GridViewColumn.Header>
+ <GridViewColumn.CellTemplate>
+ <DataTemplate>
+ <TextBlock Text="{Binding Converter={StaticResource lvRowNumber},
RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ListViewItem,AncestorLevel=1}}"/>
- </DataTemplate>
- </GridViewColumn.CellTemplate>
- </GridViewColumn>
+ </DataTemplate>
+ </GridViewColumn.CellTemplate>
+ </GridViewColumn>
- <GridViewColumn Width="300">
- <GridViewColumn.Header>
- <TextBlock Text="{DynamicResource Alm.Source}"/>
- </GridViewColumn.Header>
- <GridViewColumn.CellTemplate>
- <DataTemplate>
- <Border Style="{StaticResource CellBorder}">
- <TextBlock VerticalAlignment="Center" Text="{Binding Source}"/>
- </Border>
- </DataTemplate>
- </GridViewColumn.CellTemplate>
- </GridViewColumn>
+ <GridViewColumn Width="300">
+ <GridViewColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Source}"/>
+ </GridViewColumn.Header>
+ <GridViewColumn.CellTemplate>
+ <DataTemplate>
+ <Border Style="{StaticResource CellBorder}">
+ <TextBlock VerticalAlignment="Center" Text="{Binding Source}"/>
+ </Border>
+ </DataTemplate>
+ </GridViewColumn.CellTemplate>
+ </GridViewColumn>
- <GridViewColumn Width="500">
- <GridViewColumn.Header>
- <TextBlock Text="{DynamicResource Alm.Code}"/>
- </GridViewColumn.Header>
- <GridViewColumn.CellTemplate>
- <DataTemplate>
- <Border Style="{StaticResource CellBorder}">
- <TextBlock VerticalAlignment="Center" Text="{Binding AlarmCode}"/>
- </Border>
- </DataTemplate>
- </GridViewColumn.CellTemplate>
- </GridViewColumn>
+ <GridViewColumn Width="500">
+ <GridViewColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Code}"/>
+ </GridViewColumn.Header>
+ <GridViewColumn.CellTemplate>
+ <DataTemplate>
+ <Border Style="{StaticResource CellBorder}">
+ <TextBlock VerticalAlignment="Center" Text="{Binding AlarmCode}"/>
+ </Border>
+ </DataTemplate>
+ </GridViewColumn.CellTemplate>
+ </GridViewColumn>
- <GridViewColumn Width="800">
- <GridViewColumn.Header>
- <TextBlock Text="{DynamicResource Alm.Info}"/>
- </GridViewColumn.Header>
- <GridViewColumn.CellTemplate>
- <DataTemplate>
- <Border Style="{StaticResource CellBorder}">
- <TextBlock VerticalAlignment="Center" Text="{Binding AlarmInfo}"/>
- </Border>
- </DataTemplate>
- </GridViewColumn.CellTemplate>
- </GridViewColumn>
- <GridViewColumn Width="200">
- <GridViewColumn.Header>
- <TextBlock Text="{DynamicResource Alm.Time}"/>
- </GridViewColumn.Header>
- <GridViewColumn.CellTemplate>
- <DataTemplate>
- <Border Style="{StaticResource CellBorder}">
- <TextBlock VerticalAlignment="Center" Text="{Binding Time}"/>
- </Border>
- </DataTemplate>
- </GridViewColumn.CellTemplate>
- </GridViewColumn>
- </GridView>
- </ListView.View>
- </ListView>
- <!--<DataGrid x:Name="table" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding Datasource}">
+ <GridViewColumn Width="800">
+ <GridViewColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Info}"/>
+ </GridViewColumn.Header>
+ <GridViewColumn.CellTemplate>
+ <DataTemplate>
+ <Border Style="{StaticResource CellBorder}">
+ <TextBlock VerticalAlignment="Center" Text="{Binding AlarmInfo}"/>
+ </Border>
+ </DataTemplate>
+ </GridViewColumn.CellTemplate>
+ </GridViewColumn>
+ <GridViewColumn Width="200">
+ <GridViewColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Time}"/>
+ </GridViewColumn.Header>
+ <GridViewColumn.CellTemplate>
+ <DataTemplate>
+ <Border Style="{StaticResource CellBorder}">
+ <TextBlock VerticalAlignment="Center" Text="{Binding Time}"/>
+ </Border>
+ </DataTemplate>
+ </GridViewColumn.CellTemplate>
+ </GridViewColumn>
+ </GridView>
+ </ListView.View>
+ </ListView>-->
+ <DataGrid x:Name="table" Style="{StaticResource DefaultDataGrid}"
+ dp:DataGridHelper.ShowRowNumber="True"
+ VirtualizingPanel.VirtualizationMode="Standard"
+ ItemsSource="{Binding Datasource}">
+ <DataGrid.Columns>
+ <DataGridTextColumn Header="#"
+ Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"
+ Width="40"/>
+ <DataGridTextColumn Width="200" Binding="{Binding Source}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Source}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTextColumn Width="200" Binding="{Binding AlarmCode}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Code}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTextColumn Width="*" Binding="{Binding AlarmInfo}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Info}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTextColumn Width="200" Binding="{Binding Time}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Time}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ </DataGrid.Columns>
+ </DataGrid>
+
+ <!--<DataGrid x:Name="table" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding Datasource}">
<DataGrid.Columns>
<DataGridTemplateColumn Header="" Width="Auto" CanUserResize="False">
<DataGridTemplateColumn.CellTemplate>
@@ -161,7 +194,11 @@
</DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>-->
- </DockPanel>
+ </DockPanel>
+
+ <!--<TabControl Grid.Row="1" Style="{StaticResource HeaderTabControl}">
+ <TabItem Header="">
+
</TabItem>
<TabItem Header="鎶ヨ淇℃伅">
<Grid>
@@ -222,7 +259,7 @@
</ListView>
</Grid>
</TabItem>
- </TabControl>
+ </TabControl>-->
</Grid>
</Border>
</hb:PluginControl>
--
Gitblit v1.9.1