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

App.xaml

@@ -1,4 +1,4 @@
-<Application x:Class="Audit.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:Audit" StartupUri="MainWindow.xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" d1p1:Ignorable="d" xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006">
+<Application x:Class="Audit.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:Audit" StartupUri="Windows/LogWindow.xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" d1p1:Ignorable="d" xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006">
   <Application.Resources>
     <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

Audit.csproj

@@ -98,6 +98,9 @@
     </ApplicationDefinition>
     <Compile Include="ViewModel\MainViewModel.cs" />
     <Compile Include="ViewModel\ViewModelLocator.cs" />
+    <Compile Include="Windows\LogWindow.xaml.cs">
+      <DependentUpon>LogWindow.xaml</DependentUpon>
+    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -110,6 +113,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="Windows\LogWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">

MainWindow.xaml

@@ -1,4 +1,4 @@
-<Window
+<mah:MetroWindow
         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"
@@ -10,4 +10,4 @@
         mc:Ignorable="d"
         Title="化学品审计管理" Height="1080" Width="1920">
     <Button Content="Button" HorizontalAlignment="Left" Height="115" Margin="485,760,0,0" VerticalAlignment="Top" Width="315"/>
-</Window>
+</mah:MetroWindow>

MainWindow.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using MahApps.Metro.Controls;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -18,7 +19,7 @@ namespace Audit
     /// <summary>
     /// MainWindow.xaml 的交互逻辑
     /// </summary>
-    public partial class MainWindow : Window
+    public partial class MainWindow : MetroWindow
     {
         public MainWindow()
         {

Models/Models.csproj

@@ -313,6 +313,7 @@
     <Compile Include="UserAccount.cs">
       <DependentUpon>SQL_Ti.tt</DependentUpon>
     </Compile>
+    <Compile Include="UserAccountProvide.cs" />
     <Compile Include="UserGroup.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>

Models/UserAccountProvide.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Models
+{
+    public class UserAccountProvide : IProvider<UserAccount>
+    {
+        public int Delete(UserAccount t)
+        {
+            throw new NotImplementedException();
+        }
+
+        public int Insert(UserAccount t)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<UserAccount> Select()
+        {
+            throw new NotImplementedException();
+        }
+
+        public int Update(UserAccount t)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Windows/LogWindow.xaml

@@ -0,0 +1,12 @@
+<Window x:Class="Audit.Windows.LogWindow"
+        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:Audit.Windows"
+        mc:Ignorable="d"
+        Title="LogWindow" Height="400" Width="300">
+    <Grid>
+        
+    </Grid>
+</Window>

Windows/LogWindow.xaml.cs

@@ -0,0 +1,27 @@
+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 Audit.Windows
+{
+    /// <summary>
+    /// LogWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class LogWindow : Window
+    {
+        public LogWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}