diff --git a/Client/RIZO.Client.BaseModule/Views/UserManagementView.xaml.cs b/Client/RIZO.Client.BaseModule/Views/UserManagementView.xaml.cs index 16a420d..efc673d 100644 --- a/Client/RIZO.Client.BaseModule/Views/UserManagementView.xaml.cs +++ b/Client/RIZO.Client.BaseModule/Views/UserManagementView.xaml.cs @@ -10,6 +10,7 @@ namespace RIZO.Client.BaseModule.Views public UserManagementView() { InitializeComponent(); + } } } \ No newline at end of file diff --git a/Client/RIZO.Client.BusinessModule/BusinessModule.cs b/Client/RIZO.Client.BusinessModule/BusinessModule.cs index 7b701db..ea07ab8 100644 --- a/Client/RIZO.Client.BusinessModule/BusinessModule.cs +++ b/Client/RIZO.Client.BusinessModule/BusinessModule.cs @@ -1,7 +1,7 @@ using Prism.Ioc; using Prism.Modularity; using Prism.Regions; -using RIZO.Client.BusinessModule.View; +using RIZO.Client.BusinessModule.Views; namespace RIZO.Client.BusinessModule { @@ -13,15 +13,16 @@ namespace RIZO.Client.BusinessModule // 比如 左侧菜单 // 需要一个RegionManager - var regionManager = containerProvider.Resolve(); - regionManager.RegisterViewWithRegion("MainContentRegion", typeof(ReportWorkView)); + //var regionManager = containerProvider.Resolve(); + //regionManager.RegisterViewWithRegion("MainContentRegion", typeof(ReportWorkView)); //regionManager.RegisterViewWithRegion("MainHeaderRegion", typeof(Views.MainHeaderView)); } public void RegisterTypes(IContainerRegistry containerRegistry) { - containerRegistry.Register(); - + // containerRegistry.Register(); + containerRegistry.RegisterForNavigation(); + } } } diff --git a/Client/RIZO.Client.BusinessModule/ViewModels/ReportWorkViewModel.cs b/Client/RIZO.Client.BusinessModule/ViewModels/ReportWorkViewModel.cs index 136f1c2..785b0dd 100644 --- a/Client/RIZO.Client.BusinessModule/ViewModels/ReportWorkViewModel.cs +++ b/Client/RIZO.Client.BusinessModule/ViewModels/ReportWorkViewModel.cs @@ -11,20 +11,17 @@ using Unity; namespace RIZO.Client.BusinessModule.ViewModels { - public class ReportWorkViewModel : BindableBase + public class ReportWorkViewModel : ViewModelBase { - public string PageTitle { set; get; } = "工单123123"; - //public ReportWorkViewModel(IUnityContainer unityContainer, IRegionManager regionManager) - // : base(unityContainer, regionManager) - //{ - // this.PageTitle = "工单123123"; + - - - //} - public ReportWorkViewModel() + public ReportWorkViewModel(IUnityContainer unityContainer, IRegionManager regionManager) + : base(unityContainer, regionManager) { - + this.PageTitle = "工单123123"; + + + } } } diff --git a/Client/RIZO.Client.BusinessModule/View/ReportWorkView.xaml b/Client/RIZO.Client.BusinessModule/Views/ReportWorkView.xaml similarity index 90% rename from Client/RIZO.Client.BusinessModule/View/ReportWorkView.xaml rename to Client/RIZO.Client.BusinessModule/Views/ReportWorkView.xaml index 01e74de..bb04d4a 100644 --- a/Client/RIZO.Client.BusinessModule/View/ReportWorkView.xaml +++ b/Client/RIZO.Client.BusinessModule/Views/ReportWorkView.xaml @@ -1,9 +1,9 @@ - /// ReportWorkView.xaml 的交互逻辑 @@ -23,6 +24,7 @@ namespace RIZO.Client.BusinessModule.View public ReportWorkView() { InitializeComponent(); + } } }