Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP
This commit is contained in:
commit
9ea61426e1
38 files changed
+11
-2495
No files matched your search
@@ -11,8 +11,8 @@
|
||||
<TextBlock HorizontalAlignment="Center" Height="35" Margin="0,5,0,0" TextWrapping="Wrap" Text="化学品审计管理" VerticalAlignment="Top" Width="170" FontSize="24"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="25" Margin="55,50,0,0" TextWrapping="Wrap" Text="用户" VerticalAlignment="Top" Width="35" FontSize="16"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="25" Margin="55,80,0,0" TextWrapping="Wrap" Text="密码" VerticalAlignment="Top" Width="35" FontSize="16"/>
|
||||
<Button HorizontalAlignment="Left" Height="35" Margin="60,110,0,0" VerticalAlignment="Top" Content="登录" Width="75" Click="Log" FontSize="16" Command="{Binding LogCommand}"/>
|
||||
<Button HorizontalAlignment="Left" Height="35" Margin="165,110,0,0" VerticalAlignment="Top" Content="取消" Width="75" Click="Exit" FontSize="16" Command="{Binding ExitCommand}"/>
|
||||
<Button HorizontalAlignment="Left" Height="35" Margin="60,110,0,0" VerticalAlignment="Top" Content="登录" Width="75" Click="Log" FontSize="16"/>
|
||||
<Button HorizontalAlignment="Left" Height="35" Margin="165,110,0,0" VerticalAlignment="Top" Content="取消" Width="75" Click="Exit" FontSize="16"/>
|
||||
<TextBox HorizontalAlignment="Left" Height="25" Margin="90,50,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" x:Name="users"/>
|
||||
<TextBox HorizontalAlignment="Left" Height="25" Margin="90,80,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" x:Name="Passwds"/>
|
||||
</Grid>
|
||||
|
||||
@@ -38,12 +38,12 @@ namespace Audit.Windows
|
||||
///<Summary>
|
||||
///AuditData
|
||||
///</Summary>
|
||||
public AuditData AuditData { get; set; } = AuditData.Instance;
|
||||
public AuditData AuditData { get; set; } = AuditData.Instance;//数据库引用
|
||||
|
||||
///<Summary>
|
||||
/// UserAccount
|
||||
///</Summary>
|
||||
public UserAccount UserAccount { get; private set; } = AuditData.Instance.Useraccount;
|
||||
public UserAccount UserAccount { get; private set; } = AuditData.Instance.Useraccount;//数据库引用
|
||||
|
||||
///<Summary>
|
||||
/// Log
|
||||
|
||||
Reference in new issue
Block a user