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

Windows/LogWindow.xaml

@@ -5,8 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Audit.Windows"
         mc:Ignorable="d"
-        Title="审计系统登录" Height="400" Width="300" WindowStartupLocation="CenterScreen">
+        Title="登录" Height="200" Width="300" WindowStartupLocation="CenterScreen">
     <Grid>
-        
+        <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="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" Text="" VerticalAlignment="Top" Width="150"/>
+        <TextBox HorizontalAlignment="Left" Height="25" Margin="90,80,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="150"/>
+
     </Grid>
 </mah:MetroWindow>

Windows/LogWindow.xaml.cs

@@ -24,5 +24,15 @@ namespace Audit.Windows
         {
             InitializeComponent();
         }
+    
+        private void exit(object sender, RoutedEventArgs e)//退出按钮
+        {
+            Application.Current.Shutdown();//关闭程序窗口
+        }
+
+        private void Log(object sender, RoutedEventArgs e)//登录按钮
+        {
+
+        }
     }
 }