xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复一些错误

Browse Source
This commit is contained in:
David P.G
2025-07-30 19:39:07 +08:00
parent d4fb542770
commit 364d287a20
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DMS.WPF/Services/DataServices.cs
View File

@@ -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);
}
}

3
DMS.WPF/ViewModels/Items/VariableTableItemViewModel.cs
View File

@@ -22,6 +22,9 @@ public partial class VariableTableItemViewModel : ObservableObject
[ObservableProperty]
private int _deviceId;
[ObservableProperty]
private DeviceItemViewModel _device;
[ObservableProperty]
private ProtocolType _protocol;

9
DMS.WPF/ViewModels/VariableTableViewModel.cs
View File

@@ -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>
/// 原始变量数据的深拷贝备份，用于在用户取消保存时还原数据。

8
DMS.WPF/Views/DeviceDetailView.xaml
View File

@@ -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">