maqiao
/
WuHan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

抽屉打开_portUtil.Operate为true则不能操作菜单及退出按钮

This commit is contained in:
maqiao 2024-07-19 15:46:29 +08:00
parent aade72f0cd
commit 06c2f8c0e6
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/App.config
View File

@ -37,7 +37,7 @@
<!-- 抽屉串口使用的协议232或者485 --> <!-- 抽屉串口使用的协议232或者485 -->
<add key="DrawerProtocol" value="485" /> <add key="DrawerProtocol" value="485" />
<!-- 抽屉串口的串口号 --> <!-- 抽屉串口的串口号 -->
<add key="DrawerPortPath" value="COM3" /> <add key="DrawerPortPath" value="COM1" />
<!-- can总线串口的串口号 --> <!-- can总线串口的串口号 -->
<add key="CanBusPortPath" value="COM9" /> <add key="CanBusPortPath" value="COM9" />
<!-- 条码枪串口的串口号 --> <!-- 条码枪串口的串口号 -->

24
DM_Weight/ViewModels/HomeWindowViewModel.cs
View File

@ -57,10 +57,13 @@ namespace DM_Weight.ViewModels
get { return _selectedChildMenu; } get { return _selectedChildMenu; }
set set
{ {
logger.Info($"用户【{Operator?.Nickname}】进入菜单_portUtil.Operate:{_portUtil.Operate};value:{value}");
if (!_portUtil.Operate) if (!_portUtil.Operate)
{ {
if (value != null) if (value != null)
{ {
logger.Info($"用户【{Operator?.Nickname}】进入菜单value:{value.PremissionPath}");
if (value.PremissionPath.Equals("TakeRecordWindow")) if (value.PremissionPath.Equals("TakeRecordWindow"))
{ {
//定义传参变量 //定义传参变量
@ -160,7 +163,14 @@ namespace DM_Weight.ViewModels
// SelectedChildMenu = value.Children[0]; // SelectedChildMenu = value.Children[0];
// } // }
//} //}
if (!_portUtil.Operate)
SetProperty(ref _selectedMenu, value); 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) private void SelectionMethod(ListBox viewName)
{ {
logger.Info($"用户【{Operator?.Nickname}】进入菜单点击事件"); logger.Info($"用户【{Operator?.Nickname}】进入菜单点击事件;viewName.SelectedItem{viewName.SelectedItem}");
//CheckTakeReturnTime(); //CheckTakeReturnTime();
//PremissionDm premissionDm = viewName.SelectedItem as PremissionDm; //PremissionDm premissionDm = viewName.SelectedItem as PremissionDm;
@ -190,6 +200,8 @@ namespace DM_Weight.ViewModels
SelectedMenu = viewName.SelectedItem as PremissionDm; SelectedMenu = viewName.SelectedItem as PremissionDm;
if (SelectedMenu.PremissionName == "退出") if (SelectedMenu.PremissionName == "退出")
{
if (!_portUtil.Operate)
{ {
//logger.Info($"用户【{Operator?.Nickname}】退出登录"); //logger.Info($"用户【{Operator?.Nickname}】退出登录");
logger.Info($"用户【{Operator?.Nickname}】退出登录;SelectionMethod{SelectedMenu.PremissionName}"); logger.Info($"用户【{Operator?.Nickname}】退出登录;SelectionMethod{SelectedMenu.PremissionName}");
@ -198,6 +210,14 @@ namespace DM_Weight.ViewModels
_regionManager.RequestNavigate("MainRegion", "LoginWindow"); _regionManager.RequestNavigate("MainRegion", "LoginWindow");
} }
else else
{
logger.Info($"未关闭抽屉操作退出");
SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
SnackbarMessageQueue.Enqueue("请关闭抽屉后再退出");
return;
}
}
else
{ {
SelectedChildMenu = SelectedMenu.Children[0]; SelectedChildMenu = SelectedMenu.Children[0];
} }
@ -311,7 +331,7 @@ namespace DM_Weight.ViewModels
get => _snackbarMessageQueue; get => _snackbarMessageQueue;
set => SetProperty(ref _snackbarMessageQueue, value); 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 public SolidColorBrush SnackbarBackground
{ {