diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index bdc87a9..6c3d8ff 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -37,7 +37,7 @@
-
+
diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs
index 3ad20b3..72886ab 100644
--- a/DM_Weight/ViewModels/HomeWindowViewModel.cs
+++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs
@@ -57,10 +57,13 @@ namespace DM_Weight.ViewModels
get { return _selectedChildMenu; }
set
{
+ logger.Info($"用户【{Operator?.Nickname}】进入菜单_portUtil.Operate:{_portUtil.Operate};value:{value}");
if (!_portUtil.Operate)
{
if (value != null)
{
+
+ logger.Info($"用户【{Operator?.Nickname}】进入菜单value:{value.PremissionPath}");
if (value.PremissionPath.Equals("TakeRecordWindow"))
{
//定义传参变量
@@ -160,7 +163,14 @@ namespace DM_Weight.ViewModels
// SelectedChildMenu = value.Children[0];
// }
//}
- SetProperty(ref _selectedMenu, value);
+ if (!_portUtil.Operate)
+ SetProperty(ref _selectedMenu, value);
+ else
+ {
+ logger.Info($"未关闭抽屉切换菜单");
+ SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+ SnackbarMessageQueue.Enqueue("请关闭抽屉后再切换菜单");
+ }
}
}
@@ -171,7 +181,7 @@ namespace DM_Weight.ViewModels
}
private void SelectionMethod(ListBox viewName)
{
- logger.Info($"用户【{Operator?.Nickname}】进入菜单点击事件");
+ logger.Info($"用户【{Operator?.Nickname}】进入菜单点击事件;viewName.SelectedItem{viewName.SelectedItem}");
//CheckTakeReturnTime();
//PremissionDm premissionDm = viewName.SelectedItem as PremissionDm;
@@ -191,11 +201,21 @@ namespace DM_Weight.ViewModels
SelectedMenu = viewName.SelectedItem as PremissionDm;
if (SelectedMenu.PremissionName == "退出")
{
- //logger.Info($"用户【{Operator?.Nickname}】退出登录");
- logger.Info($"用户【{Operator?.Nickname}】退出登录;SelectionMethod{SelectedMenu.PremissionName}");
- Operator = null;
- Reviewer = null;
- _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+ if (!_portUtil.Operate)
+ {
+ //logger.Info($"用户【{Operator?.Nickname}】退出登录");
+ logger.Info($"用户【{Operator?.Nickname}】退出登录;SelectionMethod{SelectedMenu.PremissionName}");
+ Operator = null;
+ Reviewer = null;
+ _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+ }
+ else
+ {
+ logger.Info($"未关闭抽屉操作退出");
+ SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+ SnackbarMessageQueue.Enqueue("请关闭抽屉后再退出");
+ return;
+ }
}
else
{
@@ -311,7 +331,7 @@ namespace DM_Weight.ViewModels
get => _snackbarMessageQueue;
set => SetProperty(ref _snackbarMessageQueue, value);
}
- private SolidColorBrush _colorBrush=new SolidColorBrush((Color) ColorConverter.ConvertFromString("#b71c1c"));
+ private SolidColorBrush _colorBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
public SolidColorBrush SnackbarBackground
{