Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP
This commit is contained in:
commit
0d830e6909
6 files changed
+50
-3
No files matched your search
+15
-2
@@ -8,19 +8,32 @@ using System.Threading.Tasks;
|
||||
|
||||
namespace Audit
|
||||
{
|
||||
///<Summary>
|
||||
/// Gets the answer
|
||||
///</Summary>
|
||||
public class AuditData : ObservableObject
|
||||
{
|
||||
///<Summary>
|
||||
/// AuditData
|
||||
///</Summary>
|
||||
public static AuditData Instance = new Lazy<AuditData>(() => new AuditData()).Value;
|
||||
|
||||
private UserAccount useraccount = new UserAccount();
|
||||
|
||||
///<Summary>
|
||||
/// UserAccount
|
||||
///</Summary>
|
||||
public UserAccount Useraccount
|
||||
{
|
||||
get { return useraccount; }
|
||||
set { useraccount = value; RaisePropertyChanged("Useraccount");}
|
||||
}
|
||||
|
||||
///<Summary>
|
||||
/// systemName
|
||||
///</Summary>
|
||||
public string systemName = "尚彩化学品审计终端";
|
||||
///<Summary>
|
||||
/// SystemName
|
||||
///</Summary>
|
||||
public string SystemName
|
||||
{
|
||||
get { return systemName; }
|
||||
|
||||
@@ -21,6 +21,9 @@ namespace Audit
|
||||
/// </summary>
|
||||
public partial class MainWindow : MetroWindow
|
||||
{
|
||||
///<Summary>
|
||||
/// MainWindow
|
||||
///</Summary>
|
||||
public MainWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
@@ -10,6 +10,9 @@ using System.Windows;
|
||||
|
||||
namespace Audit.ViewModel
|
||||
{
|
||||
///<Summary>
|
||||
/// LogViewModel
|
||||
///</Summary>
|
||||
public class LogViewModel : ViewModelBase
|
||||
{
|
||||
/* public AuditData AuditData { get; set; } = AuditData.Instance;
|
||||
|
||||
@@ -47,6 +47,9 @@ namespace Audit.ViewModel
|
||||
SimpleIoc.Default.Register<LogViewModel>();
|
||||
}
|
||||
|
||||
///<Summary>
|
||||
/// MainViewModel
|
||||
///</Summary>
|
||||
public MainViewModel Main
|
||||
{
|
||||
get
|
||||
@@ -54,7 +57,10 @@ namespace Audit.ViewModel
|
||||
return ServiceLocator.Current.GetInstance<MainViewModel>();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
///<Summary>
|
||||
/// LogViewModel
|
||||
///</Summary>
|
||||
public LogViewModel Login
|
||||
{
|
||||
get
|
||||
@@ -62,6 +68,10 @@ namespace Audit.ViewModel
|
||||
return ServiceLocator.Current.GetInstance<LogViewModel>();
|
||||
}
|
||||
}
|
||||
|
||||
///<Summary>
|
||||
/// Cleanup
|
||||
///</Summary>
|
||||
public static void Cleanup()
|
||||
{
|
||||
// TODO Clear the ViewModels
|
||||
|
||||
@@ -22,6 +22,9 @@ namespace Audit.Windows
|
||||
/// </summary>
|
||||
public partial class LogWindow : MetroWindow
|
||||
{
|
||||
///<Summary>
|
||||
/// LogWindow
|
||||
///</Summary>
|
||||
public LogWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
@@ -31,8 +34,20 @@ namespace Audit.Windows
|
||||
{
|
||||
Application.Current.Shutdown();//关闭窗口
|
||||
}
|
||||
|
||||
///<Summary>
|
||||
///AuditData
|
||||
///</Summary>
|
||||
public AuditData AuditData { get; set; } = AuditData.Instance;
|
||||
|
||||
///<Summary>
|
||||
/// UserAccount
|
||||
///</Summary>
|
||||
public UserAccount UserAccount { get; private set; } = AuditData.Instance.Useraccount;
|
||||
|
||||
///<Summary>
|
||||
/// Log
|
||||
///</Summary>
|
||||
private void Log(object sender, RoutedEventArgs e)//登录按钮
|
||||
{
|
||||
|
||||
|
||||
@@ -20,6 +20,9 @@ namespace Audit.Windows
|
||||
/// </summary>
|
||||
public partial class Set_up : MetroWindow
|
||||
{
|
||||
///<Summary>
|
||||
/// Set_up
|
||||
///</Summary>
|
||||
public Set_up()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
Reference in new issue
Block a user