diff --git a/DM_Weight/ViewModels/MainWindowViewModel.cs b/DM_Weight/ViewModels/MainWindowViewModel.cs
index 7e5066c..59c71da 100644
--- a/DM_Weight/ViewModels/MainWindowViewModel.cs
+++ b/DM_Weight/ViewModels/MainWindowViewModel.cs
@@ -60,30 +60,31 @@ namespace DM_Weight.ViewModels
         //    this.eventAggregator.GetEvent<SnackbarEvent>().Subscribe(doMyPrismEvent2);
         //    _screenUtil = screenUtil;
         //}
-        //private FingerprintUtil _fingerprintUtil;
+        private FingerprintUtil _fingerprintUtil;
         IRegionManager _regionManager;
         IUnityContainer _container;
         //private CHKFunction _cHKFunction;
-        public MainWindowViewModel(IRegionManager regionManager, IUnityContainer container, IEventAggregator eventAggregator)
+        public MainWindowViewModel(IRegionManager regionManager, IUnityContainer container, IEventAggregator eventAggregator, FingerprintUtil fingerprintUtil, ScreenUtil screenUtil)
         {
             //_portUtil = portUtil;
             this.eventAggregator = eventAggregator;
             this.eventAggregator.GetEvent<SnackbarEvent>().Subscribe(doMyPrismEvent2);
-            //_fingerprintUtil = fingerprintUtil;
+            _screenUtil = screenUtil;
+            _fingerprintUtil = fingerprintUtil;
             _regionManager = regionManager;
             _container = container;
             //_cHKFunction = cHKFunction;
             System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
             {
-
-                //_container.RegisterType<object, LoginWindow>("LoginWindow");
-                //_regionManager.RegisterViewWithRegion("MainRegion", "LoginWindow");
                 if (App.DbConnectionFail)
                 {
                     _regionManager.RequestNavigate("MainRegion", "EmergencyWindow");
                 }
                 else
+                {
+                    _container.RegisterType<object, LoginWindow>("LoginWindow");
                     _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+                }
 
             }));
         }
diff --git a/DM_Weight/Views/EmergencyWindow.xaml b/DM_Weight/Views/EmergencyWindow.xaml
index 64e451f..6c4c23d 100644
--- a/DM_Weight/Views/EmergencyWindow.xaml
+++ b/DM_Weight/Views/EmergencyWindow.xaml
@@ -36,7 +36,7 @@
                     <RowDefinition Height="200" />
                     <RowDefinition />
                 </Grid.RowDefinitions>
-                <Grid Grid.Row="1" Height="470" Margin="0 50 0 0">
+                <Grid Grid.Row="1" Height="430" Margin="0 20 0 0">
                     <Grid.RowDefinitions>
                         <RowDefinition />
                         <RowDefinition />
@@ -69,9 +69,18 @@
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="16 0 0 0">
                     <Button  Margin="0 0 6 0" Content="返回登录" Command="{Binding ReturnLoginDelegate}" CommandParameter="0"
                     Visibility="{Binding DBConnectionStatus, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource MaterialDesignOutlinedLightButton}"/>
+                
+                    <Button
+                          Style="{StaticResource MaterialDesignRaisedLightButton}"
+                          Background="#7986cb"
+                          BorderBrush="#7986cb"
+                          materialDesign:ButtonAssist.CornerRadius="5" Cursor="Hand" IsCancel="true" 
+                          Command="{ Binding ExitCommand }" >       
+                        <TextBlock Foreground="{DynamicResource MaterialDesignPaper}" Text="退出" />
+                    </Button>
                 </StackPanel>
                 <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="1">
                     <GroupBox Width="800px"