From fd3968642a77d9783f7e5f79e86b93ad0804102b Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Wed, 18 Sep 2024 13:45:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?change=20-=20=E6=B7=BB=E5=8A=A0=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.WPF/MainWindow.xaml                 | 169 ++---------------
 SlnMesnac.WPF/Page/IndexControl.xaml          | 178 ++++++++++++++++++
 SlnMesnac.WPF/Page/IndexControl.xaml.cs       |  31 +++
 SlnMesnac.WPF/SlnMesnac.WPF.csproj            |  11 +-
 SlnMesnac.WPF/Templates/image/left.png        | Bin 0 -> 12337 bytes
 SlnMesnac.WPF/Templates/image/right.png       | Bin 0 -> 11497 bytes
 SlnMesnac.WPF/ViewModel/IndexViewModel.cs     | 148 +++++++++++++++
 .../ViewModel/MainWindowViewModel.cs          |  10 +-
 SlnMesnac.WPF/appsettings.json                |   2 +-
 9 files changed, 389 insertions(+), 160 deletions(-)
 create mode 100644 SlnMesnac.WPF/Page/IndexControl.xaml
 create mode 100644 SlnMesnac.WPF/Page/IndexControl.xaml.cs
 create mode 100644 SlnMesnac.WPF/Templates/image/left.png
 create mode 100644 SlnMesnac.WPF/Templates/image/right.png
 create mode 100644 SlnMesnac.WPF/ViewModel/IndexViewModel.cs

diff --git a/SlnMesnac.WPF/MainWindow.xaml b/SlnMesnac.WPF/MainWindow.xaml
index 6c6a0a4..712222a 100644
--- a/SlnMesnac.WPF/MainWindow.xaml
+++ b/SlnMesnac.WPF/MainWindow.xaml
@@ -6,10 +6,10 @@
         xmlns:local="clr-namespace:SlnMesnac.WPF"
         mc:Ignorable="d"
         Title="MainWindow" Height="1080" Width="1920"
-        WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize" Topmost="False">
-    <Window.Background>
+        WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize" Topmost="False" Background="#E0E9F2">
+    <!--<Window.Background>
         <ImageBrush ImageSource="/Templates/image/background.jpg" />
-    </Window.Background>
+    </Window.Background>-->
 
     <Border Margin="5" Background="Transparent" CornerRadius="10">
         <Border.Effect>
@@ -18,143 +18,34 @@
 
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="0.6*"/>
                 <RowDefinition Height="7*"/>
-                <RowDefinition Height="0.7*"/>
+                <RowDefinition Height="0.5*"/>
             </Grid.RowDefinitions>
-            <Border Grid.Row="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="7*"/>
-                        <ColumnDefinition Width="2*"/>
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
-                        <TextBlock Text="生产控制系统" FontSize="50" Foreground="White" FontWeight="Bold"/>
-                    </StackPanel>
-
-                    <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                            </Grid.ColumnDefinitions>
-                            <TextBlock Grid.Column="0" Text="白班" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
-                            <TextBlock Grid.Column="1" Text="|" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
-                            <TextBlock Grid.Column="2" Text="SCADA" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,10,0"/>
-                        </Grid>
-                    </StackPanel>
-                </Grid>
+            <Border Grid.Row="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="#EBF4FD" Margin="10,0">
+                
+                <TextBlock Text="RFID+ATR+OCR 中间件监控系统" FontSize="35" Foreground="#31446E" FontWeight="Bold" Margin="20,0,0,0" VerticalAlignment="Center"/>
 
             </Border>
-            <Border Grid.Row="1" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,25,2,2">
+            <Border Grid.Row="1" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="0,10">
                 <ContentControl Content="{Binding UserContent}"/>
             </Border>
-            <Border Grid.Row="2" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="6,2,6,7">
-                <Border.Effect>
-                    <DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
-                </Border.Effect>
+            <Border Grid.Row="2" Background="Transparent" Margin="6,2,6,0">
+                
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="2*"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
                     <StackPanel Grid.Column="0" VerticalAlignment="Center"  HorizontalAlignment="Left" Orientation="Horizontal">
-                        <Button Content="首  页" x:Name="Index"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Index}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
+                        <Button Content="首  页" x:Name="Index"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Index}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#5095F3" BorderBrush="#5095F3" Margin="10,0,10,0"/>
                         <Button Content="键  盘"  Command="{Binding OpenSystemKeyboardCommand}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
                         <Button Content="最小化" x:Name="Minimized"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0"/>
                         <Button Content="退  出" x:Name="Exit"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#FF0033" BorderBrush="#FF0033" Margin="0,0,10,0"/>
                     </StackPanel>
 
                     <StackPanel Grid.Column="1" VerticalAlignment="Center"  HorizontalAlignment="Right" Orientation="Horizontal">
-
-                        <!--多行状态显示-->
-                        <!--<Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <StackPanel Grid.Row="0" Margin="0,0,0,0"  VerticalAlignment="Center">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <StackPanel Grid.Column="0">
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="*"/>
-                                            </Grid.ColumnDefinitions>
-                                            <StackPanel Grid.Column="1">
-                                                <TextBlock Text="连接状态" FontSize="15" Foreground="Black" Margin="2,0,10,0"/>
-                                            </StackPanel>
-                                            <StackPanel Grid.Column="0">
-                                                <Ellipse Width="20" Height="20">
-                                                    <Ellipse.Style>
-                                                        <Style TargetType="Ellipse">
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding PresentColor}" Value="0">
-                                                                    <Setter Property="Shape.Fill" Value="Orange"/>
-                                                                </DataTrigger>
-                                                                <DataTrigger Binding="{Binding PresentColor}" Value="1">
-                                                                    <Setter Property="Shape.Fill" Value="Green"/>
-                                                                </DataTrigger>
-                                                                <DataTrigger Binding="{Binding PresentColor}" Value="2">
-                                                                    <Setter Property="Shape.Fill" Value="Red"/>
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Ellipse.Style>
-                                                </Ellipse>
-                                            </StackPanel>
-                                        </Grid>
-                                    </StackPanel>
-                                </Grid>
-                            </StackPanel>
-
-                            <StackPanel Grid.Row="1" Margin="0,10,0,0" VerticalAlignment="Center">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <StackPanel Grid.Column="0">
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="*"/>
-                                            </Grid.ColumnDefinitions>
-                                            <StackPanel Grid.Column="1">
-                                                <TextBlock Text="连接状态" FontSize="15" Foreground="Black" Margin="2,0,10,0"/>
-                                            </StackPanel>
-                                            <StackPanel Grid.Column="0">
-                                                <Ellipse Width="20" Height="20">
-                                                    <Ellipse.Style>
-                                                        <Style TargetType="Ellipse">
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding PresentColor}" Value="0">
-                                                                    <Setter Property="Shape.Fill" Value="Orange"/>
-                                                                </DataTrigger>
-                                                                <DataTrigger Binding="{Binding PresentColor}" Value="1">
-                                                                    <Setter Property="Shape.Fill" Value="Green"/>
-                                                                </DataTrigger>
-                                                                <DataTrigger Binding="{Binding PresentColor}" Value="2">
-                                                                    <Setter Property="Shape.Fill" Value="Red"/>
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Ellipse.Style>
-                                                </Ellipse>
-                                            </StackPanel>
-                                        </Grid>
-                                    </StackPanel>
-                                </Grid>
-                            </StackPanel>
-                        </Grid>-->
-
-                        <!--单行状态显示-->
+                        
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*"/>
@@ -188,7 +79,7 @@
                                         </Ellipse>
                                     </StackPanel>
                                     <StackPanel Grid.Column="1"  VerticalAlignment="Center">
-                                        <TextBlock Text="箱壳扫码器" FontSize="15" Foreground="#FFFFFF" Margin="2,0,10,0"/>
+                                        <TextBlock Text="RFID状态" FontSize="15" Foreground="#31446E" Margin="2,0,10,0"/>
                                     </StackPanel>
                                 </Grid>
                             </StackPanel>
@@ -219,41 +110,11 @@
                                         </Ellipse>
                                     </StackPanel>
                                     <StackPanel Grid.Column="1"  VerticalAlignment="Center">
-                                        <TextBlock Text="内胆扫码器" FontSize="15" Foreground="#FFFFFF" Margin="2,0,10,0"/>
+                                        <TextBlock Text="相机状态" FontSize="15" Foreground="#31446E" Margin="2,0,10,0"/>
                                     </StackPanel>
                                 </Grid>
                             </StackPanel>
 
-                            <StackPanel Grid.Column="2">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <StackPanel Grid.Column="0">
-                                        <Ellipse Width="30" Height="30">
-                                            <Ellipse.Style>
-                                                <Style TargetType="Ellipse">
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding PlcStatus}" Value="0">
-                                                            <Setter Property="Shape.Fill" Value="Orange"/>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding PlcStatus}" Value="1">
-                                                            <Setter Property="Shape.Fill" Value="Green"/>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding PlcStatus}" Value="2">
-                                                            <Setter Property="Shape.Fill" Value="Red"/>
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </Ellipse.Style>
-                                        </Ellipse>
-                                    </StackPanel>
-                                    <StackPanel Grid.Column="1"  VerticalAlignment="Center">
-                                        <TextBlock Text="PLC状态" FontSize="15" Foreground="#FFFFFF" Margin="2,0,10,0"/>
-                                    </StackPanel>
-                                </Grid>
-                            </StackPanel>
                         </Grid>
 
                     </StackPanel>
diff --git a/SlnMesnac.WPF/Page/IndexControl.xaml b/SlnMesnac.WPF/Page/IndexControl.xaml
new file mode 100644
index 0000000..7cb85a0
--- /dev/null
+++ b/SlnMesnac.WPF/Page/IndexControl.xaml
@@ -0,0 +1,178 @@
+<UserControl x:Class="SlnMesnac.WPF.Page.IndexControl"
+             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:local="clr-namespace:SlnMesnac.WPF.Page"
+             xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent">
+    <UserControl.Resources>
+        <DataTemplate x:Key="LogMsgTemplate">
+            <TextBlock Text="{Binding}" FontSize="16" Foreground="#31446E" TextWrapping="Wrap" MaxWidth="400"/>
+        </DataTemplate>
+    </UserControl.Resources>
+    
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="3*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <Border Grid.Row="0">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="3*"/>
+                </Grid.ColumnDefinitions>
+                <Border Grid.Column="0">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="5*"/>
+                            <RowDefinition Height="6*"/>
+                        </Grid.RowDefinitions>
+                        <Border Grid.Row="0">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Border Grid.Column="0" CornerRadius="10"  Margin="3">
+                                    <Border.Background>
+                                        <ImageBrush ImageSource="/Templates/image/left.png"/>
+                                    </Border.Background>
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="2*"/>
+                                            <RowDefinition Height="3*"/>
+                                        </Grid.RowDefinitions>
+                                        <TextBlock Grid.Row="0" Text="条码信息" FontSize="24" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
+                                        <TextBox Grid.Row="1" Width="240" Height="70" Margin="10" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5">
+                                            <TextBox.Template>
+                                                <ControlTemplate TargetType="TextBox">
+                                                    <Border Background="White" BorderBrush="White" BorderThickness="1" CornerRadius="10">
+                                                        <ScrollViewer x:Name="PART_ContentHost" />
+                                                    </Border>
+                                                </ControlTemplate>
+                                            </TextBox.Template>
+                                        </TextBox>
+                                    </Grid>
+                                </Border>
+                                <Border Grid.Column="1" CornerRadius="10"  Margin="3">
+                                    <Border.Background>
+                                        <ImageBrush ImageSource="/Templates/image/right.png"/>
+                                    </Border.Background>
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="2*"/>
+                                            <RowDefinition Height="3*"/>
+                                        </Grid.RowDefinitions>
+                                        <TextBlock Grid.Row="0" Text="条码总数" FontSize="24" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
+                                        <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                                            <TextBlock Text="361" FontSize="24" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                            <TextBlock Text="个" FontSize="24" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                    </Grid>
+                                </Border>
+                            </Grid>
+                        </Border>
+
+                        <Border Grid.Row="1">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="2*"/>
+                                    <ColumnDefinition Width="3*"/>
+                                </Grid.ColumnDefinitions>
+                                <Border Grid.Column="0" CornerRadius="10" Background="#EBF4FD" Margin="10">
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="2*"/>
+                                            <RowDefinition Height="14*"/>
+                                        </Grid.RowDefinitions>
+                                        <TextBlock Grid.Row="0" Text="识别率" FontSize="18" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0"/>
+                                        <Border Grid.Row="1" BorderBrush="Red" BorderThickness="0" Margin="5,5">
+                                            <lvc:Gauge Margin="5" Uses360Mode="True" From="0" To="100" Value="{Binding PassRate}" Foreground="#0288d1"/>
+                                        </Border>
+                                    </Grid>
+                                </Border>
+                                <Border Grid.Column="1" CornerRadius="10" Background="#EBF4FD" Margin="10">
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="2*"/>
+                                            <RowDefinition Height="14*"/>
+                                        </Grid.RowDefinitions>
+                                        <TextBlock Grid.Row="0" Text="效率" FontSize="18" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0"/>
+                                        <Border Grid.Row="1" BorderBrush="Red" BorderThickness="0" Margin="10,5">
+                                            <lvc:CartesianChart Series="{Binding RecogEfficiency, UpdateSourceTrigger=PropertyChanged}">
+                                                <lvc:CartesianChart.AxisX>
+                                                    <lvc:Axis Labels="{Binding AxisX}" FontSize="15" Foreground="#0288d1" MinValue="0"/>
+                                                </lvc:CartesianChart.AxisX>
+                                                <lvc:CartesianChart.AxisY>
+                                                    <lvc:Axis FontSize="15" Foreground="#0288d1"/>
+                                                </lvc:CartesianChart.AxisY>
+                                                
+                                            </lvc:CartesianChart>
+                                        </Border>
+                                    </Grid>
+                                </Border>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </Border>
+
+                <Border Grid.Column="1" CornerRadius="10" Background="#EBF4FD" Margin="10">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="2*"/>
+                            <RowDefinition Height="22*"/>
+                        </Grid.RowDefinitions>
+                        <TextBlock Grid.Row="0" Text="全景图像" FontSize="18" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0"/>
+                        <Border Grid.Row="1" BorderBrush="Red" BorderThickness="0" Margin="5,10">
+                            <Image Grid.Row="1" Source="{Binding ImagePath}" />
+                        </Border>
+                    </Grid>
+                </Border>
+            </Grid>
+        </Border>
+
+        <Border Grid.Row="1">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="7*"/>
+                    <ColumnDefinition Width="3*"/>
+                </Grid.ColumnDefinitions>
+                <Border Grid.Column="0" CornerRadius="10" Background="#EBF4FD" Margin="10">
+                    <DataGrid Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}" Background="Transparent" 
+                      FontSize="15" ColumnHeaderHeight="35" 
+                      RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
+                      GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
+                      ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
+                      Foreground="#31446E" >
+                        <!--resourceStyle 399行修改选中字体颜色-->
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Binding="{Binding Id}" Header="序号" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding RfidCode}" Header="RFID" Width="2*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding AtrCode}" Header="ATR" Width="2*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding OcrCode}" Header="OCR" Width="2*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding FilePath}" Header="图像路径" Width="2*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding RecordTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="记录时间" Width="1.5*" IsReadOnly="True"/>
+                        </DataGrid.Columns>
+                    </DataGrid>
+                </Border>
+                <Border Grid.Column="1" CornerRadius="10" Background="#EBF4FD" Margin="10">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="2*"/>
+                            <RowDefinition Height="14*"/>
+                        </Grid.RowDefinitions>
+                        <TextBlock Grid.Row="0" Text="设备监控日志" FontSize="18" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0"/>
+                        <Border Grid.Row="1" BorderBrush="#E0E9F2" BorderThickness="0,2,0,0" Margin="5,5">
+                            <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                                <ItemsControl ItemsSource="{Binding LogMessages}" ItemTemplate="{StaticResource LogMsgTemplate}" />
+                            </ScrollViewer>
+                        </Border>
+                    </Grid>
+                </Border>
+            </Grid>
+        </Border>
+    </Grid>
+</UserControl>
diff --git a/SlnMesnac.WPF/Page/IndexControl.xaml.cs b/SlnMesnac.WPF/Page/IndexControl.xaml.cs
new file mode 100644
index 0000000..95f37cd
--- /dev/null
+++ b/SlnMesnac.WPF/Page/IndexControl.xaml.cs
@@ -0,0 +1,31 @@
+using SlnMesnac.WPF.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace SlnMesnac.WPF.Page
+{
+    /// <summary>
+    /// IndexControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class IndexControl : UserControl
+    {
+        public IndexControl()
+        {
+            InitializeComponent();
+
+            this.DataContext = new IndexViewModel();
+        }
+    }
+}
diff --git a/SlnMesnac.WPF/SlnMesnac.WPF.csproj b/SlnMesnac.WPF/SlnMesnac.WPF.csproj
index 4891000..7634670 100644
--- a/SlnMesnac.WPF/SlnMesnac.WPF.csproj
+++ b/SlnMesnac.WPF/SlnMesnac.WPF.csproj
@@ -10,6 +10,8 @@
   <ItemGroup>
     <None Remove="appsettings.json" />
     <None Remove="Templates\image\background.jpg" />
+    <None Remove="Templates\image\left.png" />
+    <None Remove="Templates\image\right.png" />
   </ItemGroup>
 
   <ItemGroup>
@@ -33,7 +35,10 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
     <PackageReference Include="Lierda.WPFHelper" Version="1.0.3" />
+    <PackageReference Include="LiveCharts" Version="0.9.7" />
+    <PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
     <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
     <PackageReference Include="NVelocity" Version="1.2.0" />
     <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
@@ -41,10 +46,8 @@
 
   <ItemGroup>
     <Resource Include="Templates\image\background.jpg" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Page\" />
+    <Resource Include="Templates\image\left.png" />
+    <Resource Include="Templates\image\right.png" />
   </ItemGroup>
 
 </Project>
diff --git a/SlnMesnac.WPF/Templates/image/left.png b/SlnMesnac.WPF/Templates/image/left.png
new file mode 100644
index 0000000000000000000000000000000000000000..43f77ef394f332bd9fd3c0929cd0171441e636aa
GIT binary patch
literal 12337
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

literal 0
HcmV?d00001

diff --git a/SlnMesnac.WPF/Templates/image/right.png b/SlnMesnac.WPF/Templates/image/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cc4f0c8a81da70871ab80dd186a3b2ec09edd72
GIT binary patch
literal 11497
zcmeHN^;^?lydNQw((y&QyQCT2EiE0=-61XA4H5&S1qMjNMt7Iw=#&_#q~M+RkGMbG
z=UF|Ub9Un0@rrw|p@@S?jtKw&aFmtgv;hDlbHwj$bTq_gnVC%%;tRuF$<PY`z#{zj
zMgrs&kO2T3`O0$Ay8Z=lkZ~fza=_N#BV9dnJ6pdF2vmtkUO8D=EAzjxRL&87XJJ|n
zmWqP+u~8;e>C7;6><^=|c)du8s4}0Sa^tFaJ;JeRgNc+w6;`a#&T{BBqj7kunT%Sb
z@j`IVv98H;lSlm=uj}{0)tW`$PU=qT3iDPU{)VmQp4S;KpZ$5Pxd_@~y_$SCW1&9S
z`IaU!RVUWW&ZcMgT2D@ul~Cp!EuJC&sC{0Bi+u|U;>ch>P(>HPTInYinK@`w>#mck
zkzk5UT}Xxt7*uy||1KvmW7wkm-nn&?%@~;q!8fSxe>4<J*;qbeNp~y!aMP{R8=2Y^
zO$p~x;oip(rPu71-}MPKBf=n*8QoAZD>KeaW+7@|-;&>*dh*O+Un8N7EYQCmJPB#*
zIXl371?7OJGMhYX%i^|eJ>L^*K6L-h#M>Q-!n;GU*9%dN#PfV4vj^8Zf{Rl2?pH~>
zum1dPzg}Y}1hCnyLV-L0sSoNTu0O<>O>S;7s2_fEqe`D<ko((}gvmMmY*9(V5Hb82
z|Mx2?XV18kkrPXK<8sTAQaY+kS!jv2%6-Tp!SnTqo=q;>#Og#H#04x+mU#(u1H*NP
zoJTSUy1D1BgYOH2SmXQ6|MnjhJ_nbj>j{(NK=663r*FM<ut~X1ZzccySSZ5&d>e{E
z2=yXx8jRm%v?eA|W>iie9)e(;Jif1C+f+|wiBcxpvk)HMvA@=s!F{=jDf;x7@$c`J
zuWE$zDyDd@O*7kw0fVnYc4hy{C|wZleUP4O-{(3IF4?rfua{;OU^bh%N!Ekf_V_r@
zn7L9uIDvNp%u08C;&xG=B6#^P<8c2B#=MBcM~NM+@}<=WUDNkm^0IcBW9>mR(P-^5
zM2BiJ^Hc@CjL4v)(>mg75aQP_buOufY~9h?6t<G+97b4!;Pzk-o&tbO(C%1D&@YF5
z#U3w?Po&6U{+C~4U|{`I^Qbr@Hxdk)X<?f|r%KBBK}faI<gEtEc?aLF_}EB&%diDe
z$)e-m)7R9W+LMrv$(<h#^@V}A2)?p|x2o;UJad}Hd$m@Vv*VUIK2}mj;#~&+jrE^u
zT}pHRFB_ENV_q+VhstaOjTTnM8yYjF3j7n7V(H;<o;G?nid=XhnZ*N>QW~xpa-!4q
zigPKkXetN@Cho{mN69p_)#3BL>vAoGxtm<S*&{<twz*h)cw>>BGb#(f(;mNLrm&#*
z6Y-IA&}&U&7%TA4V8{&=NB=Bx)j4-wy$km0&}-FVG!mqis-)d*iL-jedhpaB45!I%
zAw}s8_U5KtWF=77V$DrU42}yf*lnRdV;UvAP%fPeC<v+Aya0AJcdeMs2DPwL)6(vv
zPvkMj(}_P_Rj`p%3rad)f5@xb0mqRXig$Wjffk6j2t6ljy+llPRnR!<cTDxXeS90U
zOhdA~GJTQ*HdV^4D<ieN#PB?At4bGr=Dg&01=3e_7o;}QzJXp=<lc?bUDb*9`lo*l
z!Z6H`w`zF3pjIC4kn(Cgq0RBcG9$vNX4>Yv{R0HJJ2f=gX0My<fG(4rx{L?dRtj0>
zVnli0VO-<-mC7K*Z?&_syu>oft6}upqjT^Nyz~K4ka>cmKU`_qwGdF9;J2}7=+hxT
zv9vR>K)0#h+l)dhV0Gl@a<%sP+ZuS$x^7{kjR09Ivvuy)i0W}emo{$PZS#Zo8T0qd
zGhq?fMPY%VKE9FJ=Hm3-;ej7Kb~*FCiwrbhh4#x`B@#nwyN4HgY_pgXx4tl$;-z?8
z0*uq!NCGXR{fFSiXYIz8uR&wErEk6-2uKpe8K8fk2SP_y(^{P&rE=T1aHKN4rcbOm
zRjBBMQBDwgbbFH(*PWpHB&|%E>D-*KU6AwxLHa;rBVXIw2}<jx$_OCqu4#bb%)ogP
z5|EYe*mgo$${rv}+0@fQy*EwM?>jQ0Q6I&kWvF5WijS_Cm=ydTI-Zj%(7;^HYsD)7
zJ*+wNtv>hDX@_<DkfF@ZPH%SsiWh$jEvc$toZ%8;57VFhLjEO2Rf3vY=vQ*RtS<YI
z{%)l4^Ru34^O=T#aXa%4ZubfAr2I7=8O|`?{J7tMC-{r_w;|n8QBwux-gBD%9pPaO
z$zETvUg5kVsh=DJ+V4CMKQNV6-)wL>hE<g&R#zprPkuTT)WXit9qj+G#5S=Y()7b|
zvXOw?!5SDR;0llOhd&}I?BRi=`g2Ci&3xxo*2o?Rw9}!nB5ni)B{upX(vmYin;ao-
zQ%OMUniM-;DuI$!R4+N!0^s~CY8Fq4pN3}sPaVJ_q;Sjg5onu1hF&JLsz*nBwMo+l
z>O)!!?+rc*Ox3pXRBK}v!!V!~%;csOAu4BDSDrFm!at*1pBKD?Jgw2a?4S0M{&oJW
zQH<vlzN1vSfkqV|+$%<P={_SaG40}XPv!3A78%(33W&jAM6acT@o|krEbBXu3|c{8
znKA8mo_b|9y6u*HS#RX<1Y;L;)`cf<5r<@*-0GIVfvVCQpK0@kL^cuowl%u?#}a$v
zIOM_yx=Ye63MnZIGNiC*TpEmUw@~gutSyw153-mRPR4ZhSg4%gX6D<w$-P}-z2%fi
zASxR9PG_S<-lEqeN>K%4|9$&#BthET%Ya(9QCJMi7VcS$W`1RLRA{5FSew5ld7wH?
zG@{42on3MuU+qJo^WQOf_buJ!Z@1)y`yV*Tzxhvyq-YkF6;YDLc)(sOuP!?QP?BPC
zq#ca2U$3}|NZap#?#IAccv=4MC>b%Oy=}RfGWJP7nuKhD`J>l_QFGRjzN*{vzOTEv
zd6Q3675O<Yfh^`Sj>T&Gj%dB{Ose&3g~p6SUx_X&&GqnRy@)Zr2uKu5b!<5609DGJ
zC3xhJ*S(<AUO&`S``!#>m~rm|W%x^WuLku`AO2~d@S9+ZnhaNNjoQptlh5Px1OLTf
z8n`8GD<=iE!hZT8Cw_djI7=BM#OgAhgBPQ|ye^0z1*cMi26*vtn=n5vX4}ILntvDI
zHw9qDsTAD+V&(SSsfB^Fvus&D+gQy;03cF5qk9Nedyv^)cpxfQA&O{tv<iP2Nve!2
zhLnt~!}jAQnP=!{P+bZr1WPMjBD78Ffnc}6Ib@S<!k~}SlwD_BKYJrMibeYph*agE
zUPr%GD`Ppw)qG&1ICyAxllMc4z$tNWRpE78n3F-+kvP&Z%AHB7|CuQjm#c$!aFj;z
z&Y13DSlCi8$TBfPD-l$f0(K1)y)<|MQXIvYW(8|?M`l`svbStbxyCn0z)pE0*Jv9i
z(ezR()`vvBCf@9a)Q3P`agryWJMopRmYcGc_vvL?jqzdmrKskeh1+wALF-L>U$?Z{
z-4wqbpltryJkhSy`nAb3jL=<u*gyyP4O85vy{Of~yluuSk$1IEBf9(-7ao=PXK{gN
zuo;+_vJz_(!U;E*yq#U}=OZl9BhB7h9ct4a&8W#55ZH=>Ko=6frfE#y^tXMaz~<kC
za$cU`gnN8BjBdI;IPO<QK1(4mfd~Lf(2e0kS05>RZsb#LvQzdB-a(KMs+jdb_sRHI
zyULGKiK08b=8(DTy(==ZZZvSjs_1H;)wu{9n4@TBwi2=vn**=Iax!)K?*sexB0I+J
z`@J>J@V5~147}LiT0KrUgP1FC<%NZX2lWHrHI=RUWpRn^gpftsw-}YTYCaHns<09?
zJ^S<J(x4+ldD~wX#?BMNO~B8ujshk_ixRA-d`W`pCY9G>*Ixd6mn&0=;#2xvfeg7G
znkE=Js6`HE6Av{pLb1e_!xR=KD>)E=iE>0rA(n50l~+!d1z~tp)w~5yw(5fdEmy-V
z(ivh)(BZysWzf%X80IHg`H(OHd+$FIY1E+C9;MJw%#i4+t#DI|^cSp0i@WCx_S$1t
z$?XkOTDVu?Gm|T)kLw%nMxkXc=^#1ncL=%ldYZ=91u<n{7=cNknD5#=dXozN%WHqW
zZw#P}|8OL{Cmg*b3i*??M;7?Hslz`C(Enkt9@-W`9qfnYww`!3T-RT-Y_;AFD&y0a
zs^p{rg}0q4K3$%5TAp5|^+5_oe5E*0dC1wk0|~S^+<9h&Lp5kF1u_ZnHs=TqKCt>@
zxCe&DYSfGQQ8^#$tH09glY?rj=!@YszR_ds($HwD`^a;u#zcrti-+nEvMgs^4=<ch
zsB1>+SK50{LA~#Li@}sOT<UgrbtAbtwA@22%}9>BLA{+NL>F{Zj?N9G=)akNp!7@`
z{W3d7jgnjiUiO+;=f_h--jSov1?+tf(>@L>xUHCTYdz;5DhX3U!6Of5Wy>noW30zy
zOx`;?DPdC+!`p38i=QZTvO1BWMO7%p2hQXZx<NM30Ev4f&ORytEo?QqDBSM0q$Bf0
z9<s`e<3IO%lz%SjlicA7pGP+Fw<TYOZA{kF$fC%pKb0f}a{CKYI7Q;yvPPgPP6A0E
zxW;j@CKoAV@OcV<HVb~J)N0=_O)Dp?;Cu5ChZYDZ`H`hyDzK`YUc7Kz`{&7aUo}>C
zktsosr3plr);?l42y<*{Tr)R@0%*!2_1WH8;gzNBC&75nA+rPYZdjK~f#OhK&S8Dc
z?U^3RT?2{MB*{Mu_@5}l!G&^1Qaf&cTO@oRk0oA?auod!Q(pUTH^zXI2mM0ur0t7g
z1i}=osNFESm_L|t4s3(XWU@$FsLc$;&0mr**g%`D_MOQj-+pDtmD0<7!eZVYwZ6TT
z+Gi{Ap6Tf@C<+cS2v6gtWzLjGaYCa-jUJ%=Ofy>c(KA)*lWOS>OZXRdJAhI5puQ%}
zC1c1<5B2uy5!%YJvNwd_xlT$9?|ysF1$q%<OomN-8-scDXf>TLbVuAzcK@{v?H(ez
zJYrGBL+12nptAL<rl%c6vm%Mo4KkzHM$bdxgw6a(0=@7MKaz(~ui{3I<rS(~wP{BB
z=-YKH*(gM&!I6%toKAx+E2kC75`TDJZg)-rUy|Z}qFg!Z<hnvm48jocSt-3QonwLg
zS~Q}MFL5rO;<r4*6<7MN@`gvvl#bCIZu>dq*%{Ze%)?1@N333f44ViwjQSH#FZ0V3
z*P9sf&>OqX6|q_WpAy_InuU#_#dz}M#^T`{!LL|fAyfOqx~Qny_jeX%D2f-5Lw=L`
z&0dGkq29kNq8B}af}wY&NM^zG(Y)2uFUmLV1muM=wNe8d3>B={yrx`n3pcZlQ{xcl
zuWaRfmTNQlo;-oWB2Vj`k|@V9c}D>V+tgx$gs}0#KMWo9g<2WZ9HrH`JF>KM5#jz=
zN!N}r@#4C#uITZUs=>!!qR1PqQk9JE4^+6JzwGFN*S^%D4{3mZv?O!DR>Xt_Q^S|k
zEF$6*YWYQ7;+~~HktT*1$b52;2%un7qIEwuAy2#b6~41FU|({1#r))d+kxNx+cWYk
zSq2$TM%D>w2Bj?KA>eaUgl10CM;x5uWt@hpW<fXPAPCl!OGQIb(+p&+GT;7_DZ<Au
z?YB=XXKJsqh^5BMp{H#WN+8sb!1(l+wxmYIJjpTR;}B&Wb)e>3ZnHS|84aWS$DzMM
z!|cm+(7$tnFT<KXIsvNNZIVJ^c)j`t6*rt}ai!k#zu|Sg@Cg19$O17sFuYF~j-^3y
zY~Gbtyr4md9g#MEn2)E#Y`1JA#h#=A@Gp$~az3N9!sU~&$IrO{_fPd?QeW_d?`9Wv
z%(-rUI*hJjGX3sMmBgl95rp9orgu^7?C785Kfn`t@w7@EOeAmE62Tg!Vnr>gr2{EH
zFy=Jh{{5D>@acpsMmEaKU^lJpb!<I=+P^kw>v@ls3c5Vf^IZSb-oS{@EY%}Ms9I2l
zL*D1D{oAc8T?)N;IqPTZtGZ34Sx1atVmAXS2Ci}|=M}KGiMo%<7Lhh=%tW)e{6IG&
zyEA@obQ;im#d1&nxpvl;cSpk@$qu!b_3WC9r>s1tu%K|#J|rO-K{d*ps)}G@sca+k
z0X%6uYnV_<c&@)Om_&ha^7kVfc=n<K#Uk|7?$dped1sj77L^5$?){u1?Ecrq+1_1`
zaPO(mN8m#^7g`4Y-_AwQu@#RtnL58HXSkO!Rh^lp*Epx7y17XYsQ3VDJ<w8u+Wj=S
z|2A8S$Z1`KpVE)~lW&{QV4M`Q5<6d*Zm;j7G&&9Tg3mO(nYI$bgOXH%&5^vv;n;Gs
zZ)@Q>cVR<(#RWS|3)WrZqqPf@*K*J?^+Y&w?Q!}kLNsF_)8DtK(s{n<yav0B<zd|6
zrx1+pmoAK#-61@9wp2QR)ECwFZk{drIlLc6eTn~Kj<fZ;_37P%2Au_uzI_Yo`D&W~
zN1-lQq|nrY*_QgY@^*K^&2?9B@vM_73l6p-IjD6MZB`9MDIL8T<(1|qFBE4qu#X_j
z5W?7qOMVlA&?Y*An>_J_{HL!rC3-qj7Ih55<qWiyi9YnEZBPecivGLj^+OEsZ~QCr
zD}V#J6;HD$nRi}rdx+TZ>&=D!t%plNs`j6IE_aV)8bmLbs`P)ZM_RA;Q+zIQLqgup
z1iK{mYSOQH8NV}SDfbZmvT5JMj4$7mZ4L0h@%_w##0AP|pltQ4nma|mH~UnorgLCn
zknRAUdxILOmZE1=sT1!ok}o*tU^Hbho%Ekl(^k(I4Ee_3wF;}8R%YBPc6G<ydd=e#
z2LwoOF2m+dp-ys3{bJ8Qeux7&q&J}fJMxrkR+NpSGhoXq&5T&2s`<rFx(i*f{2A|o
z#<3uCohbny-NTkQmE48r@4<Gsm)(j+_kKNXDV3qEDVoof;;7-h9WQEZ%E;Kv<i^3d
z8bRmfEgeUdpEt$cqst~?iFwv#`4g~t8%yV%4Ar`Ru(ytIlFIW;MfO5*Jq#ppvIo1r
zn2@S4dZ8q>D(wjuCRn*B=i{;(uldH)#nat)OA47c27ngdMAr6p=48~=_SnDKmcO}4
z9{Jd81QwzFqIwDpSb0zj+;$1AYWlh0`T+N1oK-FzB{fSfuH;+a(7Dg3PfTMVp9vL;
zM8lKE<c1RLyd+RfyC@GT8%bN*zP%|AyH1rK8HiILaxz&dET?3$6#cS<IiET7Bi9Ru
z2>F<jV?HrHEc0epfUvrf^)<#!e%xa0a+ztO|5QwRTC-`i0fR$Rt;o!6<85Y|a=LX&
zjqfbNGS~Le1=K~19g_#FlnBgyVMm2TFOJGOC2edR_hx@_v&GB)b;$MC=CSz#D^V7Q
zcE0M?uZO2M^!|*N0B1dPPPUB`Z-m_Z*%dujH}9w-U`JTFt;<GF=?o{``ThBnF$S{R
zk{`1=Yc3klz8M*b_BV%UVFh*iF*ssASt3}ju+@L6gQw(Gs(kZpN8?OQR~@GVtz33L
z&yhg=*P&WtG(^IW$&qjO^=Ahk3^_GvKEI%jvSk(DEX{sOD&Nq+35Pq?K_I-4`*>WA
zBb5YTH)69H1By|H?D{?uq#oDWhja79@k=}y2d<o#tG?7rQt$mX#&{Eh3CbR{C`+x<
zogDBGb-UEp+<k;IAY$a=yww!ua94w}7RZ8kO97Q1MY-OaBfmAkuL2-ET+qw)443iA
zu@~rj;9w@S;T+Im1xYWn@3AQk!uXckm{!kzES&r`bKJAj_ss&-RZ-vdhpjmmY<}}x
z!(9hu?H7sW4S4O#vZ%>IZ?Ow6S6?hCa=WMa@I*bL*b?pw_;Y)Nd$r1q<8ftTl#)M4
z4kEeST^tl4{pLUQTBZ#}=__rNk|e6!T9%zQ<wl(pg`(H)tJHFvb@b)+%@Mf~<@8B`
zZz~2QzVK#KG3OA2R{sRF`*B1@*Jv3}XZh5@gI(!GR2KT94v4S>ge|!W$YPFOsx?&Y
z99Q$i)*x%Vuq8*)$|MC*y)RyqN;yK}cuiJu4yZ1o3$<wI3*k%GmH0Ip#;Ld?7-k(L
zva!wO4=FD*EL{;-CeJHsy#$}uUNJY?lqoUKA%*!?CNab%??aM)U7r-e<Dw^f^PiFI
z_8nXy`|-;Keg@D0)}+RUABm}XtnYqWkv_**3L6YKDLVL?RvXTcgylOmt5$}2&z_sQ
zW%1B|bV#Z#l!v@(ilPkG8AWA}EDZ76%;+j09>N4j(=@U&Wt3SIiGt=P?-oR@c|pWe
zXUxe+SuE>*-?K30%SfEB^1SS(6$||r;8W&??WdiLK^2XI&dbDZtFg;c59tspzlv&6
zW-)VtHmu1!X5h?3i3wpquFn}{Cr^ZO{6{mnLmSKmc;!mHkxZNx*FogQbol3Ea}J6p
zn4RyaBEml#=HdWLX)5CV+oUhm1`_;CCW676KO(J!F;gV}S6*ZT%Cguc`XPIvg<bW`
z2Yz!_Aw1cM5ScO4l!wv}f~?~nmJ)#BJ&&bfObWPBla01+&WYLe;nZ<H1IEkTNU*nY
zMXS@T&9t0oQQgCTUj6(IuLA*G!AKoe#J7Hv+LX6AD{4jqL4-?pW?~>^?N3ci3C(e`
zd+WYON>MSK6D9Gl#ab*36u;c)=w4Y=lAMjlLxIo-NqxcJh}*vl7Y}Hqd{`6Fp>OYu
z|9Qi+D}Z0esTs(yNg|`)!ehGhBfIl=PhD)7q2b!|9oqdtil6&mUr`Ijve9asLro%p
z*Eh+oUo#2s7ld>!slY>?Ggew50Y*Kr3nVMi<p@A=md0ClB82fwH8!#>Vt+S~56Wgq
zFBemCn0aH@MxO68bwT6SQ-NQ~LE%ns_ogj)`NcKGK3~!`kS<#<k7M2EOq#OohONGN
zvT%Bq*v)KN-;7+wDd~xe@qVPIIpVF5RnQXz-z<c4cuI^s@S{bUx?XrRDh+Uw&e|Z`
zmgvp&sjE-q@1XNj+yBy*@GIl2!a-n%wLVp^Zp$wrQlGkU!FJdD)aeSbu5$UzMt49`
z0i*rJzn!Ofe@T5yqgLJiV=+h6`~*FcH&_n?%t*xZeh$|<p*m!nW-qy8-6V+CkIOl<
z+N($A7-VNNXH4XXn{+Z<El{7(CJXrb$zs1DcD+!B1`LeU7~Ed2<-1U*0gfF|Ica{P
zqq{M!LyJYkH72$34K+}5%Tn5dIys4*Sdi{z_SQ+Zm2ohTz+vv`6%<tMKcauxUd)8_
zAS%HdOvG(3%XP^OUPHIUT5}gH^=#$NYvI?73^CB3D=(!g=?qT;1!_#WW$?%M#@DtD
zlU)muoD<MKdNI!3rOP!h;r89{H$~^@J(Qem#5>mqB<EcQ+mt*4b)+;lo##8!kp^aq
z_tOdF++BRV3`lfy3LL1-7t#X}L|R5E>~_)W6DyNr-qW0iH-jFia`ZT~;c%~GXrHIi
zaf6>&baXT|>dNMIu}5?14Ctby3aP(<-OseCR&4e#MEDS+=O;=Xb|$xoSElk?j+!Zf
z&@kIpUWjO4b4lJoDT_?yLioSPl|QWGnnmbSBRzLp;5cVWW2s=E=?#+Q%-?*W{vu{N
zdN|0-<<DpeAVnNug|IGxxDnyQi|n#zn@eQpTZ0M9Tp#av`p;>Lfk?*~{@Mdr{E@S>
zj(KZiFValb#3&JBm~6VSAGe=V(3@dY={$X>ZpldCxf4|XBeBj|;WeOTPI||;S9foy
z<&RctPkkqHx6;yX8<kHtfKPn?gn=ca%``LHU3K|v<S?aU(a~o2%v<z}8WZBR%DFjJ
zfCKl1yhnG1RT~=}WGi;?@#d`g8fLS~vWrpkxa;0a<Lz)iySsJTl1dWGE2UEn(<5r<
zyqi#ozC|aD?m(Zn%dYa5$h~(0pIgI(Ks2Vz<Q{bHPp|12zRJ{}?$rO43rm2})^)eX
z2*=Zur@%p6o4*SsL@9Z5*o8*)eo#SKR0L8IJUb_}$y@C=&~n)P8WGNE%yMycW*u6u
zEa?p~1xWR5&7fJI85dAfQI%|64BSA~N-FkTv>>&s2Dz#(^n}Jx*W@Opd->lDO!L^t
zN&2dmfg>Ygn+~oXMD*yQ2;!}^;Bg0u4c>LvH}n+I=u?$E^X`AxVV3l#3jJLv4!qaL
z^;qe9F?&5QfNm^C@C@e?HFZ0W7=n(Jgbzdi_-*nYft_&e^L*fA-e<p3#QV|=mo*qU
zBmPOTo>TY@-A6x2#UrB5U_ImJ=Jt^<S4t&r&OUO^9u+KrD13bCGGoG;xk+Wf5Cv(F
zeDBc8hdG`eGTyAE!^bg=p|@e?W`hO{CEkW^o#IJt(4hfYT$jBg9>PuQ#t1XbN#%)C
zWYW)ooQsQT_%aAMN(}BYZzC_WHw`3L@iV>owD}|bwi6L1?eV?uj@)l>+=s-<A7cU*
z90+W(8xfUuJG<9fMAA-4&(F^t<MA};v#xDT2U*&RC4xe`?}*6*wDKu;IMekvJLTVj
z59G5C2fo5UMde`o9(j><Xd?vbGv(A;cC&w6=d}E54c}$6Q_na72@&YD80vTG>+iOH
znEJ%@n<i4Ka$$__Xw3REgECL9n)}f-s8(k>mQDQ?YVMzSt_gMPV>2VzE>gVwsS2dF
z?8Y%WVTrTa&Fpq(TZ7Y~$Gk0lFa(#WzeV*vUhZ_7-{951-U%zaf$`w^%*1u%t%RB!
zDJoLu2A8j|FW*k00zIJDf@gGa-nDJ+*t^l!mhky-@y(Ixd_J@#Kf1y0wHIS+Ri^7|
z2;2w$+?m8^Q!PDSp>bV@W^zTMe%x_FOn_(t$gkV`f{3Cx+n_ESuvSiYz)xQYo=ox9
zg&kkq9$Cg1stRl3$VXJ^uq*#W*R}+W$_$+94iuMG`?JoE#s0k$$z>bAV$!_Llyk&~
zN`na}<TDP4<lE(Oa1+orC-tJAEG?&9=31AO)wR0!)wC79`0NKKplzM08sD|}B-6XC
z(x4yaN$v_O)GrTM^Y!@y7099iVH%YY5fLcfq98R6?eTIOL#CM1H_1qf`SR-|<`ADw
zdsDBFGgeBts7aG^mgqXv*U}HsN}|f445&vzTnUG$oG89w2;vN?4&Aqf1i*x3Ud^)@
zIwgU@;0}%UD}QXTK=i<lw?%Ejz`#Jqwb1s@^}YnUDI1s0g!B0wl|U`_76_QH+{V?h
zPd#Pj!NMXt#*7rfi#%5PO(01*)wr|Yf31mdM=Y^r2W=9-?CI~uy!~c=4wuqR7)-Wi
zF)yJCZoC3%<7cb(AB7D1u~WoX%yY2evKu>CQgPS#yT87wo-}I3Ml4DEfsygMvjtd<
zyzH#eCYjOgt*hf8g&RVSPST&ALwuQIcHF<<G*ePh*)CY;xrzwooah7FKfgOBdm5mv
z=W4UxXgqKa&?C2D2cCSsX0*%p@$9tmYW5xbBKEXey;5#}`d;t?)D}wL0f)oS{3rLN
zjVcAkm`0o#4xe7q&~Od>1Li!m4A(>t-1U|=BK`jfb=D~1a!GSI<yBq2S(Of|PZ|Fi
zF4?;~8OX*oxqLrQq&B7&ktIL5jZ7;$XJS?O5Xd%w(Z%M}Jz>!J2k^TF&OZk%BN)b6
zR^7<)c5!Jns_ne>?Dt01*1i*5TJjxn<&tQPq+q%Lc%dRolshYR8L*Qbda$uO0yknO
z0C#PvBf5@_VLqM9BnN&uU}O1S!BfoUSWyXVXI5B%rH-PLHa1gAZKh29@`UHu;if~y
zpQ)~x{0*RXdFCW1WfQDH2m>Jn>g`FSJ_;FnOCBlZZ>pW!CVPwjqj@Kp|2y$L+(9UU
zW_0aa%m8heH(+-1%(ld-2`YA(oioq#g@4E+f%IQ;0OEVtXsqpgVPb@GSegG?!7f})
zfs43r6o4N(mQNAJ#I-G7oxts|{W6$3Ffed+o#cE&=IoFl5GL;>N)hwFq%6-=7q3m<
z;)H|_u%%skj9LFzXFuiDtJY|H$P4*_{iP@UOVNt>Xqof)7Qot5a9=>ReUaH`=`uUK
zEt$EDNsx9^^j7Q61KijJyy{#;Q-I1JxZM63QkcG_De9_wmbOn=c`ja;yOA>_L&SyZ
zrfECX+Q7OhZ$k%@#gE_8msse{Xyq(@q|HwHH|jYp#Z+3^Db!eV`$E<S7m*M|!pJVC
z(is2FVeB^NRWs_p8Yq-j-50x(tVSviwYlry$l5+kHvj>|Q}l+^5llg|q3czbYtOH9
ztU`g5^o2}Qp*CG`edoFr`Mxz$^2g1z)^qcpzcp<6_LaqPeXv`o<)xw(9=}`$IIBQ^
z8ZM}@Qam~I$k+vYb_;JSD9P)?jf@Xk)G0NyTnvVOtRcTU?%W8;$E%O4#;Nm%&o`=T
z9r*Q)A`(iXXG_im|MAIXcWsq^lWI9%U!3|bsCa`uV~??%+2CpX()8cX`Xbc-ZS}ng
zsLLPWq;Kv_=5>R}@3u_zR8Qu-{~-#mAi1UzG9CDrqvF+a&xq2))Nv~G#FHC22<smj
zxgQLYf+k|ySpEji3kOiYjx3NF|C6?y%PhgVpOwr>a8dnmT=GMDQ(|f_W7eb*U7<Vj
zhg@!zXO?ZW`t(eL#;K>7ysQ?^h3E>3Z@?ncxx_|zYY8TCTSY(??yOIU5TdoDb214-
z9t!=Ef5uePIi;84gn&bQ<+{pqSxrfhJC$h7@$pc7Wgyb(Q(}owL{`^G-I&-MpCK@v
z<v>LZef(|CGH@q5eKljNR%MZV6OrJg`z+x7TUSFid2zVgq)v5k;v{XVH*dAlc)+Q1
zNl;5gUv~~b(c^y_cFkB8rmooIb2h-W$M=KNx=GzH87;ze;56P(%SL8X;ySxV+sHQ$
zA^NL4`6TX}w<m+d_0Q0J$I&OADo>Mu&vlRO<1dpE8wWRqUMaj6e)<RNI^B^R+wGz=
zf~JcNY)s&73A<KvgX%sFbB>a#eoM;gkoO#qVc(DsR7Wu^bxO=zjQXdK*Jf5>-ucY>
zmWJ{JjhHbDn21q=WcEjaC*+eFYxkRan>Hua<s?Cz{Azo5YVK-x;VFbuFOU+{f;qYQ
z;U^sK2*7y0Mf+5-Z7%RN=nGOJ%!T%6AJM+a$B~ZBYL0xs2E_s!!Q_*aA;TJ57C{YF
z!bC}UYbOHg@oluCWZvcp_Df<yP%{%OI9gh@*jDYI^ZZ6X>&Rp26XH4rbb^dlIx4n`
zYpuVoOE#)Y*aD&FzNGT2%-?w{&YlomHN&)O*6>bP#3_M?){R`Dzd;r#Flge$I_2iN
zN29t-5g~$X@9oaNyZ%=%V|Ihe6YA{Kj0J(2W*P~r@A|Owu2@TtqOE2!EXP^bDC`7G
z94=liX_+>tHT!CGoQDhK^Bu8VpnP|>Gh6hM|A#wJpUizf$VMkPVoUw8P?)3z69!w0
z^oM_3larTSebdp|`non`9U%k6!f&pY#OIQe*bzGK%DP&i&7NS!4w=cwO#X0$f(X>g
z81j=p331+*=tfZP=;OO>dNK!mE>?f9%VqGdXoEKT_F3{g_^_OODQ&EJR~#qZ6ctg~
zOAhZWG553XiOXGB=N}Ly;8-|oIIe49`fzm5YA!Pk2%si+Eo`fM28?WRnFvj2v-wbn
z{fjG-1G}R{NAn}vrd_z-0*xyf12QtjlhuPhAedPz1v-w|E1)lN4KEl*Z)MB>l!CYb
zySCrUa>E$LqUMBeP2<?!%8ypW4olnoWi%S`G^g9HpSTgToV44*4B)Pi{C3!;CKcj=
zK*Klmd)MsQjX#_JDks{6u5hkgk0ts1*9chNH_CBek$;oC$kBF4zH@x8{BVlMysS|Q
z(2%&(e>&vN{%Mv$ST@?cNhI$4g|^8@>n6kjoxjkfxs*tko;j5TEEQE3;x!VSsyQ~r
z>05e2c@UJ8J}J~oETBT*LS&Rs5cBco0f<c^`2mP6X>kyz`2WZM=QJUEI62Ny-SmpY
zlgZZE*Tq5bDKb?7Va{mFkW3!<rlinm^DU?A<<sh0yWa=}%OQY~IrvtarHZ2&7weym
zPK6??{*I#4?z>u_Ob8WJrl5Z~6nEgPZCTp7v^SSQXN_V;&D1s@`dmdC#x?$6%g*5O
z$1r8UGZIf5Q?p{TxlnXh&q4xj!JQf$eEN1KQ~}dNkMACFgeWB>C0et;(^y;g*c3S$
zq+_U1mWoBdudHRW+(^rNP2)n;XN1%|paVEH>97YvuTLhns6TqFeRc1hYHfb(KYH1|
z%T$rrxXuklAW?xv-I3a3mED&elJ{-^qGVgb!v<Kw4hIh@U+BTa%(JNO^@SKB2Le#g
zMk27bct7t6-jBJ3{2O|=U-=d=(v(2A)lqLO<ThCJ_smWLUp}K}`T9~DMtWHe5LZJN
zaY9GB*Di)*H3OkUh_Sy9Ga-k|t{YJN(%!F%t^Yu=lj744=OJVN5Q@($dzwJ_!;4}R
z-UXoy5J0msn9mTIN~loQ(p}N=;z%$u6Y`H3hvQE5YCNg}9OU*B3?>ZbPe(u`to?*e
zdt(F_j66!0fM2=deQ&gJFTDiW3W{!gO%To%&r?YI-_)qxSIOhc9Pb${p1!-Al_D5w
z7Y^-5<+wk8!KN|qwv{&Sop?jXErY<^LbCeV(Dv=HlHW6!H+>!rI8*4m9sci`K<3;w
zJFX?uKYZxA#b7ewbHa7s?I~h|HA7#$qPxd=wO+o5&bOZQmNMuauy4Da^Ap)w7bQ5P
k^6i=L5E5a_Ir1EO0hkg3eMGTEV3z^P@)~k=G8Uiz2hcr3ApigX

literal 0
HcmV?d00001

diff --git a/SlnMesnac.WPF/ViewModel/IndexViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexViewModel.cs
new file mode 100644
index 0000000..92413a7
--- /dev/null
+++ b/SlnMesnac.WPF/ViewModel/IndexViewModel.cs
@@ -0,0 +1,148 @@
+
+using CommunityToolkit.Mvvm.ComponentModel;
+using LiveCharts;
+using LiveCharts.Wpf;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Documents;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：T14-GEN3-7895
+* 命名空间：SlnMesnac.WPF.ViewModel
+* 唯一标识：9e7a55b1-ef98-4957-9a44-16dd251c4b5c
+*
+* 创建者：WenJY
+* 电子邮箱：
+* 创建时间：2024-09-18 10:46:52
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.WPF.ViewModel
+{
+    public class IndexViewModel : ObservableObject
+    {
+
+        public IndexViewModel()
+        {
+            PassRate = 30;
+
+            // 初始化数据
+            RecogEfficiency = new SeriesCollection
+            {
+                new LineSeries
+                {
+                    Title = "Achievement",
+                    Values = new ChartValues<double> { 3, 5, 7, 2 } // 示例数据
+                }
+            };
+
+            AxisX = new ObservableCollection<string> { "8", "12", "16", "20" };
+
+            ImagePath = "E:\\2024年项目\\RFID行李跟踪\\程序设计\\SlnMesnac.RfidIdentification\\SlnMesnac.WPF\\bin\\Debug\\net6.0-windows\\picture\\3898291920.jpg";
+
+            RefreshLogMessage($"1#站台任务下发站台任务下发站台任务下发站台任务下发站台任务下发站台任务下发");
+        }
+
+        /// <summary>
+        /// 合格率
+        /// </summary>
+        public int _passRate;
+        public int PassRate
+        {
+            get => _passRate;
+            set => SetProperty(ref _passRate, value);
+        }
+
+        /// <summary>
+        /// 效率数值
+        /// </summary>
+        private SeriesCollection _recogEfficiency;
+        public SeriesCollection RecogEfficiency
+        {
+            get => _recogEfficiency;
+            set => SetProperty(ref _recogEfficiency, value);
+        }
+
+        /// <summary>
+        /// 效率曲线X坐标
+        /// </summary>
+        private ObservableCollection<string> _axisX;
+        public ObservableCollection<string> AxisX
+        {
+            get => _axisX;
+            set => SetProperty(ref _axisX, value);
+        }
+
+        /// <summary>
+        /// 图像路径
+        /// </summary>
+        private string _imagePath;
+        public string ImagePath
+        {
+            get => _imagePath;
+            set => SetProperty(ref _imagePath, value);
+        }
+
+        /// <summary>
+        /// 日志信息
+        /// </summary>
+        private ObservableCollection<string> _logMessages = new ObservableCollection<string>();
+
+        public ObservableCollection<string> LogMessages
+        {
+            get => _logMessages;
+            set => SetProperty(ref _logMessages, value);
+        }
+
+        private ObservableCollection<string> listItems = new ObservableCollection<string>();
+        /// <summary>
+        /// 系统运行日志输出
+        /// </summary>
+        /// <param name="message"></param>
+        private async void RefreshLogMessage(string message)
+        {
+            await Task.Run(() =>
+            {
+                try
+                {
+                    string formattedMessage = $"{DateTime.Now.ToString("HH:mm:ss.ss")} ==> {message}";
+
+                    lock (listItems)
+                    {
+                        listItems.Add(formattedMessage);
+
+                        while (listItems.Count > 120)
+                        {
+                            listItems.RemoveAt(0);
+                        }
+
+                        var orderedList = listItems.OrderByDescending(x => x).ToList();  // 排序后转为 List
+                        App.Current.Dispatcher.Invoke(() =>
+                        {
+                            LogMessages = new ObservableCollection<string>(orderedList);  // 更新 UI
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    //_logger.LogError($"日志数据绑定异常:{ex.Message}");
+                }
+            });
+        }
+    }
+}
diff --git a/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs b/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
index 566e0fd..84f3401 100644
--- a/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
@@ -2,6 +2,7 @@
 using GalaSoft.MvvmLight.Command;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using SlnMesnac.WPF.Page;
 using System;
 using System.Windows;
 
@@ -11,6 +12,8 @@ namespace SlnMesnac.WPF.ViewModel
     {
         private readonly ILogger<MainWindowViewModel> _logger;
 
+        private IndexControl indexControl = new IndexControl();
+
         #region 参数定义
         /// <summary>
         /// PLC设备状态
@@ -137,7 +140,12 @@ namespace SlnMesnac.WPF.ViewModel
             try
             {
                 string info = obj as string;
-                //UserContent = inStoreInfoControl;
+                switch (info)
+                {
+                    case "Index":
+                        UserContent = indexControl; break;
+                    default: break;
+                }
             }
             catch (Exception ex)
             {
diff --git a/SlnMesnac.WPF/appsettings.json b/SlnMesnac.WPF/appsettings.json
index 9346894..93c9b42 100644
--- a/SlnMesnac.WPF/appsettings.json
+++ b/SlnMesnac.WPF/appsettings.json
@@ -8,7 +8,7 @@
   },
   "AllowedHosts": "*",
   "AppConfig": {
-    "logPath": "E:\\桌面\\SlnMesnac\\SlnMesnac.WPF\\bin\\Debug\\net6.0-windows",
+    "logPath": "F:\\桌面\\RFID+ATR识别项目\\日志信息",
     "SqlConfig": [
       {
         "configId": "mes",

From 1131d1e6a1d8843fa4f5f9f1089b2c98d3cccd6e Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Wed, 18 Sep 2024 17:42:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?change=20-=20=E7=95=8C=E9=9D=A2=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8E=86=E5=8F=B2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.WPF/MainWindow.xaml                 |  3 ++
 .../Page/History/HistoryControl.xaml          | 36 ++++++++++++++++
 .../Page/History/HistoryControl.xaml.cs       | 28 ++++++++++++
 SlnMesnac.WPF/Page/IndexControl.xaml          | 21 +++++----
 SlnMesnac.WPF/Page/IndexControl.xaml.cs       |  3 +-
 SlnMesnac.WPF/ViewModel/IndexViewModel.cs     | 43 +++++++++++++++++++
 .../ViewModel/MainWindowViewModel.cs          |  7 +++
 7 files changed, 129 insertions(+), 12 deletions(-)
 create mode 100644 SlnMesnac.WPF/Page/History/HistoryControl.xaml
 create mode 100644 SlnMesnac.WPF/Page/History/HistoryControl.xaml.cs

diff --git a/SlnMesnac.WPF/MainWindow.xaml b/SlnMesnac.WPF/MainWindow.xaml
index 712222a..c173496 100644
--- a/SlnMesnac.WPF/MainWindow.xaml
+++ b/SlnMesnac.WPF/MainWindow.xaml
@@ -39,6 +39,9 @@
                     </Grid.ColumnDefinitions>
                     <StackPanel Grid.Column="0" VerticalAlignment="Center"  HorizontalAlignment="Left" Orientation="Horizontal">
                         <Button Content="首  页" x:Name="Index"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Index}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#5095F3" BorderBrush="#5095F3" Margin="10,0,10,0"/>
+                        <Button Content="数据记录" x:Name="History"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=History}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
+                        <Button Content="日志信息" x:Name="Log" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Log}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
+                        <Button Content="系统版本" x:Name="Version"  Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=Version}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
                         <Button Content="键  盘"  Command="{Binding OpenSystemKeyboardCommand}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
                         <Button Content="最小化" x:Name="Minimized"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0"/>
                         <Button Content="退  出" x:Name="Exit"  Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#FF0033" BorderBrush="#FF0033" Margin="0,0,10,0"/>
diff --git a/SlnMesnac.WPF/Page/History/HistoryControl.xaml b/SlnMesnac.WPF/Page/History/HistoryControl.xaml
new file mode 100644
index 0000000..7c8f692
--- /dev/null
+++ b/SlnMesnac.WPF/Page/History/HistoryControl.xaml
@@ -0,0 +1,36 @@
+<UserControl x:Class="SlnMesnac.WPF.Page.History.HistoryControl"
+             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:local="clr-namespace:SlnMesnac.WPF.Page.History"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="14*"/>
+        </Grid.RowDefinitions>
+        <Border Grid.Row="0" BorderBrush="#EBF4FD" BorderThickness="2" CornerRadius="10" Background="#EBF4FD" Margin="10,10">
+            
+        </Border>
+
+        <Border Grid.Row="1" BorderBrush="#EBF4FD" BorderThickness="2" CornerRadius="10" Background="#EBF4FD" Margin="10,10">
+            <DataGrid Grid.Row="0" ItemsSource="{Binding ScanItems}" Background="Transparent" 
+              FontSize="16" ColumnHeaderHeight="35" 
+              RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
+              GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
+              ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
+              Foreground="#31446E" x:Name="dataGrid" >
+                <!--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 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"/>
+                    <DataGridTextColumn Binding="{Binding url}" Header="图像路径" Width="2*" IsReadOnly="True"/>
+                </DataGrid.Columns>
+            </DataGrid>
+        </Border>
+    </Grid>
+</UserControl>
diff --git a/SlnMesnac.WPF/Page/History/HistoryControl.xaml.cs b/SlnMesnac.WPF/Page/History/HistoryControl.xaml.cs
new file mode 100644
index 0000000..1f55155
--- /dev/null
+++ b/SlnMesnac.WPF/Page/History/HistoryControl.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace SlnMesnac.WPF.Page.History
+{
+    /// <summary>
+    /// HistoryControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class HistoryControl : UserControl
+    {
+        public HistoryControl()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/SlnMesnac.WPF/Page/IndexControl.xaml b/SlnMesnac.WPF/Page/IndexControl.xaml
index 7cb85a0..03f9968 100644
--- a/SlnMesnac.WPF/Page/IndexControl.xaml
+++ b/SlnMesnac.WPF/Page/IndexControl.xaml
@@ -46,7 +46,7 @@
                                             <RowDefinition Height="3*"/>
                                         </Grid.RowDefinitions>
                                         <TextBlock Grid.Row="0" Text="条码信息" FontSize="24" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
-                                        <TextBox Grid.Row="1" Width="240" Height="70" Margin="10" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5">
+                                        <TextBox Text="{Binding TagCode}" FontSize="24" Grid.Row="1" Width="240" Height="70" Margin="10" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5">
                                             <TextBox.Template>
                                                 <ControlTemplate TargetType="TextBox">
                                                     <Border Background="White" BorderBrush="White" BorderThickness="1" CornerRadius="10">
@@ -68,7 +68,7 @@
                                         </Grid.RowDefinitions>
                                         <TextBlock Grid.Row="0" Text="条码总数" FontSize="24" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="30,0,0,0"/>
                                         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                            <TextBlock Text="361" FontSize="24" Foreground="#31446E" VerticalAlignment="Center" HorizontalAlignment="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>
@@ -141,20 +141,19 @@
                     <ColumnDefinition Width="3*"/>
                 </Grid.ColumnDefinitions>
                 <Border Grid.Column="0" CornerRadius="10" Background="#EBF4FD" Margin="10">
-                    <DataGrid Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}" Background="Transparent" 
-                      FontSize="15" ColumnHeaderHeight="35" 
+                    <DataGrid Grid.Row="0" ItemsSource="{Binding ScanItems}" Background="Transparent" 
+                       FontSize="16" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
-                      Foreground="#31446E" >
+                      Foreground="#31446E" x:Name="dataGrid" >
                         <!--resourceStyle 399行修改选中字体颜色-->
                         <DataGrid.Columns>
-                            <DataGridTextColumn Binding="{Binding Id}" Header="序号" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding RfidCode}" Header="RFID" Width="2*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding AtrCode}" Header="ATR" Width="2*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding OcrCode}" Header="OCR" Width="2*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding FilePath}" Header="图像路径" Width="2*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding RecordTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="记录时间" Width="1.5*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding CreateTime ,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="记录时间" Width="1.5*" 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"/>
+                            <DataGridTextColumn Binding="{Binding url}" Header="图像路径" Width="2*" IsReadOnly="True"/>
                         </DataGrid.Columns>
                     </DataGrid>
                 </Border>
diff --git a/SlnMesnac.WPF/Page/IndexControl.xaml.cs b/SlnMesnac.WPF/Page/IndexControl.xaml.cs
index 95f37cd..e1045c9 100644
--- a/SlnMesnac.WPF/Page/IndexControl.xaml.cs
+++ b/SlnMesnac.WPF/Page/IndexControl.xaml.cs
@@ -1,4 +1,5 @@
-using SlnMesnac.WPF.ViewModel;
+using SlnMesnac.Model.domain;
+using SlnMesnac.WPF.ViewModel;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/SlnMesnac.WPF/ViewModel/IndexViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexViewModel.cs
index 92413a7..330ef07 100644
--- a/SlnMesnac.WPF/ViewModel/IndexViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/IndexViewModel.cs
@@ -2,6 +2,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using LiveCharts;
 using LiveCharts.Wpf;
+using SlnMesnac.Model.domain;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -56,6 +57,36 @@ namespace SlnMesnac.WPF.ViewModel
             ImagePath = "E:\\2024年项目\\RFID行李跟踪\\程序设计\\SlnMesnac.RfidIdentification\\SlnMesnac.WPF\\bin\\Debug\\net6.0-windows\\picture\\3898291920.jpg";
 
             RefreshLogMessage($"1#站台任务下发站台任务下发站台任务下发站台任务下发站台任务下发站台任务下发");
+
+            ScanItems = new ObservableCollection<ScanLogModel>()
+            {
+                new ScanLogModel {CreateTime = DateTime.Now,DataType=1,Rfid="20240918",Code="20240918",Ocr="20240918"},
+                new ScanLogModel {CreateTime = DateTime.Now,DataType=1,Rfid="20240918",Code="20240918",Ocr="20240918"},
+                new ScanLogModel {CreateTime = DateTime.Now,DataType=1,Rfid="20240918",Code="20240918",Ocr="20240918"},
+            };
+
+            TagCode = "20240918";
+            TagAmount = 362;
+        }
+
+        /// <summary>
+        /// 条码信息
+        /// </summary>
+        public string _tagCode;
+        public string TagCode
+        {
+            get => _tagCode;
+            set => SetProperty(ref _tagCode, value);
+        }
+
+        /// <summary>
+        /// 条码总数
+        /// </summary>
+        public int _tagAmount;
+        public int TagAmount
+        {
+            get => _tagAmount;
+            set => SetProperty(ref _tagAmount, value);
         }
 
         /// <summary>
@@ -109,6 +140,18 @@ namespace SlnMesnac.WPF.ViewModel
             set => SetProperty(ref _logMessages, value);
         }
 
+        /// <summary>
+        /// 扫描记录
+        /// </summary>
+        private ObservableCollection<ScanLogModel> _scanItems = new ObservableCollection<ScanLogModel>();
+        public ObservableCollection<ScanLogModel> ScanItems
+        {
+            get => _scanItems;
+            set => SetProperty(ref _scanItems, value);
+        }
+
+
+
         private ObservableCollection<string> listItems = new ObservableCollection<string>();
         /// <summary>
         /// 系统运行日志输出
diff --git a/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs b/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
index 1e5d543..3535a43 100644
--- a/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
@@ -3,6 +3,7 @@ using GalaSoft.MvvmLight.Command;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SlnMesnac.WPF.Page;
+using SlnMesnac.WPF.Page.History;
 using System;
 using System.Windows;
 
@@ -13,6 +14,7 @@ namespace SlnMesnac.WPF.ViewModel
         private readonly ILogger<MainWindowViewModel> _logger;
 
         private IndexControl indexControl = new IndexControl();
+        private HistoryControl historyControl = new HistoryControl();
 
         #region 参数定义
         /// <summary>
@@ -85,6 +87,8 @@ namespace SlnMesnac.WPF.ViewModel
             ControlOnClickCommand = new RelayCommand<object>(obj => ControlOnClick(obj));
             FormControlCommand = new RelayCommand<object>(x => FormControl(x));
 
+            UserContent = indexControl;
+
         }
 
         /// <summary>
@@ -146,6 +150,9 @@ namespace SlnMesnac.WPF.ViewModel
                 {
                     case "Index":
                         UserContent = indexControl; break;
+                    case "History":
+                        UserContent = historyControl; break;
+                    //historyControl
                     default: break;
                 }
             }

From 0b82efcda3a9fd28798dddd28252b44d1913f4af Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Thu, 19 Sep 2024 10:27:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?change=20-=20=E7=9B=91=E6=8E=A7=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=89=AB=E6=8F=8F=E6=95=B0=E6=8D=AE=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.Business/SlnMesnac.Business.csproj  |  4 +
 SlnMesnac.Business/TagScanBusiness.cs         | 75 +++++++++++++++++++
 SlnMesnac.TouchSocket/ApiServer.cs            | 11 +--
 .../Page/History/HistoryControl.xaml          | 25 ++++++-
 SlnMesnac.WPF/Page/IndexControl.xaml          |  4 +-
 SlnMesnac.WPF/ViewModel/IndexViewModel.cs     | 44 ++++++++---
 6 files changed, 142 insertions(+), 21 deletions(-)
 create mode 100644 SlnMesnac.Business/TagScanBusiness.cs

diff --git a/SlnMesnac.Business/SlnMesnac.Business.csproj b/SlnMesnac.Business/SlnMesnac.Business.csproj
index 8ef8970..7786b98 100644
--- a/SlnMesnac.Business/SlnMesnac.Business.csproj
+++ b/SlnMesnac.Business/SlnMesnac.Business.csproj
@@ -5,4 +5,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\SlnMesnac.TouchSocket\SlnMesnac.TouchSocket.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/SlnMesnac.Business/TagScanBusiness.cs b/SlnMesnac.Business/TagScanBusiness.cs
new file mode 100644
index 0000000..28b7ad9
--- /dev/null
+++ b/SlnMesnac.Business/TagScanBusiness.cs
@@ -0,0 +1,75 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.TouchSocket;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：T14-GEN3-7895
+* 命名空间：SlnMesnac.Business
+* 唯一标识：1a936e54-f672-4d86-b9bd-2747b75d4732
+*
+* 创建者：WenJY
+* 电子邮箱：
+* 创建时间：2024-09-19 9:49:11
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Business
+{
+    public class TagScanBusiness
+    {
+        private ApiServer apiServer;
+
+        public delegate void RefreshTagScanInfo(ScanLogModel scanLogModel);
+        public event RefreshTagScanInfo? RefreshTagScanInfoEvent;
+
+        public delegate void RefreshDeviceAlarmMessage(string message);
+        public event RefreshDeviceAlarmMessage? RefreshDeviceAlarmMessageEvent;
+
+
+        public TagScanBusiness(ApiServer apiServer)
+        {
+            this.apiServer = apiServer;
+
+            this.RefreshScanInfo();
+        }
+
+        private void RefreshScanInfo()
+        {
+            //扫描记录刷新
+            apiServer.ScanLogSocketAction += scan =>
+            {
+                RefreshTagScanInfoEvent?.Invoke(scan);
+            };
+
+            //告警状态刷新
+            apiServer.ScanStatusSocketAction += info =>
+            {
+                if (info != null && info.is_alarm == 1)
+                {
+                    if (info.status_txt != null)
+                    {
+                        foreach (var item in info.status_txt)
+                        {
+                            RefreshDeviceAlarmMessageEvent?.Invoke(item);
+                        }
+                    }
+                }
+            };
+        }
+
+
+    }
+}
diff --git a/SlnMesnac.TouchSocket/ApiServer.cs b/SlnMesnac.TouchSocket/ApiServer.cs
index 6d0ab5b..dea7aaa 100644
--- a/SlnMesnac.TouchSocket/ApiServer.cs
+++ b/SlnMesnac.TouchSocket/ApiServer.cs
@@ -17,7 +17,7 @@ namespace SlnMesnac.TouchSocket
 
         private readonly IBaseCodeService _baseCodeService;
         
-        public Action<ScanLogSocket>? ScanLogSocketAction;
+        public Action<ScanLogModel>? ScanLogSocketAction;   //Update By WenJY 2024-09-19将返回值改为ScanLogModel
         public Action<ScanStatusSocket>? ScanStatusSocketAction;
 
 
@@ -71,8 +71,7 @@ namespace SlnMesnac.TouchSocket
         [WebApi(HttpMethodType.POST)]
         public Back ScanBack(ScanLogSocket scanStatus)
         {
-            ScanLogSocketAction?.Invoke(scanStatus);
-            _scanService.Insert(new ScanLogModel()
+            var scan = new ScanLogModel()
             {
                 CreateTime = scanStatus.CreateTime,
                 DataType = scanStatus.data_type,
@@ -80,8 +79,10 @@ namespace SlnMesnac.TouchSocket
                 Rfid = scanStatus.rfid,
                 Ocr = scanStatus.ocr,
                 Url = scanStatus.url
-                            
-            });
+
+            };
+            ScanLogSocketAction?.Invoke(scan);  //Update By WenJY 2024-09-19将返回值改为ScanLogModel
+            _scanService.Insert(scan);
             return new Back();
         }
     }
diff --git a/SlnMesnac.WPF/Page/History/HistoryControl.xaml b/SlnMesnac.WPF/Page/History/HistoryControl.xaml
index 7c8f692..947c4f8 100644
--- a/SlnMesnac.WPF/Page/History/HistoryControl.xaml
+++ b/SlnMesnac.WPF/Page/History/HistoryControl.xaml
@@ -12,16 +12,35 @@
             <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="RFID" FontSize="18" Foreground="#31446E" Margin="10,3"/>
+                <TextBox Text="{Binding TagCode}" FontSize="24" Grid.Row="1" Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5">
+                    <TextBox.Template>
+                        <ControlTemplate TargetType="TextBox">
+                            <Border Background="White" BorderBrush="White" BorderThickness="1" CornerRadius="5">
+                                <ScrollViewer x:Name="PART_ContentHost" />
+                            </Border>
+                        </ControlTemplate>
+                    </TextBox.Template>
+                </TextBox>
+                
+                <TextBlock Text="扫描时间" FontSize="18" Foreground="#31446E" Margin="20,3,10,0"/>
+                <DatePicker x:Name="BeginTimeDatePicker" Width="120" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                <TextBlock Text="-" FontSize="18" Foreground="#31446E" Margin="10,3"/>
+                <DatePicker x:Name="EndTimeDatePicker" Width="120" VerticalAlignment="Center" Margin="0,0,5,0"/>
+
+                <Button Content="查    询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#5095F3" BorderBrush="#5095F3" Margin="10,0,10,0"/>
+                <Button Content="导    出" Command="{Binding ExportCommand}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
+            </StackPanel>
         </Border>
 
         <Border Grid.Row="1" BorderBrush="#EBF4FD" BorderThickness="2" CornerRadius="10" Background="#EBF4FD" Margin="10,10">
             <DataGrid Grid.Row="0" ItemsSource="{Binding ScanItems}" Background="Transparent" 
-              FontSize="16" ColumnHeaderHeight="35" 
+              FontSize="18" ColumnHeaderHeight="35" 
               RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
               GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
               ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
-              Foreground="#31446E" x:Name="dataGrid" >
+              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"/>
diff --git a/SlnMesnac.WPF/Page/IndexControl.xaml b/SlnMesnac.WPF/Page/IndexControl.xaml
index 03f9968..0242341 100644
--- a/SlnMesnac.WPF/Page/IndexControl.xaml
+++ b/SlnMesnac.WPF/Page/IndexControl.xaml
@@ -146,14 +146,14 @@
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
-                      Foreground="#31446E" x:Name="dataGrid" >
+                      Foreground="#31446E" x:Name="dataGrid" Margin="10,0,10,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 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"/>
-                            <DataGridTextColumn Binding="{Binding url}" Header="图像路径" Width="2*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding Url}" Header="图像路径" Width="2*" IsReadOnly="True"/>
                         </DataGrid.Columns>
                     </DataGrid>
                 </Border>
diff --git a/SlnMesnac.WPF/ViewModel/IndexViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexViewModel.cs
index 330ef07..a7a02ce 100644
--- a/SlnMesnac.WPF/ViewModel/IndexViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/IndexViewModel.cs
@@ -2,10 +2,13 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using LiveCharts;
 using LiveCharts.Wpf;
+using Microsoft.Extensions.DependencyInjection;
+using SlnMesnac.Business;
 using SlnMesnac.Model.domain;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -37,8 +40,16 @@ namespace SlnMesnac.WPF.ViewModel
 {
     public class IndexViewModel : ObservableObject
     {
-
+        private TagScanBusiness tagScanBusiness;
         public IndexViewModel()
+        {
+            tagScanBusiness = App.ServiceProvider.GetService<TagScanBusiness>();
+            this.Init();
+            this.RefreshScanInfo();
+        }
+
+
+        private void Init()
         {
             PassRate = 30;
 
@@ -54,19 +65,11 @@ namespace SlnMesnac.WPF.ViewModel
 
             AxisX = new ObservableCollection<string> { "8", "12", "16", "20" };
 
-            ImagePath = "E:\\2024年项目\\RFID行李跟踪\\程序设计\\SlnMesnac.RfidIdentification\\SlnMesnac.WPF\\bin\\Debug\\net6.0-windows\\picture\\3898291920.jpg";
+            
 
             RefreshLogMessage($"1#站台任务下发站台任务下发站台任务下发站台任务下发站台任务下发站台任务下发");
 
-            ScanItems = new ObservableCollection<ScanLogModel>()
-            {
-                new ScanLogModel {CreateTime = DateTime.Now,DataType=1,Rfid="20240918",Code="20240918",Ocr="20240918"},
-                new ScanLogModel {CreateTime = DateTime.Now,DataType=1,Rfid="20240918",Code="20240918",Ocr="20240918"},
-                new ScanLogModel {CreateTime = DateTime.Now,DataType=1,Rfid="20240918",Code="20240918",Ocr="20240918"},
-            };
-
-            TagCode = "20240918";
-            TagAmount = 362;
+            ScanItems = new ObservableCollection<ScanLogModel>();
         }
 
         /// <summary>
@@ -150,6 +153,25 @@ namespace SlnMesnac.WPF.ViewModel
             set => SetProperty(ref _scanItems, value);
         }
 
+        private void RefreshScanInfo()
+        {
+            tagScanBusiness.RefreshTagScanInfoEvent += info =>
+            {
+                
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    TagCode = info.Rfid;
+                    ImagePath = info.Url;
+
+                    string fileName = Path.GetFileName(info.Url);
+                    info.Url = fileName;
+                    ScanItems.Add(info);
+
+                    TagAmount++;
+                });
+            };
+        }
+
 
 
         private ObservableCollection<string> listItems = new ObservableCollection<string>();