From f86a2abed64c471d52215f2a1e58f90675affeba Mon Sep 17 00:00:00 2001
From: "David P.G" <pgw1315@163.com>
Date: Fri, 3 Oct 2025 23:06:04 +0800
Subject: [PATCH] =?UTF-8?q?=201=20feat(navigation):=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E5=B9=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E8=88=AA=E5=AE=BD=E5=BA=A6=20=20=20?=
 =?UTF-8?q?=202=20=20=20=203=20-=20=E4=B8=BAVariableTableView=E5=92=8CDevi?=
 =?UTF-8?q?ceDetailView=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=8C=89=E9=92=AE=20=20=20?=
 =?UTF-8?q?=204=20-=20=E5=B0=86VariableHistoryView=E7=9A=84=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=8C=89=E9=92=AE=E6=94=B9=E4=B8=BA=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E6=80=A7=20=20=20=205=20-=20=E8=B0=83=E6=95=B4MainView?=
 =?UTF-8?q?=E4=B8=ADNavigationView=E7=9A=84=E5=B1=95=E5=BC=80=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E4=BB=8E500=E5=87=8F=E5=B0=8F=E5=88=B0200=20?=
 =?UTF-8?q?=20=20=206=20-=20=E6=B8=85=E7=90=86=E6=9C=AA=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DMS.WPF/ViewModels/DeviceDetailViewModel.cs  | 19 ++++++
 DMS.WPF/ViewModels/VariableTableViewModel.cs | 18 ++++++
 DMS.WPF/Views/DeviceDetailView.xaml          | 62 ++++++++++++++------
 DMS.WPF/Views/MainView.xaml                  |  3 +-
 DMS.WPF/Views/VariableHistoryView.xaml       | 22 +++----
 DMS.WPF/Views/VariableTableView.xaml         | 38 +++++++++---
 6 files changed, 121 insertions(+), 41 deletions(-)

diff --git a/DMS.WPF/ViewModels/DeviceDetailViewModel.cs b/DMS.WPF/ViewModels/DeviceDetailViewModel.cs
index 4d540f0..a72e675 100644
--- a/DMS.WPF/ViewModels/DeviceDetailViewModel.cs
+++ b/DMS.WPF/ViewModels/DeviceDetailViewModel.cs
@@ -12,6 +12,7 @@ using DMS.WPF.Interfaces;
 using DMS.WPF.ViewModels.Dialogs;
 using DMS.WPF.ViewModels.Items;
 using iNKORE.UI.WPF.Modern.Common.IconKeys;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace DMS.WPF.ViewModels;
 
@@ -209,4 +210,22 @@ public partial class DeviceDetailViewModel : ViewModelBase
             new NavigationParameter(nameof(VariableTableViewModel), SelectedVariableTable.Id,
                                     NavigationType.VariableTable));
     }
+
+    /// <summary>
+    /// 返回到设备列表页命令
+    /// </summary>
+    [RelayCommand]
+    private async Task NavigateToDevicesList()
+    {
+        try
+        {
+            // 导航到设备列表页面
+            var navigationService = App.Current.Services.GetRequiredService<INavigationService>();
+            await navigationService.NavigateToAsync(this, new NavigationParameter(nameof(DevicesViewModel), 0, NavigationType.Device));
+        }
+        catch (Exception ex)
+        {
+            _notificationService.ShowError($"导航到设备列表失败: {ex.Message}", ex);
+        }
+    }
 }
diff --git a/DMS.WPF/ViewModels/VariableTableViewModel.cs b/DMS.WPF/ViewModels/VariableTableViewModel.cs
index 20d99b4..d8f3798 100644
--- a/DMS.WPF/ViewModels/VariableTableViewModel.cs
+++ b/DMS.WPF/ViewModels/VariableTableViewModel.cs
@@ -744,6 +744,24 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
             new NavigationParameter(nameof(VariableHistoryViewModel), SelectedVariable.Id, NavigationType.Variable));
     }
 
+    /// <summary>
+    /// 返回到设备详情页命令
+    /// </summary>
+    [RelayCommand]
+    private async Task NavigateToDeviceDetail()
+    {
+        try
+        {
+            // 导航到设备详情页面
+            var navigationService = App.Current.Services.GetRequiredService<INavigationService>();
+            await navigationService.NavigateToAsync(this, new NavigationParameter(nameof(DeviceDetailViewModel), CurrentVariableTable.DeviceId, NavigationType.Device));
+        }
+        catch (Exception ex)
+        {
+            _notificationService.ShowError($"导航到设备详情失败: {ex.Message}", ex);
+        }
+    }
+
     /// <summary>
     /// 修改选定变量的历史记录设置。
     /// </summary>
diff --git a/DMS.WPF/Views/DeviceDetailView.xaml b/DMS.WPF/Views/DeviceDetailView.xaml
index 6a4f419..45f5e80 100644
--- a/DMS.WPF/Views/DeviceDetailView.xaml
+++ b/DMS.WPF/Views/DeviceDetailView.xaml
@@ -73,25 +73,49 @@
     </UserControl.Resources>
 
     <ikw:SimpleStackPanel Spacing="10">
-        <!-- Command Bar for Variable Tables -->
-        <ui:CommandBar Grid.Row="1" DefaultLabelPosition="Right" IsOpen="False" VerticalAlignment="Top">
-            <ui:AppBarButton Command="{Binding AddVariableTableCommand}" Label="添加变量表">
-                <ui:AppBarButton.Icon>
-                    <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Add}" />
-                </ui:AppBarButton.Icon>
-            </ui:AppBarButton>
-            <ui:AppBarButton Command="{Binding EditVariableTableCommand}" Label="编辑变量表">
-                <ui:AppBarButton.Icon>
-                    <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
-                </ui:AppBarButton.Icon>
-            </ui:AppBarButton>
-            <ui:AppBarButton Command="{Binding DeleteVariableTableCommand}" Label="删除变量表">
-                <ui:AppBarButton.Icon>
-                    <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Delete}" />
-                </ui:AppBarButton.Icon>
-            </ui:AppBarButton>
-            <!-- Add more variable table-specific commands here if needed -->
-        </ui:CommandBar>
+        <Border Margin="10" Padding="5">
+            
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                
+                <!-- 返回设备列表按钮 -->
+                <Button Grid.Column="0" 
+                        Command="{Binding NavigateToDevicesListCommand}"
+                        Style="{StaticResource ButtonDefault}"
+                        ToolTip="返回设备列表"
+                        Margin="0,0,10,0">
+                    <Button.Content>
+                        <StackPanel Orientation="Horizontal">
+                            <ui:FontIcon
+                                Icon="{x:Static ui:SegoeFluentIcons.ArrowLeft8}" />
+                        </StackPanel>
+                    </Button.Content>
+                </Button>
+                
+                <!-- Command Bar for Variable Tables -->
+                <ui:CommandBar Grid.Column="1" DefaultLabelPosition="Right" IsOpen="False" VerticalAlignment="Top">
+                    <ui:AppBarButton Command="{Binding AddVariableTableCommand}" Label="添加变量表">
+                        <ui:AppBarButton.Icon>
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Add}" />
+                        </ui:AppBarButton.Icon>
+                    </ui:AppBarButton>
+                    <ui:AppBarButton Command="{Binding EditVariableTableCommand}" Label="编辑变量表">
+                        <ui:AppBarButton.Icon>
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
+                        </ui:AppBarButton.Icon>
+                    </ui:AppBarButton>
+                    <ui:AppBarButton Command="{Binding DeleteVariableTableCommand}" Label="删除变量表">
+                        <ui:AppBarButton.Icon>
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Delete}" />
+                        </ui:AppBarButton.Icon>
+                    </ui:AppBarButton>
+                    <!-- Add more variable table-specific commands here if needed -->
+                </ui:CommandBar>
+            </Grid>
+        </Border>
         
             <!-- Device Details Section -->
             <StackPanel Grid.Row="0" Margin="10">
diff --git a/DMS.WPF/Views/MainView.xaml b/DMS.WPF/Views/MainView.xaml
index 862576b..77378f0 100644
--- a/DMS.WPF/Views/MainView.xaml
+++ b/DMS.WPF/Views/MainView.xaml
@@ -9,7 +9,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mo="clr-namespace:DMS.Core.Models;assembly=DMS.Core"
     xmlns:taskbarNotification="http://www.hardcodet.net/taskbar"
-    xmlns:tb="http://hardcodet.net/taskbar"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     xmlns:vm="clr-namespace:DMS.WPF.ViewModels"
     Title="设备管理系统"
@@ -57,7 +56,7 @@
         </taskbarNotification:TaskbarIcon>
         <ui:NavigationView
             AlwaysShowHeader="True"
-            ExpandedModeThresholdWidth="500"
+            ExpandedModeThresholdWidth="200"
             IsBackButtonVisible="Collapsed"
             IsBackEnabled="False"
             IsSettingsVisible="False"
diff --git a/DMS.WPF/Views/VariableHistoryView.xaml b/DMS.WPF/Views/VariableHistoryView.xaml
index e8f3b22..5d34530 100644
--- a/DMS.WPF/Views/VariableHistoryView.xaml
+++ b/DMS.WPF/Views/VariableHistoryView.xaml
@@ -34,14 +34,7 @@
     </UserControl.Resources>
 
     <DockPanel>
-        <Border DockPanel.Dock="Top" Background="White" BorderBrush="#E0E0E0" BorderThickness="1" CornerRadius="8" 
-                Margin="20,10" Padding="15">
-            <Border.Effect>
-                <DropShadowEffect ShadowDepth="2" 
-                                  BlurRadius="5" 
-                                  Opacity="0.1" 
-                                  Color="#888888"/>
-            </Border.Effect>
+        <Border DockPanel.Dock="Top" Margin="20,10" Padding="15">
             
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -51,10 +44,17 @@
                 
                 <!-- 返回变量表按钮 -->
                 <Button Grid.Column="0" 
-                        Content="返回变量表" 
                         Command="{Binding NavigateToVariableTableCommand}"
-                        Style="{StaticResource ButtonPrimary}"
-                        Margin="0,0,10,0"/>
+                        Style="{StaticResource ButtonDefault}"
+                        ToolTip="返回变量表"
+                        Margin="0,0,10,0">
+                    <Button.Content>
+                        <StackPanel Orientation="Horizontal">
+                            <ui:FontIcon
+                                Icon="{x:Static ui:SegoeFluentIcons.ArrowLeft8}" />
+                        </StackPanel>
+                    </Button.Content>
+                </Button>
                 
                 <!-- 操作菜单栏 -->
                 <ui:CommandBar Grid.Column="1" 
diff --git a/DMS.WPF/Views/VariableTableView.xaml b/DMS.WPF/Views/VariableTableView.xaml
index 9067ee3..456c144 100644
--- a/DMS.WPF/Views/VariableTableView.xaml
+++ b/DMS.WPF/Views/VariableTableView.xaml
@@ -41,12 +41,32 @@
 
     <DockPanel>
 
-        <ikw:SimpleStackPanel Margin="10" DockPanel.Dock="Top">
-            <!--  操作菜单  -->
-            <controls:CommandBar
-                x:Name="PrimaryCommandBar"
-                DefaultLabelPosition="Right"
-                IsOpen="False">
+        <ikw:SimpleStackPanel DockPanel.Dock="Top" Margin="10" >
+            <Grid >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                
+                <!-- 返回设备详情按钮 -->
+                <Button Grid.Column="0" 
+                        Command="{Binding NavigateToDeviceDetailCommand}"
+                        Style="{StaticResource ButtonDefault}"
+                        ToolTip="返回设备详情"
+                        Margin="0,0,10,0">
+                    <Button.Content>
+                        <StackPanel Orientation="Horizontal">
+                            <ui:FontIcon
+                                Icon="{x:Static ui:SegoeFluentIcons.ArrowLeft8}" />
+                        </StackPanel>
+                    </Button.Content>
+                </Button>
+                
+                <!--  操作菜单  -->
+                <controls:CommandBar Grid.Column="1"
+                    x:Name="PrimaryCommandBar"
+                    DefaultLabelPosition="Right"
+                    IsOpen="False">
                 <ui:AppBarButton Command="{Binding AddVariableCommand}" Label="添加变量">
                     <ui:AppBarButton.Icon>
                         <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Add}" />
@@ -98,7 +118,8 @@
                         Label="Settings" />
                 </ui:CommandBar.SecondaryCommands>
 
-            </controls:CommandBar>
+               </controls:CommandBar>
+           </Grid>
             <!--  变量表的名称描述等信息  -->
             <ikw:SimpleStackPanel
                 Margin="5"
@@ -127,9 +148,8 @@
                     Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" />
             </ikw:SimpleStackPanel>
 
-
+            
         </ikw:SimpleStackPanel>
-
         <DataGrid
             x:Name="BasicGridView"
             Margin="10"