ltwork 1 gadu atpakaļ
vecāks
revīzija
f38ed763ab

+ 7 - 1
BlankApp1/BlankApp1/ViewModels/SystemManageViewModel/MenuManageViewModel.cs

@@ -4,6 +4,7 @@ using Microsoft.Extensions.Logging;
 using Model.Dto;
 using Model.Entities;
 using PLCTool.Events;
+using PLCTool.Models;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Mvvm;
@@ -28,7 +29,7 @@ namespace PLCTool.ViewModels.SystemManageViewModel
         private readonly IEventAggregator _aggregator;
         private List<MenuDto> allMenuInfoList = new List<MenuDto>();
         private string basePath=System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Images");
-        public MenuManageViewModel(IMenuService iMenuService, IMapper mapper, ILogger logger, IDialogService dialog, EventAggregator aggregator)
+        public MenuManageViewModel(IMenuService iMenuService, IMapper mapper, ILogger logger, IDialogService dialog, IEventAggregator aggregator)
         {
 
             _iMenuService = iMenuService;
@@ -50,6 +51,11 @@ namespace PLCTool.ViewModels.SystemManageViewModel
         private void OnLoad()
         {
             GetAllMenus();
+            //发布面包靴
+            List<CrumbViewModel> breadCrumbs = new List<CrumbViewModel>();
+            breadCrumbs.Add(new CrumbViewModel { Name = "系统管理" });
+            breadCrumbs.Add(new CrumbViewModel { Name = "菜单管理", NavigateRegion = "MenuManageView" });
+            _aggregator.GetEvent<BreadEvent>().Publish(breadCrumbs);
         }
         private void AddMenu(object obj)
         {

+ 18 - 2
BlankApp1/BlankApp1/ViewModels/SystemManageViewModel/RoleManageViewModel.cs

@@ -5,6 +5,7 @@ using Model.Dto;
 using Model.Entities;
 using PLCTool.Controls;
 using PLCTool.Events;
+using PLCTool.Models;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Mvvm;
@@ -29,7 +30,8 @@ namespace PLCTool.ViewModels.SystemManageViewModel
         private readonly IDialogService _dialog;
         private readonly IEventAggregator _aggregator;
         private List<RoleDto> allRoleInfoList = new List<RoleDto>();
-        public RoleManageViewModel(IUserService iUserService, IRoleService iRoleService, IMapper mapper, ILogger logger, IDialogService dialog, EventAggregator aggregator)
+
+        public RoleManageViewModel(IUserService iUserService, IRoleService iRoleService, IMapper mapper, ILogger logger, IDialogService dialog, IEventAggregator aggregator)
         {
 
             _iUserService = iUserService;
@@ -55,9 +57,15 @@ namespace PLCTool.ViewModels.SystemManageViewModel
         private void OnLoad()
         {
             GetAllRoles();
+            //发布面包靴
+            List<CrumbViewModel> breadCrumbs = new List<CrumbViewModel>();
+            breadCrumbs.Add(new CrumbViewModel { Name = "系统管理" });
+            breadCrumbs.Add(new CrumbViewModel { Name = "角色管理", NavigateRegion = "RoleManageView" });
+            _aggregator.GetEvent<BreadEvent>().Publish(breadCrumbs);
         }
         private void AddUser(object obj)
-        {
+        {      //蒙层显示
+            _aggregator.GetEvent<MaskEvent>().Publish(true);
             _dialog.ShowDialog("AddEditRoleView", async callback =>
             {
                 if (callback.Result == ButtonResult.OK)
@@ -66,6 +74,8 @@ namespace PLCTool.ViewModels.SystemManageViewModel
                 }
 
             });
+            //蒙层显示
+            _aggregator.GetEvent<MaskEvent>().Publish(false);
         }
 
         private void EditUser(object obj)
@@ -84,6 +94,8 @@ namespace PLCTool.ViewModels.SystemManageViewModel
                 }
 
             });
+            //蒙层显示
+            _aggregator.GetEvent<MaskEvent>().Publish(false);
         }
 
         private void Delete(object obj)
@@ -123,6 +135,8 @@ namespace PLCTool.ViewModels.SystemManageViewModel
                 }
 
             });
+            //蒙层显示
+            _aggregator.GetEvent<MaskEvent>().Publish(false);
         }
 
         private void AuthoMenu(object obj)
@@ -141,6 +155,8 @@ namespace PLCTool.ViewModels.SystemManageViewModel
                 }
 
             });
+            //蒙层不显示
+            _aggregator.GetEvent<MaskEvent>().Publish(false);
         }
 
         /// <summary>

+ 9 - 1
BlankApp1/BlankApp1/ViewModels/SystemManageViewModel/UserManageViewModel.cs

@@ -6,6 +6,7 @@ using Model.Entities;
 using PLCTool.Common;
 using PLCTool.Controls;
 using PLCTool.Events;
+using PLCTool.Models;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Mvvm;
@@ -29,7 +30,7 @@ namespace PLCTool.ViewModels.SystemManageViewModel
         private readonly IDialogService _dialog;
         private readonly IEventAggregator _aggregator;
         private List<UserDto> allUserInfoList = new List<UserDto>();
-        public UserManageViewModel(IUserService iUserService, IMapper mapper, ILogger logger, IDialogService dialog,EventAggregator aggregator)
+        public UserManageViewModel(IUserService iUserService, IMapper mapper, ILogger logger, IDialogService dialog,IEventAggregator aggregator)
         {
 
             _iUserService = iUserService;
@@ -42,15 +43,22 @@ namespace PLCTool.ViewModels.SystemManageViewModel
             DeleteCommand = new DelegateCommand<object>(Delete);
             OnLoadCommand = new DelegateCommand(OnLoad);
             QueryCommand = new DelegateCommand<object>(Query);
+  
         }
 
      
 
 
+
         #region 私有方法
         private void OnLoad()
         {
             GetAllUsers();
+            //发布面包靴
+            List<CrumbViewModel> breadCrumbs = new List<CrumbViewModel>();
+            breadCrumbs.Add(new CrumbViewModel { Name = "系统管理" });
+            breadCrumbs.Add(new CrumbViewModel { Name = "用户管理", NavigateRegion = "UserManageView" });
+            _aggregator.GetEvent<BreadEvent>().Publish(breadCrumbs);
         }
         private void AddUser(object obj)
         {