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

ViewModel/LogViewModel.cs

@@ -12,10 +12,11 @@ namespace Audit.ViewModel
 {
     public class LogViewModel : ViewModelBase
     {
- //       public UserAccount UserAccount { get; private set; } = AuditData.Instance.UserAccount;
+    //    public AuditData AuditData { get; set; } = AuditData.Instance.Useraccount;
+    //    public UserAccount UserAccount { get; private set; } = AuditData.Instance.Useraccount;
 
         //登录命令绑定  
-/*        public RelayCommand LogCommand 
+        /*        public RelayCommand LogCommand 
                 {
                     get 
                     {
@@ -25,6 +26,6 @@ namespace Audit.ViewModel
                         });
                     }
                 }
-*/
+        */
     }
 }

Windows/LogWindow.xaml

@@ -12,7 +12,7 @@
         <TextBlock HorizontalAlignment="Left" Height="25" Margin="55,50,0,0" TextWrapping="Wrap" Text="用户" VerticalAlignment="Top" Width="35" FontSize="16"/>
         <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"/>
+        <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"/>
     </Grid>

Windows/LogWindow.xaml.cs

@@ -31,9 +31,11 @@ namespace Audit.Windows
         {
             Application.Current.Shutdown();//关闭窗口
         }
-
+  //      public UserAccount UserAccount { get; private set; } = AuditData.Instance.Useraccount;
+        public AuditData AuditData { get; set; } = AuditData.Instance;
         private void Log(object sender, RoutedEventArgs e)//登录按钮
         {  
+
             if (this.users.Text == "sunlight")
             {
                 if (this.Passwds.Text == "sunlight")
@@ -50,12 +52,11 @@ namespace Audit.Windows
             }
             else
             {
-                UserAccountProvide UserAccountProvide = new UserAccountProvide();
-                var user = UserAccountProvide.Select()
-                .FirstOrDefault(item => item.UserCode == AuditData.Instance.Useraccount.UserCode 
-                && item.PassWord == AuditData.Instance.Useraccount.PassWord);
                 
-                if (user == null)
+                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：用户名或密码错误");
                 }