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 { // 这是一个新变量表,添加到集合中 var newItem = _mapper.Map(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 /// public bool IsLoadCompletion { get; set; } = false; - /// - /// 变量表数据仓库,用于与变量表相关的数据库操作。 - /// - // private readonly VarTableRepository _varTableRepository; - // - // /// - // /// 变量数据仓库,用于与变量数据相关的数据库操作。 - // /// - // private readonly VarDataRepository _varDataRepository; /// /// 原始变量数据的深拷贝备份,用于在用户取消保存时还原数据。 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" /> - + @@ -101,9 +101,9 @@ - + - + @@ -112,7 +112,7 @@ - +