From 785e17e24ac69b3d7997a9483c361e69399c45d2 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Sat, 11 May 2024 10:47:52 +0800
Subject: [PATCH] =?UTF-8?q?change-=E9=92=A3=E9=87=91=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/LoginPageViewModel.cs                  |  4 ++--
 .../ViewModels/MainWindowViewModel.cs                 |  4 ++--
 Aucma.Core.SheetMetal/Views/IndexPageView.xaml        |  6 +++---
 Aucma.Core.SheetMetal/Views/LoginPageView.xaml.cs     | 11 +++++++++++
 Aucma.Core.SheetMetal/Views/MainWindow.xaml           |  2 +-
 Aucma.Core.SheetMetal/Views/MainWindow.xaml.cs        |  5 +++++
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Aucma.Core.SheetMetal/ViewModels/LoginPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/LoginPageViewModel.cs
index 758b691..5e9f2a3 100644
--- a/Aucma.Core.SheetMetal/ViewModels/LoginPageViewModel.cs
+++ b/Aucma.Core.SheetMetal/ViewModels/LoginPageViewModel.cs
@@ -69,10 +69,10 @@ namespace Aucma.Core.SheetMetal.ViewModels
                    
                     if (window == null) return;
                     window.Hide();
-                    MainWindow indexPage = new MainWindow();
+                    MainWindow indexPage = MainWindow.Instance;
                     indexPage.Show();
                     
-                    window.Close();
+                 //   window.Close();
                 }
                 else
                 {
diff --git a/Aucma.Core.SheetMetal/ViewModels/MainWindowViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/MainWindowViewModel.cs
index 652ede4..aa7f59a 100644
--- a/Aucma.Core.SheetMetal/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.SheetMetal/ViewModels/MainWindowViewModel.cs
@@ -217,9 +217,9 @@ namespace Aucma.Core.SheetMetal.ViewModels
 
                 window.Hide();
                 //跳转到登录页
-                LoginPageView login = new LoginPageView();
+                LoginPageView login = LoginPageView.Instance;
                 login.Show();
-                window.Close();
+             //   window.Close();
             }
         }
 
diff --git a/Aucma.Core.SheetMetal/Views/IndexPageView.xaml b/Aucma.Core.SheetMetal/Views/IndexPageView.xaml
index 96c00b4..6c12067 100644
--- a/Aucma.Core.SheetMetal/Views/IndexPageView.xaml
+++ b/Aucma.Core.SheetMetal/Views/IndexPageView.xaml
@@ -295,9 +295,9 @@
                     <StackPanel >
                         <WrapPanel  VerticalAlignment="Center" HorizontalAlignment="Right" >
                             <TextBlock Text="计划列表" FontSize="20" FontWeight="Bold" Foreground="White" />
-                            <Button Content="完成计划" Command="{Binding CompleteCommand}" Width="100" Height="30" Background="Red"  Margin="200 0 0 0"  />
-                            <Button Content="暂停计划" Command="{Binding StopCommand}" Width="100" Height="30" Background="YellowGreen"  Margin="10 0 0 0"  />
-                            <Button Content="手动下发" Command="{Binding ManualCommand}" Width="100" Height="30" Background="Orange" Margin="10 0 0 0"  />
+                            <Button Content="完成计划" Command="{Binding CompleteCommand}" Width="120" Height="30" Background="Red"  Margin="200 0 0 0"  />
+                            <Button Content="暂停计划" Command="{Binding StopCommand}" Width="120" Height="30" Background="YellowGreen"  Margin="10 0 0 0"  />
+                            <Button Content="手动下发" Command="{Binding ManualCommand}" Width="120" Height="30" Background="Orange" Margin="10 0 0 0"  />
                         </WrapPanel>
                     </StackPanel>
                     
diff --git a/Aucma.Core.SheetMetal/Views/LoginPageView.xaml.cs b/Aucma.Core.SheetMetal/Views/LoginPageView.xaml.cs
index 68ef885..5c657de 100644
--- a/Aucma.Core.SheetMetal/Views/LoginPageView.xaml.cs
+++ b/Aucma.Core.SheetMetal/Views/LoginPageView.xaml.cs
@@ -22,11 +22,22 @@ namespace Aucma.Core.SheetMetal.Views
     /// </summary>
     public partial class LoginPageView : Window
     {
+        private static readonly Lazy<LoginPageView> _instance = new Lazy<LoginPageView>(() => new LoginPageView());
+
+        public static LoginPageView Instance => _instance.Value;
+
         LoginPageViewModel loginViewModel = new LoginPageViewModel();
         public LoginPageView()
         {
             InitializeComponent();
             this.DataContext = loginViewModel;
+            Closing += LoginPageView_Closing; // 订阅窗口关闭事件
+        }
+
+
+        private void LoginPageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            System.Environment.Exit(0);
         }
 
         private void loginBtn_Click(object sender, RoutedEventArgs e)
diff --git a/Aucma.Core.SheetMetal/Views/MainWindow.xaml b/Aucma.Core.SheetMetal/Views/MainWindow.xaml
index 3717a24..614ad5b 100644
--- a/Aucma.Core.SheetMetal/Views/MainWindow.xaml
+++ b/Aucma.Core.SheetMetal/Views/MainWindow.xaml
@@ -30,7 +30,7 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="2*"/>
                         <ColumnDefinition Width="7*"/>
-                        <ColumnDefinition Width="3*"/>
+                        <ColumnDefinition Width="2*"/>
                     </Grid.ColumnDefinitions>
 
                     <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
diff --git a/Aucma.Core.SheetMetal/Views/MainWindow.xaml.cs b/Aucma.Core.SheetMetal/Views/MainWindow.xaml.cs
index b28d579..a3767b1 100644
--- a/Aucma.Core.SheetMetal/Views/MainWindow.xaml.cs
+++ b/Aucma.Core.SheetMetal/Views/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
 using Aucma.Core.SheetMetal.ViewModels;
+using System;
 using System.Windows;
 
 namespace Aucma.Core.SheetMetal.Views
@@ -8,6 +9,10 @@ namespace Aucma.Core.SheetMetal.Views
     /// </summary>
     public partial class MainWindow : Window
     {
+        private static readonly Lazy<MainWindow> _instance = new Lazy<MainWindow>(() => new MainWindow());
+
+        public static MainWindow Instance => _instance.Value;
+
         public MainWindow()
         {
             InitializeComponent();