From e346203c96f07142a92130247dfc1a0b2894a209 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 4 Mar 2025 13:13:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=A5=E8=AF=8A=E7=B4=A7=E6=80=A5=E5=BC=80?=
 =?UTF-8?q?=E9=94=81=E6=B7=BB=E5=8A=A0=E9=80=80=E5=87=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/ViewModels/EmergencyWindowViewModel.cs |  8 ++++++++
 DM_Weight/ViewModels/MainWindowViewModel.cs      |  4 +++-
 DM_Weight/Views/EmergencyWindow.xaml             | 13 +++++++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/DM_Weight/ViewModels/EmergencyWindowViewModel.cs b/DM_Weight/ViewModels/EmergencyWindowViewModel.cs
index 12bee58..3aac44c 100644
--- a/DM_Weight/ViewModels/EmergencyWindowViewModel.cs
+++ b/DM_Weight/ViewModels/EmergencyWindowViewModel.cs
@@ -10,6 +10,7 @@ using Prism.Regions;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -59,6 +60,13 @@ namespace DM_Weight.ViewModels
                 _regionManager.RequestNavigate("MainRegion", "LoginWindow");
             });
         }
+        private DelegateCommand? _exitCommand;
+        public DelegateCommand ExitCommand => _exitCommand ??= new DelegateCommand(Exit);
+        void Exit()
+        {
+            Process.GetCurrentProcess().Kill();
+            Environment.Exit(0);
+        }
         //间隔1分钟查询数据库连接状态
         private void CheckDBConnect()
         {
diff --git a/DM_Weight/ViewModels/MainWindowViewModel.cs b/DM_Weight/ViewModels/MainWindowViewModel.cs
index ff8a8d7..59c71da 100644
--- a/DM_Weight/ViewModels/MainWindowViewModel.cs
+++ b/DM_Weight/ViewModels/MainWindowViewModel.cs
@@ -81,8 +81,10 @@ namespace DM_Weight.ViewModels
                     _regionManager.RequestNavigate("MainRegion", "EmergencyWindow");
                 }
                 else
+                {
                     _container.RegisterType<object, LoginWindow>("LoginWindow");
-                _regionManager.RequestNavigate("MainRegion", "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"