diff --git a/Client/RIZO.Client.BaseModule/RIZO.Client.BaseModule.csproj b/Client/RIZO.Client.BaseModule/RIZO.Client.BaseModule.csproj
index 79f78d2..b0adaa9 100644
--- a/Client/RIZO.Client.BaseModule/RIZO.Client.BaseModule.csproj
+++ b/Client/RIZO.Client.BaseModule/RIZO.Client.BaseModule.csproj
@@ -5,16 +5,11 @@
true
-
-
-
-
-
-
+
diff --git a/Client/RIZO.Client.BusinessModule/BusinessModule.cs b/Client/RIZO.Client.BusinessModule/BusinessModule.cs
new file mode 100644
index 0000000..7b701db
--- /dev/null
+++ b/Client/RIZO.Client.BusinessModule/BusinessModule.cs
@@ -0,0 +1,27 @@
+using Prism.Ioc;
+using Prism.Modularity;
+using Prism.Regions;
+using RIZO.Client.BusinessModule.View;
+
+namespace RIZO.Client.BusinessModule
+{
+ public class BusinessModule : IModule
+ {
+ public void OnInitialized(IContainerProvider containerProvider)
+ {
+ // 初始化的时候，添加一个组件到对应的区域
+ // 比如 左侧菜单
+ // 需要一个RegionManager
+
+ var regionManager = containerProvider.Resolve();
+ regionManager.RegisterViewWithRegion("MainContentRegion", typeof(ReportWorkView));
+ //regionManager.RegisterViewWithRegion("MainHeaderRegion", typeof(Views.MainHeaderView));
+ }
+
+ public void RegisterTypes(IContainerRegistry containerRegistry)
+ {
+ containerRegistry.Register();
+
+ }
+ }
+}
diff --git a/Client/RIZO.Client.BusinessModule/RIZO.Client.BusinessModule.csproj b/Client/RIZO.Client.BusinessModule/RIZO.Client.BusinessModule.csproj
new file mode 100644
index 0000000..3e5b28d
--- /dev/null
+++ b/Client/RIZO.Client.BusinessModule/RIZO.Client.BusinessModule.csproj
@@ -0,0 +1,18 @@
+
+
+
+ net5.0-windows
+ enable
+ true
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Client/RIZO.Client.BusinessModule/View/ReportWorkView.xaml b/Client/RIZO.Client.BusinessModule/View/ReportWorkView.xaml
new file mode 100644
index 0000000..01e74de
--- /dev/null
+++ b/Client/RIZO.Client.BusinessModule/View/ReportWorkView.xaml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
diff --git a/Client/RIZO.Client.BusinessModule/View/ReportWorkView.xaml.cs b/Client/RIZO.Client.BusinessModule/View/ReportWorkView.xaml.cs
new file mode 100644
index 0000000..7de2a6c
--- /dev/null
+++ b/Client/RIZO.Client.BusinessModule/View/ReportWorkView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace RIZO.Client.BusinessModule.View
+{
+ ///
+ /// ReportWorkView.xaml 的交互逻辑
+ ///
+ public partial class ReportWorkView : UserControl
+ {
+ public ReportWorkView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/Client/RIZO.Client.BusinessModule/ViewModels/ReportWorkViewModel.cs b/Client/RIZO.Client.BusinessModule/ViewModels/ReportWorkViewModel.cs
new file mode 100644
index 0000000..136f1c2
--- /dev/null
+++ b/Client/RIZO.Client.BusinessModule/ViewModels/ReportWorkViewModel.cs
@@ -0,0 +1,30 @@
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using RIZO.Client.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Unity;
+
+namespace RIZO.Client.BusinessModule.ViewModels
+{
+ public class ReportWorkViewModel : BindableBase
+ {
+ public string PageTitle { set; get; } = "工单123123";
+ //public ReportWorkViewModel(IUnityContainer unityContainer, IRegionManager regionManager)
+ // : base(unityContainer, regionManager)
+ //{
+ // this.PageTitle = "工单123123";
+
+
+
+ //}
+ public ReportWorkViewModel()
+ {
+
+ }
+ }
+}
diff --git a/Client/RIZO.Client.Infrastructure/RIZO.Client.Infrastructure.csproj b/Client/RIZO.Client.Infrastructure/RIZO.Client.Infrastructure.csproj
new file mode 100644
index 0000000..591f536
--- /dev/null
+++ b/Client/RIZO.Client.Infrastructure/RIZO.Client.Infrastructure.csproj
@@ -0,0 +1,15 @@
+
+
+
+ net5.0-windows
+ enable
+ true
+
+
+
+
+
+
+
+
+
diff --git a/Client/RIZO.Client.MainModule/RIZO.Client.MainModule.csproj b/Client/RIZO.Client.MainModule/RIZO.Client.MainModule.csproj
index d1ae557..17965b5 100644
--- a/Client/RIZO.Client.MainModule/RIZO.Client.MainModule.csproj
+++ b/Client/RIZO.Client.MainModule/RIZO.Client.MainModule.csproj
@@ -5,14 +5,10 @@
true
-
-
-
-
-
+
diff --git a/Client/RIZO.Client.Start/App.xaml.cs b/Client/RIZO.Client.Start/App.xaml.cs
index 0bf3a5c..4797766 100644
--- a/Client/RIZO.Client.Start/App.xaml.cs
+++ b/Client/RIZO.Client.Start/App.xaml.cs
@@ -8,6 +8,7 @@ using RIZO.Client.DAL;
using RIZO.Client.IBLL;
using RIZO.Client.IDAL;
using RIZO.Client.Start.Views;
+using RIZO.Client.BusinessModule;
namespace RIZO.Client.Start
{
@@ -52,6 +53,7 @@ namespace RIZO.Client.Start
// 可以改为自动扫描
moduleCatalog.AddModule();
moduleCatalog.AddModule();
+ moduleCatalog.AddModule();
}
}
}
diff --git a/Client/RIZO.Client.Start/RIZO.Client.Start.csproj b/Client/RIZO.Client.Start/RIZO.Client.Start.csproj
index cba05d4..50f8df3 100644
--- a/Client/RIZO.Client.Start/RIZO.Client.Start.csproj
+++ b/Client/RIZO.Client.Start/RIZO.Client.Start.csproj
@@ -6,21 +6,16 @@
true
-
-
-
-
-
-
-
+
+
diff --git a/Client/RIZO.Client.Start/Views/MainWindow.xaml b/Client/RIZO.Client.Start/Views/MainWindow.xaml
index bdc80b2..6585936 100644
--- a/Client/RIZO.Client.Start/Views/MainWindow.xaml
+++ b/Client/RIZO.Client.Start/Views/MainWindow.xaml
@@ -22,7 +22,7 @@
-
+