From a4a745e7b86b8aa124423f0f276742ca2e10844b Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 5 Nov 2024 15:50:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BB=91=E5=AE=9A=E5=AE=9E=E4=BD=93=E7=B1=BB?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=89=E4=B8=AD=E4=BA=8B=E4=BB=B6=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/ViewModels/HomeWindowViewModel.cs | 34 +++++++++++++++------
 DM_Weight/Views/HomeWindow.xaml             |  4 +--
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs
index 0b7ad4f..1e79d85 100644
--- a/DM_Weight/ViewModels/HomeWindowViewModel.cs
+++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs
@@ -258,18 +258,34 @@ namespace DM_Weight.ViewModels
             }
         }
 
-        private DelegateCommand<ListBox> _selectionCommon;
-        public DelegateCommand<ListBox> SelectionCommon
+        private DelegateCommand _selectionCommon;
+        public DelegateCommand SelectionCommon
         {
-            get => _selectionCommon ?? (_selectionCommon = new DelegateCommand<ListBox>(SelectionMethod));
+            get => _selectionCommon ?? (_selectionCommon = new DelegateCommand(SelectionMethod));
         }
-        private void SelectionMethod(ListBox viewName)
+        private void SelectionMethod()
         {
-            SelectedMenu = viewName.SelectedItem as PremissionDm;
-            if (SelectedMenu.PremissionName == "退出")
-            {
+            //SelectedMenu = viewName.SelectedItem as PremissionDm;
+            //if (SelectedMenu.PremissionName == "退出")
+            //{
 
-                _chkFunction.HIKStopDVRRecord();
+            //    _chkFunction.HIKStopDVRRecord();
+            //    logger.Info($"用户【{Operator?.Nickname}】退出登录");
+            //    Operator = null;
+            //    Reviewer = null;
+            //    _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+            //}
+            //else
+            //{
+            //    //SelectedMenu.Children = SelectedMenu.Children;
+            //    //  SelectedChildMenu = SelectedMenu.Children[0];
+            //    if (!_portUtil.Operate)
+            //    {
+            //        _regionManager.RequestNavigate("ContentRegion", SelectedMenu.Children[0].PremissionPath);
+            //    }
+            //}
+            if (SelectedMenu != null && SelectedMenu.PremissionName == "退出")
+            {
                 logger.Info($"用户【{Operator?.Nickname}】退出登录");
                 Operator = null;
                 Reviewer = null;
@@ -278,7 +294,7 @@ namespace DM_Weight.ViewModels
             else
             {
                 //SelectedMenu.Children = SelectedMenu.Children;
-                //  SelectedChildMenu = SelectedMenu.Children[0];
+                //SelectedChildMenu = SelectedMenu.Children[0];
                 if (!_portUtil.Operate)
                 {
                     _regionManager.RequestNavigate("ContentRegion", SelectedMenu.Children[0].PremissionPath);
diff --git a/DM_Weight/Views/HomeWindow.xaml b/DM_Weight/Views/HomeWindow.xaml
index 9acd680..2b2bda4 100644
--- a/DM_Weight/Views/HomeWindow.xaml
+++ b/DM_Weight/Views/HomeWindow.xaml
@@ -27,10 +27,10 @@
             </Grid.ColumnDefinitions>
             <!--<Image Grid.Column="0" Margin="30 0 30 0" HorizontalAlignment="Left" Width="Auto" Height="26"  Source="/Images/logo.png" />-->
             <TextBlock Text="交接柜管理系统" Grid.Column="0" Margin="30 0 30 0" HorizontalAlignment="Left" Width="Auto" Height="26" Foreground="White" FontSize="20" FontWeight="Bold" />
-            <ListBox Name="ListBoxName" Grid.Column="1" ItemsSource="{Binding PremissionDmList}"  HorizontalAlignment="Right" Cursor="Hand">
+            <ListBox Name="ListBoxName" Grid.Column="1"  SelectedItem="{Binding SelectedMenu}" ItemsSource="{Binding PremissionDmList}"  HorizontalAlignment="Right" Cursor="Hand">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="SelectionChanged">
-                        <i:InvokeCommandAction Command="{Binding SelectionCommon}" CommandParameter="{Binding ElementName=ListBoxName}"/>
+                        <i:InvokeCommandAction Command="{Binding SelectionCommon}"/>
                     </i:EventTrigger>
                 </i:Interaction.Triggers>
                 <ListBox.ItemsPanel>