Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

ViewModel/LogViewModel.cs

@@ -1,15 +1,34 @@
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
 using Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace Audit.ViewModel
 {
     public class LogViewModel : ViewModelBase
     {
         public UserAccount UserAccount { get; set; } = AuditData.Instance.UserAccount;
+
+        private RelayCommand logCommand;
+        public RelayCommand LogCommand 
+        {
+            get { return logCommand; }
+            set { logCommand = value; }
+        }
+
+        public LogViewModel()
+        {
+         
+            logCommand = new RelayCommand(() => 
+            {
+                MessageBox.Show("成功");
+
+            });
+        }
     }
 }

Windows/LogWindow.xaml

@@ -11,7 +11,7 @@
         <TextBlock HorizontalAlignment="Left" Height="35" Margin="40,5,0,0" TextWrapping="Wrap" Text="尚彩化学品审计终端" VerticalAlignment="Top" Width="220" FontSize="24"/>
         <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"/>
+        <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"/>
         <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"/>

Windows/LogWindow.xaml.cs

@@ -27,7 +27,7 @@ namespace Audit.Windows
     
         private void Exit(object sender, RoutedEventArgs e)//退出按钮
         {
-            Application.Current.Shutdown();//关闭程序窗口
+            Application.Current.Shutdown();//关闭窗口
         }
 
         private void Log(object sender, RoutedEventArgs e)//登录按钮
@@ -40,12 +40,12 @@ namespace Audit.Windows
                 {
                     MessageBox.Show("警告:进入设置模式请您明确操作目的及可能需承担的后果");
                     Windows.Set_up setup = new Windows.Set_up();
-                    setup.Show();
+                    setup.Show();//实例化并打开设置窗口
-                    this.Close();
+                    this.Close();//关闭当前窗口
                 }
                 else
                 {
-                    MessageBox.Show("错误01:错误的认证信息");
+                    MessageBox.Show("ERR01:拒绝认证");//设置密码错误
                 }
             }
             else