From 04c8000b422a35dfe65813646563b5b75f03b738 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Fri, 13 Dec 2024 16:16:46 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=81=E6=97=A5=E5=BF=97=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.Model/domain/BaseCode.cs            |  9 +++++-
 .../Page/History/HistoryControl.xaml          |  6 ++--
 SlnMesnac.WPF/Page/IndexControl.xaml          | 12 ++++----
 .../Page/LogInfo/LogInfoControl.xaml          | 17 ++++++-----
 SlnMesnac.WPF/ViewModel/HistoryViewModel.cs   |  2 +-
 SlnMesnac.WPF/ViewModel/LogInfoViewModel.cs   | 30 +++++++++++++++++++
 6 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/SlnMesnac.Model/domain/BaseCode.cs b/SlnMesnac.Model/domain/BaseCode.cs
index aaf2c29..6a77de2 100644
--- a/SlnMesnac.Model/domain/BaseCode.cs
+++ b/SlnMesnac.Model/domain/BaseCode.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.Serialization;
+using MiniExcelLibs.Attributes;
 using SqlSugar;
 
 namespace SlnMesnac.Model.domain
@@ -48,22 +49,28 @@ namespace SlnMesnac.Model.domain
             this.CreateTime = DateTime.Now;
         }
 
+
+        [ExcelColumnName("标识"), ExcelColumnWidth(15)]
         [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
         public int Id { get; set; }
 
+        [ExcelColumnName("记录时间"), ExcelColumnWidth(15)]
         [SugarColumn(ColumnName = "createtime")]
         public DateTime CreateTime { get; set; }
 
+        [ExcelColumnName("日志类型"), ExcelColumnWidth(15)]
         [SugarColumn(ColumnName = "log_type")]
         public string LogType { get; set; }
 
+        [ExcelColumnName("日志级别"), ExcelColumnWidth(15)]
         [SugarColumn(ColumnName = "log_level")]
         public string LogLevel { get; set; }
 
+        [ExcelColumnName("日志内容"), ExcelColumnWidth(60)]
         [SugarColumn(ColumnName = "content")]
         public string Content { get; set; }
 
-
+        [ExcelColumnName("异常信息"), ExcelColumnWidth(50)]
         [SugarColumn(ColumnName = "err_msg")]
         public string ErrMsg { get; set; }
 
diff --git a/SlnMesnac.WPF/Page/History/HistoryControl.xaml b/SlnMesnac.WPF/Page/History/HistoryControl.xaml
index 543f928..0d542db 100644
--- a/SlnMesnac.WPF/Page/History/HistoryControl.xaml
+++ b/SlnMesnac.WPF/Page/History/HistoryControl.xaml
@@ -38,12 +38,12 @@
             <DataGrid Grid.Row="0" ItemsSource="{Binding ScanItems}" Background="Transparent" 
               FontSize="18" ColumnHeaderHeight="35" 
               RowHeight="40" AutoGenerateColumns="False" RowHeaderWidth="0" 
-              GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
-              ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
+              GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto" 
+              ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
               Foreground="#31446E" x:Name="dataGrid" Margin="0,10,0,0" >
                 <!--resourceStyle 399行修改选中字体颜色-->
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding CreateTime ,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="记录时间" Width="1.5*" IsReadOnly="True"/>
+                    <DataGridTextColumn Binding="{Binding CreateTime ,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="记录时间" Width="2*" IsReadOnly="True"/>
                     <DataGridTextColumn Binding="{Binding Rfid}" Header="RFID" Width="2*" IsReadOnly="True"/>
                     <DataGridTextColumn Binding="{Binding Code}" Header="ATR" Width="2*" IsReadOnly="True"/>
                     <DataGridTextColumn Binding="{Binding Ocr}" Header="OCR" Width="2*" IsReadOnly="True"/>
diff --git a/SlnMesnac.WPF/Page/IndexControl.xaml b/SlnMesnac.WPF/Page/IndexControl.xaml
index 8158a46..857b61a 100644
--- a/SlnMesnac.WPF/Page/IndexControl.xaml
+++ b/SlnMesnac.WPF/Page/IndexControl.xaml
@@ -46,9 +46,8 @@
                                             <RowDefinition Height="3*"/>
                                         </Grid.RowDefinitions>
                                         <TextBlock Grid.Row="0" Text="条码总数" FontSize="18" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
-                                        <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                            <TextBlock  Text="{Binding TagAmount}" FontSize="24" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                            <TextBlock Text="个" FontSize="24" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                        <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,20,0,0">
+                                            <TextBlock  Text="{Binding TagAmount}" FontSize="24" Foreground="Black" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                                         </StackPanel>
                                     </Grid>
                                 </Border>
@@ -63,7 +62,7 @@
                                             <RowDefinition Height="3*"/>
                                         </Grid.RowDefinitions>
                                         <TextBlock Grid.Row="0" Text="条码信息" FontSize="18" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
-                                        <TextBox Text="{Binding TagCode}" FontSize="24" Grid.Row="1" Width="200" Height="70" Margin="10" VerticalContentAlignment="Center" HorizontalAlignment="Center">
+                                        <!--<TextBox Text="{Binding TagCode}" FontSize="24" Foreground="Black" Grid.Row="1" Width="200" Height="70" Margin="10" VerticalContentAlignment="Top" HorizontalAlignment="Center" IsReadOnly="True">
                                             <TextBox.Template>
                                                 <ControlTemplate TargetType="TextBox">
                                                     <Border Background="White" BorderBrush="White" BorderThickness="1" CornerRadius="10">
@@ -71,7 +70,10 @@
                                                     </Border>
                                                 </ControlTemplate>
                                             </TextBox.Template>
-                                        </TextBox>
+                                        </TextBox>-->
+                                        <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,20,0,0">
+                                            <TextBlock  Text="{Binding TagCode}" FontSize="24" Foreground="Black" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                        </StackPanel>
                                     </Grid>
                                 </Border>
                                 
diff --git a/SlnMesnac.WPF/Page/LogInfo/LogInfoControl.xaml b/SlnMesnac.WPF/Page/LogInfo/LogInfoControl.xaml
index b903fae..4a8b58c 100644
--- a/SlnMesnac.WPF/Page/LogInfo/LogInfoControl.xaml
+++ b/SlnMesnac.WPF/Page/LogInfo/LogInfoControl.xaml
@@ -12,9 +12,10 @@
             <RowDefinition Height="14*"/>
         </Grid.RowDefinitions>
         <Border Grid.Row="0" BorderBrush="#EBF4FD" BorderThickness="2" CornerRadius="10" Background="#EBF4FD" Margin="10,10">
+            
             <StackPanel Grid.Column="0" VerticalAlignment="Center"  HorizontalAlignment="Left" Orientation="Horizontal">
 
-                <TextBlock Text="日志类型" FontSize="18" Foreground="#31446E" Margin="10,3"/>
+                <TextBlock Text="日志类型" FontSize="18" Foreground="#31446E" Margin="10,3,5,3"/>
                 <ComboBox SelectedItem="{Binding LogType}" FontSize="16" Grid.Row="1" Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5">
                     <ComboBoxItem>包裹数据</ComboBoxItem>
                     <ComboBoxItem>设备监控</ComboBoxItem>
@@ -22,7 +23,7 @@
                     <ComboBoxItem IsSelected="True">所有</ComboBoxItem>
                 </ComboBox>
 
-                <TextBlock Text="日志级别" FontSize="18" Foreground="#31446E" Margin="10,3"/>
+                <TextBlock Text="日志级别" FontSize="18" Foreground="#31446E" Margin="5,3"/>
                 <ComboBox SelectedItem="{Binding LogLevel}" FontSize="16" Grid.Row="1" Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5">
                     <ComboBoxItem>Info</ComboBoxItem>
                     <ComboBoxItem>Warn</ComboBoxItem>
@@ -30,7 +31,7 @@
                     <ComboBoxItem IsSelected="True">所有</ComboBoxItem>
                 </ComboBox>
 
-                <TextBlock Text="日志时间" FontSize="18" Foreground="#31446E" Margin="20,3,10,0"/>
+                <TextBlock Text="日志时间" FontSize="18" Foreground="#31446E" Margin="5,3,5,0"/>
                 <DatePicker x:Name="BeginTimeDatePicker" SelectedDate="{Binding BeginTime}"  FontSize="14" Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5" Margin="0,0,5,0"/>
                 <TextBlock Text="-" FontSize="18" Foreground="#31446E" Margin="10,3"/>
                 <DatePicker x:Name="EndTimeDatePicker" SelectedDate="{Binding EndTime}" FontSize="14"  Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5" Margin="0,0,5,0"/>
@@ -44,29 +45,29 @@
             <DataGrid Grid.Row="0" ItemsSource="{Binding ScanItems}" Background="Transparent" 
               FontSize="18" ColumnHeaderHeight="35" 
               RowHeight="150" AutoGenerateColumns="False" RowHeaderWidth="0" 
-              GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
-              ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
+              GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Visible" 
+              ScrollViewer.VerticalScrollBarVisibility="Visible" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
               Foreground="#31446E" x:Name="dataGrid" Margin="0,10,0,0" >
                 <!--resourceStyle 399行修改选中字体颜色-->
                 <DataGrid.Columns>
                     <DataGridTextColumn Binding="{Binding Id}" Header="序号" Width="1*" IsReadOnly="True"/>
                     <DataGridTextColumn Binding="{Binding LogType}" Header="日志类型" Width="1*" IsReadOnly="True"/>
                     <DataGridTextColumn Binding="{Binding LogLevel}" Header="日志级别" Width="1*" IsReadOnly="True"/>
-                    <DataGridTextColumn Binding="{Binding Content}" Header="日志内容" Width="3*" IsReadOnly="True">
+                    <DataGridTextColumn Binding="{Binding Content}" Header="日志内容" Width="4*" IsReadOnly="True">
                         <DataGridTextColumn.ElementStyle>
                             <Style TargetType="TextBlock">
                                 <Setter Property="TextWrapping" Value="Wrap"/>
                             </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding ErrMsg}" Header="异常日志" Width="3*" IsReadOnly="True">
+                    <DataGridTextColumn Binding="{Binding ErrMsg}" Header="异常日志" Width="4*" IsReadOnly="True">
                         <DataGridTextColumn.ElementStyle>
                             <Style TargetType="TextBlock">
                                 <Setter Property="TextWrapping" Value="Wrap"/>
                             </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding CreateTime ,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="记录时间" Width="1.5*" IsReadOnly="True"/>
+                    <DataGridTextColumn Binding="{Binding CreateTime ,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="记录时间" Width="2*" IsReadOnly="True"/>
                 </DataGrid.Columns>
             </DataGrid>
         </Border>
diff --git a/SlnMesnac.WPF/ViewModel/HistoryViewModel.cs b/SlnMesnac.WPF/ViewModel/HistoryViewModel.cs
index 51d0cd2..ae000a4 100644
--- a/SlnMesnac.WPF/ViewModel/HistoryViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/HistoryViewModel.cs
@@ -96,7 +96,7 @@ namespace SlnMesnac.WPF.ViewModel
                 SaveFileDialog saveFileDialog = new SaveFileDialog();
                 saveFileDialog.Filter = "Excel文件 (*.xlsx)|*.xlsx|所有文件 (*.*)|*.*";
                 saveFileDialog.Title = "保存文件";
-                saveFileDialog.FileName = $"扫描记录{DateTime.Now.Date:yyyy-MM-dd}.xlsx";
+                saveFileDialog.FileName = $"扫描记录{System.Guid.NewGuid().ToString()}.xlsx";
 
                 if (saveFileDialog.ShowDialog() == true)
                 {
diff --git a/SlnMesnac.WPF/ViewModel/LogInfoViewModel.cs b/SlnMesnac.WPF/ViewModel/LogInfoViewModel.cs
index 2295236..ce70efa 100644
--- a/SlnMesnac.WPF/ViewModel/LogInfoViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/LogInfoViewModel.cs
@@ -1,6 +1,8 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Win32;
+using MiniExcelLibs;
 using SlnMesnac.Business;
 using SlnMesnac.Model.domain;
 using System;
@@ -9,6 +11,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Controls;
 
 #region << 版 本 注 释 >>
@@ -90,5 +93,32 @@ namespace SlnMesnac.WPF.ViewModel
 
             ScanItems = new ObservableCollection<BaseLog>(info);
         }
+
+        [RelayCommand]
+        private void Export()
+        {
+            try
+            {
+                var info = _scanItems;
+
+                // 创建 SaveFileDialog 对象
+                SaveFileDialog saveFileDialog = new SaveFileDialog();
+                saveFileDialog.Filter = "Excel文件 (*.xlsx)|*.xlsx|所有文件 (*.*)|*.*";
+                saveFileDialog.Title = "保存文件";
+                saveFileDialog.FileName = $"日志信息{System.Guid.NewGuid().ToString()}.xlsx";
+
+                if (saveFileDialog.ShowDialog() == true)
+                {
+                    string filePath = saveFileDialog.FileName;
+                    MiniExcel.SaveAs(filePath, info);
+                    MessageBox.Show($"日志信息导出成功:{filePath}");
+
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"日志信息导出异常:{ex.Message}");
+            }
+        }
     }
 }