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

App.xaml

@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:formula_manage"
-             StartupUri="MainWindow.xaml">
+             StartupUri="Login.xaml">
     <Application.Resources>
          
     </Application.Resources>

Help.xaml.cs

@@ -21,6 +21,7 @@ namespace formula_manage
     {
         public Help()
         {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
             InitializeComponent();
         }
     }

Login.xaml

@@ -0,0 +1,25 @@
+<Window x:Class="formula_manage.Login"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:formula_manage"
+        mc:Ignorable="d"
+        Title="Login" Height="360" Width="248">
+    <Grid>
+        <Rectangle HorizontalAlignment="Center" Height="118" VerticalAlignment="Top" Width="248">
+            <Rectangle.Fill>
+                <ImageBrush ImageSource="/sunlight_logotext.jpg"/>
+            </Rectangle.Fill>
+        </Rectangle>
+
+        <PasswordBox Height="24" Margin="60,210,10,0" VerticalAlignment="Top" FontSize="16"/>
+        <ComboBox Height="24" Margin="60,164,10,0" VerticalAlignment="Top" FontSize="16" IsEditable="True"/>
+        <TextBlock HorizontalAlignment="Left" Height="26" Margin="10,166,0,0" TextWrapping="Wrap" Text="账号" VerticalAlignment="Top" Width="41" FontSize="20" RenderTransformOrigin="0.833,0.478"/>
+        <TextBlock HorizontalAlignment="Left" Height="26" Margin="10,210,0,0" TextWrapping="Wrap" Text="密码" VerticalAlignment="Top" Width="41" FontSize="20" RenderTransformOrigin="0.833,0.478"/>
+        <Button Content="登录" HorizontalAlignment="Left" Height="23" Margin="60,264,0,0" VerticalAlignment="Top" Width="44" Click="Button_Click_1"/>
+        <Button Content="退出" HorizontalAlignment="Left" Height="23" Margin="140,264,0,0" VerticalAlignment="Top" Width="44" Click="Button_Click"/>
+        <TextBlock Height="28" Margin="20,118,20,0" TextWrapping="Wrap" Text="物料单据管理程序" VerticalAlignment="Top" FontSize="24"/>
+
+    </Grid>
+</Window>

Login.xaml.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace formula_manage
+{
+    /// <summary>
+    /// Login.xaml 的交互逻辑
+    /// </summary>
+    public partial class Login : Window
+    {
+        public Login()
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            InitializeComponent();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}

MainWindow.xaml.cs

@@ -23,6 +23,7 @@ namespace formula_manage
     {
         public MainWindow()
         {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
             InitializeComponent();
         }
         private void SQL(object sender, RoutedEventArgs e)

Windows/Sql.xaml.cs

@@ -21,6 +21,7 @@ namespace formula_manage.Windows
     {
         public Sql()
         {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
             InitializeComponent();
         }
     }

Windows/Stuff.xaml.cs

@@ -21,6 +21,7 @@ namespace formula_manage.Windows
     {
         public Stuff()
         {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
             InitializeComponent();
         }
     }

formula_manage.csproj

@@ -57,6 +57,9 @@
     </ApplicationDefinition>
     <Compile Include="ConvertMoels\ColorSQLConvert.cs" />
     <Compile Include="ConvertMoels\ProductTypeSQLConvert.cs" />
+    <Compile Include="Login.xaml.cs">
+      <DependentUpon>Login.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Windows\Sql.xaml.cs">
       <DependentUpon>Sql.xaml</DependentUpon>
     </Compile>
@@ -67,6 +70,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Login.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>