From 364d287a2002d21d2f1c9e731cbd4c1c590dd72e Mon Sep 17 00:00:00 2001
From: "David P.G" <pgw1315@163.com>
Date: Wed, 30 Jul 2025 19:39:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DMS.WPF/Services/DataServices.cs                       | 5 +++++
 DMS.WPF/ViewModels/Items/VariableTableItemViewModel.cs | 3 +++
 DMS.WPF/ViewModels/VariableTableViewModel.cs           | 9 ---------
 DMS.WPF/Views/DeviceDetailView.xaml                    | 8 ++++----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/DMS.WPF/Services/DataServices.cs b/DMS.WPF/Services/DataServices.cs
index 598cc49..66fb517 100644
--- a/DMS.WPF/Services/DataServices.cs
+++ b/DMS.WPF/Services/DataServices.cs
@@ -367,6 +367,11 @@ public partial class DataServices : ObservableRecipient, IRecipient<LoadMessage>
             {
                 // 这是一个新变量表，添加到集合中
                 var newItem = _mapper.Map<VariableTableItemViewModel>(dto);
+                var device=Devices.FirstOrDefault(d=>d.Id==dto.DeviceId);
+                if (device!=null)
+                {
+                    newItem.Device=device;
+                }
                 VariableTables.Add(newItem);
             }
         }
diff --git a/DMS.WPF/ViewModels/Items/VariableTableItemViewModel.cs b/DMS.WPF/ViewModels/Items/VariableTableItemViewModel.cs
index 35d18bd..eef5fef 100644
--- a/DMS.WPF/ViewModels/Items/VariableTableItemViewModel.cs
+++ b/DMS.WPF/ViewModels/Items/VariableTableItemViewModel.cs
@@ -21,6 +21,9 @@ public partial class VariableTableItemViewModel : ObservableObject
 
     [ObservableProperty]
     private int _deviceId;
+    
+    [ObservableProperty]
+    private DeviceItemViewModel _device;
 
     [ObservableProperty]
     private ProtocolType _protocol;
diff --git a/DMS.WPF/ViewModels/VariableTableViewModel.cs b/DMS.WPF/ViewModels/VariableTableViewModel.cs
index 462fa9b..e1dd4b0 100644
--- a/DMS.WPF/ViewModels/VariableTableViewModel.cs
+++ b/DMS.WPF/ViewModels/VariableTableViewModel.cs
@@ -66,15 +66,6 @@ partial class VariableTableViewModel : ViewModelBase,INavigatable
     /// </summary>
     public bool IsLoadCompletion { get; set; } = false;
 
-    /// <summary>
-    /// 变量表数据仓库，用于与变量表相关的数据库操作。
-    /// </summary>
-    // private readonly VarTableRepository _varTableRepository;
-    //
-    // /// <summary>
-    // /// 变量数据仓库，用于与变量数据相关的数据库操作。
-    // /// </summary>
-    // private readonly VarDataRepository _varDataRepository;
 
     /// <summary>
     /// 原始变量数据的深拷贝备份，用于在用户取消保存时还原数据。
diff --git a/DMS.WPF/Views/DeviceDetailView.xaml b/DMS.WPF/Views/DeviceDetailView.xaml
index 3e76c56..6a4f419 100644
--- a/DMS.WPF/Views/DeviceDetailView.xaml
+++ b/DMS.WPF/Views/DeviceDetailView.xaml
@@ -63,7 +63,7 @@
                                          FontSize="14" />
                             <TextBlock>
                                 <Run Text="协议: " />
-                                <Run Text="{Binding ProtocolType}" />
+                                <Run Text="{Binding Protocol}" />
                             </TextBlock>
                         </StackPanel>
                     </StackPanel>
@@ -101,9 +101,9 @@
                     <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Connect}" VerticalAlignment="Center" Margin="0,0,8,0" FontSize="16" />
                     <TextBlock>
                         <Run Text="IP: " />
-                        <Run Text="{Binding CurrentDevice.Ip}" />
+                        <Run Text="{Binding CurrentDevice.IpAddress}" />
                         <Run Text=" Port: " />
-                        <Run Text="{Binding CurrentDevice.Prot}" />
+                        <Run Text="{Binding CurrentDevice.Port}" />
                     </TextBlock>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="0,2">
@@ -112,7 +112,7 @@
                         <Run Text="设备类型: " />
                         <Run Text="{Binding CurrentDevice.DeviceType}" />
                         <Run Text=" 协议类型: " />
-                        <Run Text="{Binding CurrentDevice.ProtocolType}" />
+                        <Run Text="{Binding CurrentDevice.Protocol}" />
                     </TextBlock>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="0,2">