From 1fca2167068e9ef2c079ec742f20313fc6697ab1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 03 三月 2025 09:18:33 +0800
Subject: [PATCH] 完善代码；

---
 HMI.AlermInfoManage/AlarmInfoManage.xaml |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/HMI.AlermInfoManage/AlermInfoManage.xaml b/HMI.AlermInfoManage/AlarmInfoManage.xaml
similarity index 84%
rename from HMI.AlermInfoManage/AlermInfoManage.xaml
rename to HMI.AlermInfoManage/AlarmInfoManage.xaml
index 7e66085..81ccab8 100644
--- a/HMI.AlermInfoManage/AlermInfoManage.xaml
+++ b/HMI.AlermInfoManage/AlarmInfoManage.xaml
@@ -1,10 +1,10 @@
-锘�<hb:PluginControl x:Class="HMI.AlermInfoManage.AlermInfoManage"
+锘�<hb:PluginControl x:Class="HMI.AlarmInfoManage.AlarmInfoManage"
              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:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
-             xmlns:local="clr-namespace:HMI.AlermInfoManage"
+             xmlns:local="clr-namespace:HMI.AlarmInfoManage"
              xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
              xmlns:pw="https://opensource.panuon.com/wpf"
              xmlns:pu="https://opensource.panuon.com/wpf-ui"
@@ -29,18 +29,24 @@
     <Border Style="{StaticResource CardBoarder}">
         <StackPanel>
             <DockPanel Margin="0,0,0,10">
-                <Button DockPanel.Dock="Right" pu:ButtonHelper.Icon="&#xe934;" Style="{StaticResource DangerButton}">鍒犻櫎</Button>
-                <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}" 
-pu:IconHelper.FontFamily="{StaticResource iconfont}"
-pu:ButtonHelper.Icon="&#xe631;" Margin="0,0,10,0" x:Name="refreshBtn" Click="Button_Click">鍒锋柊</Button>
-                <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}" 
-            pu:IconHelper.FontFamily="{StaticResource iconfont}"
-            pu:ButtonHelper.Icon="&#xe61a;" Margin="0,0,10,0" x:Name="addBtn" Click="Button_Click">鏂板</Button>
+                <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>
+                </StackPanel>
+                <!--<Button DockPanel.Dock="Right" pu:ButtonHelper.Icon="&#xe934;" 
+                        Style="{StaticResource DangerButton}">鍒犻櫎</Button>-->
+                
+                
+                
                 <TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}" 
                            VerticalAlignment="Center" HorizontalAlignment="Left" Text="鎶ヨ淇℃伅鍒楄〃"/>
             </DockPanel>
 
-            <DataGrid x:Name="table" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding DataSource}">
+            <DataGrid x:Name="table" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding Datasource}">
                 <DataGrid.Columns>
                     <DataGridTemplateColumn Header="" Width="Auto" CanUserResize="False">
                         <DataGridTemplateColumn.CellTemplate>

--
Gitblit v1.9.1