Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:formula_manage"
         mc:Ignorable="d"
-        Title="MainWindow" Height="720" Width="1280" BorderBrush="White" Background="#FFE0E0E0">
+        Title="SUNLIGHT" Height="720" Width="1280" BorderBrush="White" Background="#FFE0E0E0">
     <Grid>
         <Menu IsTabStop="False">
             <MenuItem Header="_设置" FontSize="16">

Windows/Sql.xaml

@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:formula_manage.Windows"
-        mc:Ignorable="d" Title="SqL" Loaded="Window_SQL" 
+        mc:Ignorable="d" Title="数据库设置" Loaded="Window_SQL" 
         Height="450" Width="280" MaxHeight="450" MaxWidth="280" ResizeMode="NoResize">
     <Grid>
         <TextBox x:Name="TEXT_SQLIP" Height="20" Margin="80,20,20,0" TextWrapping="Wrap" Text=".\" VerticalAlignment="Top" />

Windows/Sql.xaml.cs

@@ -85,8 +85,6 @@ namespace formula_manage.Windows
 
             IniFiles Configini = new IniFiles(INIPath);
 
-
-
             TEXT_SQLIP.Text = Configini.IniReadvalue("SQL_SERVER", "SQL1");    //读配置文件
             TEXT_SQLNAME.Text = Configini.IniReadvalue("SQL_SERVER", "SQL2");
             TEXT_SQMOD.Text = Configini.IniReadvalue("SQL_SERVER", "SQL3");
@@ -145,7 +143,10 @@ namespace formula_manage.Windows
 
         private void Button_Click_1(object sender, RoutedEventArgs e)
         {
-
+            string ConnstrWindows = "server=DESKTOP-MR6U33G\\SQLEXPRESS;database=BatchDyeingCentral;Trusted_Connection=SSPI";
+            SqlConnection conn = new SqlConnection(ConnstrWindows);
+            conn.Open();
+            System.Windows.MessageBox.Show("完成");
         }
 
         private void TEXT_SQLINK_Checked(object sender, RoutedEventArgs e)