diff --git a/Login.xaml.cs b/Login.xaml.cs
index dca71c0..3ab01ce 100644
--- a/Login.xaml.cs
+++ b/Login.xaml.cs
@@ -58,17 +58,17 @@ namespace formula_manage
 
         private void Button_Click_1(object sender, RoutedEventArgs e)  //登录按钮事件
         {
-            if ((User.Text == "engineer" || User.Text == "ENGINEER") && (Pasword.Password == "engineer" || Pasword.Password == "ENGINEER"))
+          // if ((User.Text == "engineer" || User.Text == "ENGINEER") && (Pasword.Password == "engineer" || Pasword.Password == "ENGINEER"))
             {
                 Window window = Window.GetWindow(this);
                 MainWindow Main = new MainWindow();
                 window.Close();
                 Main.ShowDialog();//实例化并置顶打开信息窗口
             }
-            else
+           /* else
             {
                 System.Windows.MessageBox.Show("账号或密码错误");
-            }
+            }*/
         }
 
         private void SearchBox_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e)
diff --git a/Windows/Sql.xaml b/Windows/Sql.xaml
index 404661d..1505b8e 100644
--- a/Windows/Sql.xaml
+++ b/Windows/Sql.xaml
@@ -5,26 +5,26 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:formula_manage.Windows"
         mc:Ignorable="d" Title="Sql" Loaded="Window_SQL" 
-        Height="450" Width="248" MaxHeight="450" MaxWidth="248" ResizeMode="NoResize">
+        Height="450" Width="280" MaxHeight="450" MaxWidth="280" ResizeMode="NoResize">
     <Grid>
-        <TextBox x:Name="TEXT_SQLIP" HorizontalAlignment="Center" Height="20" Margin="0,20,0,0" TextWrapping="Wrap" Text=".\" VerticalAlignment="Top" Width="144"/>
-        <ComboBox x:Name="TEXT_SQMOD" HorizontalAlignment="Center" Height="20"  Margin="0,50,0,0" VerticalAlignment="Top" Width="144">
+        <TextBox x:Name="TEXT_SQLIP" Height="20" Margin="80,20,20,0" TextWrapping="Wrap" Text=".\" VerticalAlignment="Top" />
+        <ComboBox x:Name="TEXT_SQMOD" Height="20"  Margin="80,50,20,0" VerticalAlignment="Top" >
             <ComboBoxItem Content="Windows 身份认证"></ComboBoxItem>
             <ComboBoxItem Content="SQL SERVER 身份认证"></ComboBoxItem>
         </ComboBox>
-        <TextBox x:Name="TEXT_SQLNAME"  HorizontalAlignment="Center" Height="20" Margin="0,80,0,0" TextWrapping="Wrap" Text="Dispensing" VerticalAlignment="Top" Width="144"/>
-        <TextBox x:Name="TEXT_SQLUSER"  HorizontalAlignment="Center" Height="20" Margin="0,110,0,0" TextWrapping="Wrap" Text="sa" VerticalAlignment="Top" Width="144"/>
-        <TextBox x:Name="TEXT_SQLPASWORD"  HorizontalAlignment="Center" Height="20" Margin="0,140,0,0" TextWrapping="Wrap" Text="sunlight" VerticalAlignment="Top" Width="144"/>
-        <RadioButton x:Name="TEXT_SQLINK" Content="连接对象" HorizontalAlignment="Left" Height="19" Margin="52,170,0,0" VerticalAlignment="Top" Width="115"/>
-        <TextBox x:Name="TEXT_SQLIP2"  HorizontalAlignment="Center" Height="20" Margin="0,190,0,0" TextWrapping="Wrap" Text=".\" VerticalAlignment="Top" Width="144" IsEnabled="False"/>
-        <TextBox x:Name="TEXT_SQLNAME2"  HorizontalAlignment="Center" Height="20" Margin="0,250,0,0" TextWrapping="Wrap" Text="BatchDyeingCentral" VerticalAlignment="Top" Width="144"/>
-        <TextBox x:Name="TEXT_SQLUSER2"  HorizontalAlignment="Center" Height="20" Margin="0,280,0,0" TextWrapping="Wrap" Text="sa" VerticalAlignment="Top" Width="144"/>
-        <TextBox x:Name="TEXT_SQLPASWORD2"  HorizontalAlignment="Center" Height="20" Margin="0,310,0,0" TextWrapping="Wrap" Text="sunlight" VerticalAlignment="Top" Width="144"/>
-        <ComboBox  x:Name="TEXT_SQMOD2" HorizontalAlignment="Center" Height="20"  Margin="0,220,0,0" VerticalAlignment="Top" Width="144">
+        <TextBox x:Name="TEXT_SQLNAME" Height="20" Margin="80,80,20,0" TextWrapping="Wrap" Text="Dispensing" VerticalAlignment="Top"/>
+        <TextBox x:Name="TEXT_SQLUSER" Height="20" Margin="80,110,20,0" TextWrapping="Wrap" Text="sa" VerticalAlignment="Top"/>
+        <TextBox x:Name="TEXT_SQLPASWORD" Height="20" Margin="80,140,20,0" TextWrapping="Wrap" Text="sunlight" VerticalAlignment="Top" />
+        <RadioButton x:Name="TEXT_SQLINK" Content="连接对象" Height="19" Margin="80,170,20,0" VerticalAlignment="Top" />
+        <TextBox x:Name="TEXT_SQLIP2" Height="20" Margin="80,190,20,0" TextWrapping="Wrap" Text=".\" VerticalAlignment="Top" />
+        <TextBox x:Name="TEXT_SQLNAME2" Height="20" Margin="80,250,20,0" TextWrapping="Wrap" Text="BatchDyeingCentral" VerticalAlignment="Top" />
+        <TextBox x:Name="TEXT_SQLUSER2" Height="20" Margin="80,280,20,0" TextWrapping="Wrap" Text="sa" VerticalAlignment="Top"/>
+        <TextBox x:Name="TEXT_SQLPASWORD2" Height="20" Margin="80,310,20,0" TextWrapping="Wrap" Text="sunlight" VerticalAlignment="Top" />
+        <ComboBox  x:Name="TEXT_SQMOD2" Height="20"  Margin="80,220,20,0" VerticalAlignment="Top">
             <ComboBoxItem Content="Windows 身份认证"></ComboBoxItem>
             <ComboBoxItem Content="SQL SERVER 身份认证"></ComboBoxItem>
         </ComboBox>
-        <Button Content="保存" HorizontalAlignment="Right" Height="24" Margin="0,362,20,0" VerticalAlignment="Top" Width="80" BorderBrush="White" Click="Button_Click"/>
-        <Button Content="测试" HorizontalAlignment="Left" Height="24" Margin="20,362,0,0" VerticalAlignment="Top" Width="80" BorderBrush="White" Click="Button_Click_1"/>
+        <Button Content="保存" HorizontalAlignment="Right" Height="24" Margin="0,362,40,0" VerticalAlignment="Top" Width="80" BorderBrush="White" Click="Button_Click"/>
+        <Button Content="测试" HorizontalAlignment="Left" Height="24" Margin="40,362,0,0" VerticalAlignment="Top" Width="80" BorderBrush="White" Click="Button_Click_1"/>
     </Grid>
 </Window>
diff --git a/Windows/Sql.xaml.cs b/Windows/Sql.xaml.cs
index 29ec430..7a5838d 100644
--- a/Windows/Sql.xaml.cs
+++ b/Windows/Sql.xaml.cs
@@ -14,6 +14,7 @@ using System.Windows.Shapes;
 using System.Data.SqlClient;
 using System.Net.NetworkInformation;
 using System.Runtime.InteropServices;
+using System.ComponentModel;
 
 namespace formula_manage.Windows
 {
@@ -71,52 +72,59 @@ namespace formula_manage.Windows
             InitializeComponent();
         }
 
-        string SQL_IP1;
-        string SQL_MOD1;
-        string SQL_NAME1;
-        string SQL_USER1;
-        string SQL_PASWORD1;
-        string SQL_LINK;
-        string SQL_IP2;
-        string SQL_MOD2;
-        string SQL_NAME2;
-        string SQL_USER2;
-        string SQL_PASWORD2;
+        int SQL_MOD;
+        int SQL_MOD1;
+        int i;
 
         public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
 
         private void Window_SQL(object sender, RoutedEventArgs e)
         {
+
             IniFiles Configini = new IniFiles(INIPath);
 
-            SQL_IP1 = Configini.IniReadvalue("SQL_SERVER", "SQL1");
-            SQL_MOD1 = Configini.IniReadvalue("SQL_SERVER", "SQL2");
-            SQL_NAME1 = Configini.IniReadvalue("SQL_SERVER", "SQL3");
-            SQL_USER1 = Configini.IniReadvalue("SQL_SERVER", "SQL4");
-            SQL_PASWORD1 = Configini.IniReadvalue("SQL_SERVER", "SQL5");
-            SQL_LINK = Configini.IniReadvalue("SQL_SERVER", "SQL6");
-            SQL_IP2 = Configini.IniReadvalue("SQL_SERVER", "SQL7");
-            SQL_MOD2 = Configini.IniReadvalue("SQL_SERVER", "SQL8");
-            SQL_NAME2 = Configini.IniReadvalue("SQL_SERVER", "SQL9");
-            SQL_USER2 = Configini.IniReadvalue("SQL_SERVER", "SQL10");
-            SQL_PASWORD2 = Configini.IniReadvalue("SQL_SERVER", "SQL11");
+            TEXT_SQLIP.Text = Configini.IniReadvalue("SQL_SERVER", "SQL1");    //读配置文件
+            TEXT_SQLNAME.Text = Configini.IniReadvalue("SQL_SERVER", "SQL2");
+            TEXT_SQMOD.Text = Configini.IniReadvalue("SQL_SERVER", "SQL3");
+            TEXT_SQLUSER.Text = Configini.IniReadvalue("SQL_SERVER", "SQL4");
+            TEXT_SQLPASWORD.Text = Configini.IniReadvalue("SQL_SERVER", "SQL5");
+            TEXT_SQLINK.DataContext = Configini.IniReadvalue("SQL_SERVER", "SQL6");
+            TEXT_SQLIP2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL7");
+            TEXT_SQLNAME2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL8");
+            TEXT_SQMOD2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL9");
+            TEXT_SQLUSER2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL10");
+            TEXT_SQLPASWORD2.Text = Configini.IniReadvalue("SQL_SERVER", "SQL11");
+
+            int.TryParse(Configini.IniReadvalue("SQL_SERVER", "SQL3"), out i);   //读数据库状态配置文件
+            if (i == 0) TEXT_SQMOD.Text = "Windows 身份认证";
+            else TEXT_SQMOD.Text = "SQL SERVER 身份认证";
+
+            int.TryParse(Configini.IniReadvalue("SQL_SERVER", "SQL9"), out i);
+            if (i == 0) TEXT_SQMOD2.Text = "Windows 身份认证";
+            else TEXT_SQMOD2.Text = "SQL SERVER 身份认证";
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-            IniFiles Configini = new IniFiles(INIPath);
-            Configini.IniWritevalue("SQL_SERVER", "SQL1", TEXT_SQLIP.Text);
+            if(TEXT_SQMOD.Text == "Windows 身份认证" ) SQL_MOD = 0;
+            else SQL_MOD = 1;
+            if (TEXT_SQMOD2.Text == "Windows 身份认证") SQL_MOD1 = 0;
+            else SQL_MOD1 = 1;
+
+            IniFiles Configini = new IniFiles(INIPath);   //配置文件
+            Configini.IniWritevalue("SQL_SERVER", "SQL1", TEXT_SQLIP.Text);   //保存的配置
             Configini.IniWritevalue("SQL_SERVER", "SQL2", TEXT_SQLNAME.Text);
-            Configini.IniWritevalue("SQL_SERVER", "SQL3", TEXT_SQMOD.Text);
+            Configini.IniWritevalue("SQL_SERVER", "SQL3", SQL_MOD.ToString());
             Configini.IniWritevalue("SQL_SERVER", "SQL4", TEXT_SQLUSER.Text);
             Configini.IniWritevalue("SQL_SERVER", "SQL5", TEXT_SQLPASWORD.Text);
             Configini.IniWritevalue("SQL_SERVER", "SQL6", TEXT_SQLINK.IsChecked.ToString());
             Configini.IniWritevalue("SQL_SERVER", "SQL7", TEXT_SQLIP2.Text);
             Configini.IniWritevalue("SQL_SERVER", "SQL8", TEXT_SQLNAME2.Text);
-            Configini.IniWritevalue("SQL_SERVER", "SQL9", TEXT_SQMOD2.Text);
+            Configini.IniWritevalue("SQL_SERVER", "SQL9", SQL_MOD1.ToString());
             Configini.IniWritevalue("SQL_SERVER", "SQL10", TEXT_SQLUSER2.Text);
             Configini.IniWritevalue("SQL_SERVER", "SQL11", TEXT_SQLPASWORD2.Text);
             System.Windows.MessageBox.Show("保存完成");
+            this.Close();   //退出窗口
         }
 
         private void Button_Click_1(object sender, RoutedEventArgs e)