Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP
This commit is contained in:
commit
a46f12dc52
2 files changed
+3
-3
No files matched your search
+1
-1
@@ -8,7 +8,7 @@
|
||||
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
|
||||
x:Class="Audit.MainWindow"
|
||||
mc:Ignorable="d"
|
||||
Title="化学品审计管理" Height="800" Width="1280" WindowStartupLocation="CenterScreen">
|
||||
Title="绍兴尚彩自动化科技有限公司" Height="800" Width="1280" WindowStartupLocation="CenterScreen">
|
||||
<Grid>
|
||||
|
||||
</Grid>
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
xmlns:local="clr-namespace:Audit.Windows"
|
||||
mc:Ignorable="d"
|
||||
DataContext="{Binding Source ={StaticResource Locator},Path=Login}"
|
||||
Title="登录" Height="200" Width="300" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
|
||||
Title="绍兴尚彩自动化科技有限公司" Height="200" Width="300" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
|
||||
<Grid>
|
||||
<TextBlock HorizontalAlignment="Left" Height="35" Margin="40,5,0,0" TextWrapping="Wrap" Text="尚彩化学品审计终端" VerticalAlignment="Top" Width="220" FontSize="24"/>
|
||||
<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}"/>
|
||||
|
||||
Reference in new issue
Block a user