Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP

ViewModel/LogViewModel.cs

@@ -12,17 +12,29 @@ namespace Audit.ViewModel
 {
     public class LogViewModel : ViewModelBase
     {
-    //    public AuditData AuditData { get; set; } = AuditData.Instance.Useraccount;
-    //    public UserAccount UserAccount { get; private set; } = AuditData.Instance.Useraccount;
+   /*     public AuditData AuditData { get; set; } = AuditData.Instance;
+        public UserAccount UserAccount { get; private set; } = AuditData.Instance.Useraccount;
 
         //登录命令绑定  
-        /*        public RelayCommand LogCommand 
+                public RelayCommand LogCommand 
                 {
                     get 
                     {
                         return new RelayCommand(() =>
                         {
+                            UserAccountProvide UserAccountProvide = new UserAccountProvide();
+                            var list = UserAccountProvide.Select();
+                            var usersql = list.FirstOrDefault(item => item.UserCode == AuditData.Useraccount.UserCode && item.PassWord == AuditData.Useraccount.PassWord);
+                            if (usersql == null)
+                            {
+                                MessageBox.Show("ERR.C0000：用户名或密码错误");
+                            }
+                            else
+                            {
+                                MainWindow mainWindow = new MainWindow();
+                                mainWindow.Show();
                                 
+                            }
                         });
                     }
                 }

Windows/LogWindow.xaml

@@ -13,7 +13,7 @@
         <TextBlock HorizontalAlignment="Left" Height="25" Margin="55,80,0,0" TextWrapping="Wrap" Text="密码" VerticalAlignment="Top" Width="35" FontSize="16"/>
         <Button HorizontalAlignment="Left" Height="35" Margin="60,110,0,0" VerticalAlignment="Top" Content="登录" Width="75" Click="Log" FontSize="16" Command="{Binding LogCommand}"/>
         <Button HorizontalAlignment="Left" Height="35" Margin="165,110,0,0" VerticalAlignment="Top" Content="取消" Width="75" Click="Exit" FontSize="16" Command="{Binding ExitCommand}"/>
-        <TextBox HorizontalAlignment="Left" Height="25" Margin="90,50,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" Text="{Binding AuditData.UserAccount.UserCode}" x:Name="users"/>
-        <TextBox HorizontalAlignment="Left" Height="25" Margin="90,80,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" Text="{Binding AuditData.UserAccount.PassWord}" x:Name="Passwds"/>
+        <TextBox HorizontalAlignment="Left" Height="25" Margin="90,50,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" Text="{Binding AuditData.Useraccount.UserCode}" x:Name="users"/>
+        <TextBox HorizontalAlignment="Left" Height="25" Margin="90,80,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" Text="{Binding AuditData.Useraccount.PassWord}" x:Name="Passwds"/>
     </Grid>
 </mah:MetroWindow>

Windows/LogWindow.xaml.cs

@@ -31,14 +31,16 @@ namespace Audit.Windows
         {
             Application.Current.Shutdown();//关闭窗口
         }
-  //      public UserAccount UserAccount { get; private set; } = AuditData.Instance.Useraccount;
         public AuditData AuditData { get; set; } = AuditData.Instance;
+        public UserAccount UserAccount { get; private set; } = AuditData.Instance.Useraccount;
         private void Log(object sender, RoutedEventArgs e)//登录按钮
         {
 
-            if (this.users.Text == "sunlight")
+            string users = this.users.Text;
+            string Passwds = this.Passwds.Text;
+            if (users == "sunlight")
             {
-                if (this.Passwds.Text == "sunlight")
+                if (Passwds == "sunlight")
                 {
                     MessageBox.Show("警告：进入设置模式请您明确操作目的及可能需承担的后果");
                     Windows.Set_up setup = new Windows.Set_up();
@@ -52,10 +54,8 @@ namespace Audit.Windows
             }
             else
             {
-                
                 UserAccountProvide UserAccountProvide = new UserAccountProvide();
-                var list = UserAccountProvide.Select();
-                var usersql = list.FirstOrDefault(item => item.UserCode==AuditData.Useraccount.UserCode && item.PassWord==AuditData.Useraccount.PassWord);
+                var usersql = UserAccountProvide.Select().FirstOrDefault(item => item.UserCode == users && item.PassWord == Passwds);
                 if (usersql == null)
                 {
                     MessageBox.Show("ERR.C0000：用户名或密码错误");
@@ -64,9 +64,12 @@ namespace Audit.Windows
                 {
                     MainWindow mainWindow = new MainWindow();
                     mainWindow.Show();
-                    this.Close();
+                    this.Close();//关闭当前窗口
+
                 }
             }
+                      
+            
         }
     }
 }