Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

AuditData.cs

@@ -19,5 +19,12 @@ namespace Audit
             get { return useraccount; }
             set { useraccount = value; RaisePropertyChanged("Useraccount");}
         }
+
+        public string systemName = "尚彩化学品审计终端";
+        public string SystemName
+        {
+            get { return systemName; }
+            set { systemName = value; RaisePropertyChanged("SystemName"); }
+        }
     }
 }

ViewModel/MainViewModel.cs

@@ -19,6 +19,7 @@ namespace Audit.ViewModel
         /// <summary>
         /// Initializes a new instance of the MainViewModel class.
         /// </summary>
+        /// 
         public MainViewModel()
         {
             ////if (IsInDesignMode)

Windows/LogWindow.xaml

@@ -13,7 +13,7 @@
         <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}"/>
-        <TextBox HorizontalAlignment="Left" Height="25" Margin="90,50,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" Text="{Binding AuditData.Useraccount.UserCode}" x:Name="users"/>
+        <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" Text="{Binding AuditData.Useraccount.PassWord}" x:Name="Passwds"/>
+        <TextBox HorizontalAlignment="Left" Height="25" Margin="90,80,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" x:Name="Passwds"/>
     </Grid>
 </mah:MetroWindow>