diff --git a/SlnMesnac.WPF/Page/WindowPage/MachineStopHistoryWindow.xaml b/SlnMesnac.WPF/Page/WindowPage/MachineStopHistoryWindow.xaml
index e233c8e..a772787 100644
--- a/SlnMesnac.WPF/Page/WindowPage/MachineStopHistoryWindow.xaml
+++ b/SlnMesnac.WPF/Page/WindowPage/MachineStopHistoryWindow.xaml
@@ -1,40 +1,47 @@
-<Window x:Class="SlnMesnac.WPF.Page.WindowPage.MachineStopHistoryWindow"
+<Window
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SlnMesnac.WPF.Page.WindowPage"
+        xmlns:dxwui="http://schemas.devexpress.com/winfx/2008/xaml/windowsui" x:Class="SlnMesnac.WPF.Page.WindowPage.MachineStopHistoryWindow"
         mc:Ignorable="d"
-        Title="MachineStopHistoryWindow"  Height="500" Width="1000" Background="#1254AB"  StateChanged="Window_StateChanged">
+        Title="MachineStopHistoryWindow"  d:DesignHeight="1080" d:DesignWidth="1920" Height="500" Width="1000"  Background="#1254AB"  StateChanged="Window_StateChanged">
     <Window.Resources>
+
+        
+        
         <!-- 定义样式 -->
-        <Style x:Key="CustomDatePicker" TargetType="DatePicker">
+        <Style x:Key="CustomDatePicker" TargetType="{x:Type DatePicker}">
 
             <!-- 设置背景颜色 -->
-            <Setter Property="Background" Value="LightBlue"></Setter>
+            <Setter Property="Background" Value="LightBlue"/>
             <!-- 设置边框颜色 -->
-            <Setter Property="BorderBrush" Value="DarkBlue"></Setter>
+            <Setter Property="BorderBrush" Value="DarkBlue"/>
             <!-- 设置字体样式 -->
-            <Setter Property="FontSize" Value="20"></Setter>
+            <Setter Property="FontSize" Value="20"/>
             <!-- 设置前景色（文本颜色） -->
-            <Setter Property="Foreground" Value="Black"></Setter>
+            <Setter Property="Foreground" Value="Black"/>
 
 
         </Style>
 
 
         <!-- 定义日历的样式 -->
-        <Style x:Key="CustomCalendarStyle" TargetType="Calendar">
+        <Style x:Key="CustomCalendarStyle" TargetType="{x:Type Calendar}">
             <!-- 设置背景颜色 -->
-            <Setter Property="Background" Value="White"></Setter>
+            <Setter Property="Background" Value="White"/>
             <!-- 设置边框颜色 -->
-            <Setter Property="BorderBrush" Value="Blue"></Setter>
+            <Setter Property="BorderBrush" Value="Blue"/>
 
-            <Setter Property="Width" Value="350"></Setter>
-            <Setter Property="Height" Value="250"></Setter>
+            <Setter Property="Width" Value="350"/>
+            <Setter Property="Height" Value="250"/>
             <!-- 设置字体样式 -->
-            <Setter Property="FontSize" Value="16"></Setter>
+            <Setter Property="FontSize" Value="16"/>
         </Style>
+        
+        
+        
 
     </Window.Resources>
     <Grid Margin="5,5" >
@@ -54,7 +61,7 @@
           Foreground="White" >
                     <DataGrid.Resources>
                         <!-- 定制 ScrollBar 样式 -->
-                        <Style TargetType="ScrollBar">
+                        <Style TargetType="{x:Type ScrollBar}">
                             <Setter Property="Background" Value="Transparent"/>
 
                         </Style>
@@ -65,12 +72,16 @@
                         <DataGridTextColumn Binding="{Binding id}" Header="序号" Width="*" IsReadOnly="True"/>
                         <DataGridTextColumn Binding="{Binding deviceName}" Header="设备名" Width="2*" IsReadOnly="True"/>
                         <DataGridTextColumn Binding="{Binding shutReason}" Header="停机类型" Width="4*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding shutBeginTime ,StringFormat=\{0:MM月dd日 HH:mm:ss\}}" Header="停机开始时间" Width="4*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding shutEndTime ,StringFormat=\{0:MM月dd日 HH:mm:ss\}}" Header="停机结束时间" Width="4*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding totalTime ,StringFormat=\{0:MM月dd日 HH:mm:ss\}}" Header="停机总时长(min)" Width="2*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding shutBeginTime, StringFormat=\{0:MM月dd日 HH:mm:ss\}}" Header="停机开始时间" Width="4*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding shutEndTime, StringFormat=\{0:MM月dd日 HH:mm:ss\}}" Header="停机结束时间" Width="4*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding totalTime, StringFormat=\{0:MM月dd日 HH:mm:ss\}}" Header="停机总时长(min)" Width="2*" IsReadOnly="True"/>
                     </DataGrid.Columns>
                 </DataGrid>
             </Border>
         </Grid>
+        <Grid Grid.Row="1">
+            
+          
+        </Grid>
     </Grid>
 </Window>
diff --git a/SlnMesnac.WPF/Properties/Licenses.licx b/SlnMesnac.WPF/Properties/Licenses.licx
new file mode 100644
index 0000000..c89f351
--- /dev/null
+++ b/SlnMesnac.WPF/Properties/Licenses.licx
@@ -0,0 +1 @@
+DevExpress.Xpf.WindowsUI.PageView, DevExpress.Xpf.Controls.v23.2, Version=23.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/SlnMesnac.WPF/SlnMesnac.WPF.csproj b/SlnMesnac.WPF/SlnMesnac.WPF.csproj
index 9cd4fa5..a0ec3d7 100644
--- a/SlnMesnac.WPF/SlnMesnac.WPF.csproj
+++ b/SlnMesnac.WPF/SlnMesnac.WPF.csproj
@@ -36,6 +36,7 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="devexpress.wpf.controls" Version="23.2.5" />
     <PackageReference Include="Lierda.WPFHelper" Version="1.0.3" />
     <PackageReference Include="LiveCharts" Version="0.9.7" />
     <PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />