From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject

---
 HMI.AlermInfoManage/AlarmInfoManage.xaml |   22 +++-------------------
 1 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/HMI.AlermInfoManage/AlarmInfoManage.xaml b/HMI.AlermInfoManage/AlarmInfoManage.xaml
index 81ccab8..bf97180 100644
--- a/HMI.AlermInfoManage/AlarmInfoManage.xaml
+++ b/HMI.AlermInfoManage/AlarmInfoManage.xaml
@@ -30,12 +30,9 @@
         <StackPanel>
             <DockPanel Margin="0,0,0,10">
                 <StackPanel DockPanel.Dock="Right" Style="{StaticResource ButtonGroup}">
-                    <Button Style="{StaticResource PrimaryButton}"
-pu:ButtonHelper.Icon="&#xe94d;" x:Name="settingBtn" Click="Button_Click">璁剧疆</Button>
-                    <Button Style="{StaticResource PrimaryButton}" 
-pu:ButtonHelper.Icon="&#xe631;" x:Name="refreshBtn" Click="Button_Click">鍒锋柊</Button>
-                    <Button Style="{StaticResource PrimaryButton}"
-pu:ButtonHelper.Icon="&#xe639;" x:Name="importBtn" Click="Button_Click">瀵煎叆</Button>
+                    <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"/>
                 </StackPanel>
                 <!--<Button DockPanel.Dock="Right" pu:ButtonHelper.Icon="&#xe934;" 
                         Style="{StaticResource DangerButton}">鍒犻櫎</Button>-->
@@ -79,19 +76,6 @@
                             DataContext="{Binding }"
                             Click="Button_Click">鍒犻櫎</Button>
                                 </StackPanel>
-
-                                <DataTemplate.Triggers>
-                                    <DataTrigger Binding="{Binding Path=IsMouseOver,
-                        RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}" 
-                                 Value="True">
-                                        <Setter TargetName="editBtn" Property="Foreground" Value="#FFF"/>
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding Path=IsSelected,
-                        RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}" 
-                                 Value="True">
-                                        <Setter TargetName="editBtn" Property="Foreground" Value="#FFF"/>
-                                    </DataTrigger>
-                                </DataTemplate.Triggers>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>

--
Gitblit v1.9.1