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

Windows/SQL_BAK.xaml

@@ -4,16 +4,16 @@
         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" Loaded="Window_SQLBAK"
+        mc:Ignorable="d" Loaded="Window_SQLBAK" BorderBrush="White" Background="#FFEFEFEF"
-        Title="SQL_BAK" Height="140" Width="500">
+        Title="备份/还原" Height="140" Width="500" MaxHeight="140" MaxWidth="500" ResizeMode="NoResize">
     <Grid>
         <CheckBox x:Name="SQL_bak" Height="15" Margin="230,15,145,0" VerticalAlignment="Top" Content="自定义备份地址" IsTabStop="False" Checked="SQLBAK_Checked" Unchecked="SQLBAK_Checked"/>
         <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,35,0,0" TextWrapping="Wrap" Text="备份地址:" VerticalAlignment="Top" Width="70" FontSize="16"/>
         <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,10,0,0" TextWrapping="Wrap" Text="数据库（Dispensing):" VerticalAlignment="Top" Width="175" FontSize="16"/>
         <TextBox x:Name="SQL_DISPEN_bak" HorizontalAlignment="Left" Height="20" Margin="90,35,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="285"/>
         <Button x:Name="SQL_DISPEN_BUT" Content="浏览路径" HorizontalAlignment="Left" Height="20" Margin="375,35,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click"/>
-        <Button Content="备份"  HorizontalAlignment="Right" Height="20" Margin="0,60,150,0" VerticalAlignment="Top" Width="85" Background="#FFF3F3F3" Click="Button_Click_1"/>
+        <Button Content="备份"  HorizontalAlignment="Right" Height="20" Margin="0,60,150,0" VerticalAlignment="Top" Width="85" Background="#FFE6E6E6" Click="Button_Click_1"/>
-        <Button Content="还原" HorizontalAlignment="Right" Height="20" Margin="0,60,50,0" VerticalAlignment="Top" Width="85" Background="#FFF3F3F3" Click="Button_Click_2"/>
+        <Button Content="还原" HorizontalAlignment="Right" Height="20" Margin="0,60,50,0" VerticalAlignment="Top" Width="85" Background="#FFE6E6E6" Click="Button_Click_2"/>
         <CheckBox x:Name="SQL_bak_time" Height="15" Margin="365,15,40,0" VerticalAlignment="Top" Content="自动备份" IsTabStop="False" Checked="SQL_bak_time_Checked" Unchecked="SQL_bak_time_Checked"/>
         <TextBlock HorizontalAlignment="Left" Height="20" Margin="20,60,0,0" TextWrapping="Wrap" Text="备份周期:" VerticalAlignment="Top" Width="70" FontSize="16"/>
         <ComboBox x:Name="SQL_TIME" Height="20"  Margin="90,60,335,0" VerticalAlignment="Top">

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="数据库设置" Loaded="Window_SQL" 
+        mc:Ignorable="d" Title="数据库设置" Loaded="Window_SQL" BorderBrush="White" Background="#FFEFEFEF"
         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" />