diff --git a/Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs index fed9a432..6853669d 100644 --- a/Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs @@ -17,8 +17,12 @@ namespace Aucma.Core.OldBoxFoam.ViewModels public partial class MainWindowViewModel : ObservableObject { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel)); + - OldBoxFoamPageView oldBoxFoamPage = new OldBoxFoamPageView(); + private OldBoxFoamPageView oldBoxFoamPage = new OldBoxFoamPageView(); + private OldWarehousePageView oldWarehousePage = new OldWarehousePageView(); + private FoamPlanPageView foamPlanPage = new FoamPlanPageView(); + private RealRoadPageView realRoadPage = new RealRoadPageView(); public MainWindowViewModel() { UserContent = oldBoxFoamPage; @@ -198,14 +202,18 @@ namespace Aucma.Core.OldBoxFoam.ViewModels UserContent = oldBoxFoamPage; break; case "OldWarehousePage": - OldWarehousePageView oldWarehousePage = new OldWarehousePageView(); + UserContent = oldWarehousePage; break; case "FoamPlanPage": - FoamPlanPageView foamPlanPage = new FoamPlanPageView(); + UserContent = foamPlanPage; - break; + break; + case "RealRoadPage": + UserContent = realRoadPage; + break; + default: break; } diff --git a/Aucma.Core.OldBoxFoam/Views/MainWindow.xaml b/Aucma.Core.OldBoxFoam/Views/MainWindow.xaml index cff99807..5ee2e9c3 100644 --- a/Aucma.Core.OldBoxFoam/Views/MainWindow.xaml +++ b/Aucma.Core.OldBoxFoam/Views/MainWindow.xaml @@ -61,6 +61,7 @@