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

Windows/LogWindow.xaml

@@ -11,9 +11,9 @@
         <TextBlock HorizontalAlignment="Center" Height="35" Margin="0,5,0,0" TextWrapping="Wrap" Text="化学品审计管理" VerticalAlignment="Top" Width="170" 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"/>
+        <TextBox HorizontalAlignment="Left" Height="25" Margin="90,50,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" x:Name="users" IsTabStop="True"/>
+        <TextBox HorizontalAlignment="Left" Height="25" Margin="90,80,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" x:Name="Passwds" IsTabStop="True"/>
         <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" VerticalAlignment="Top" Width="150" x:Name="users"/>
-        <TextBox HorizontalAlignment="Left" Height="25" Margin="90,80,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" x:Name="Passwds"/>
     </Grid>
 </mah:MetroWindow>

Windows/LogWindow.xaml.cs

@@ -31,6 +31,7 @@ namespace Audit.Windows
             InitializeComponent();
         }
 
+
         private void Exit(object sender, RoutedEventArgs e)//退出按钮
         {
             Application.Current.Shutdown();//关闭窗口
@@ -54,18 +55,18 @@ namespace Audit.Windows
 
             string users = this.users.Text;
             string Passwds = this.Passwds.Text;
-            if (users == "sunlight")//内置账号
+            if ((users == "sunlight") || (users == "SUNLIGHT"))//内置账号
             {
-                if (Passwds == "sql")//数据库设置页面判断
+                if ((Passwds == "sql") || (Passwds == "SQL"))//数据库设置页面判断
                 {
-                    MessageBox.Show("警告：进入数据库设置模式请您明确操作目的及可能需承担的后果");
+                    MessageBox.Show("警告：进入数据库设置请您明确操作目的及可能需承担的后果");
                     Windows.Set_up_Sql setup = new Windows.Set_up_Sql();
                     setup.Show();//实例化并打开设置窗口
                     this.Close();//关闭当前窗口
                 }
                 else
                 {
-                    if (Passwds == "sunlight")//主页面判断
+                    if ((Passwds == "sunlight") || (users == "SUNLIGHT"))//主页面判断
                     {
                         MessageBox.Show("SC：开启主页面");
                         MainWindow mainWindow = new MainWindow();