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-29 20:02:09 +08:00
parent 61807bfc65
commit 3b5ecef895
8 changed files with 95 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
DMS.WPF/ViewModels/DevicesViewModel.cs
View File

@@ -60,18 +60,6 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
DataServices.OnDeviceListChanged += (devices) => { };
}
// public override void OnLoaded()
// {
// if (_dataServices.Devices!=null && _dataServices.Devices.Count>0)
// {
// Devices=new ObservableCollection<Device>(_dataServices.Devices);
// foreach (var device in Devices)
// {
// device.OnDeviceIsActiveChanged += HandleDeviceIsActiveChanged;
//
// }
// }
// }
public override Task<bool> OnExitAsync()
{
@@ -86,19 +74,6 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
return Task.FromResult(true);
}
private async void HandleDeviceIsActiveChanged(Device device, bool isActive)
{
// try
// {
// await _deviceRepository.UpdateAsync(device);
// NotificationHelper.ShowSuccess($"设备 {device.Name} 的激活状态已更新。");
// }
// catch (Exception ex)
// {
// NotificationHelper.ShowError($"更新设备 {device.Name} 激活状态失败: {ex.Message}", ex);
// }
}
/// <summary>
/// 添加设备命令。
/// </summary>
@@ -107,8 +82,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
{
try
{
DeviceItemViewModel deviceItemViewModel = new DeviceItemViewModel();
DeviceDialogViewModel deviceDialogViewModel = new DeviceDialogViewModel(deviceItemViewModel)
DeviceDialogViewModel deviceDialogViewModel = new DeviceDialogViewModel()
{
PrimaryButContent = "添加设备"
};
@@ -208,31 +182,42 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
[RelayCommand]
public async void EditDevice()
{
// try
// {
// if (SelectedDevice == null)
// {
// NotificationHelper.ShowError("你没有选择任何设备，请选择设备后再点击编辑设备");
// return;
// }
//
// var editDievce = await _dialogService.ShowEditDeviceDialog(SelectedDevice);
// if (editDievce != null)
// {
// // 更新菜单
// var res = await _deviceRepository.UpdateAsync(editDievce);
// var menu = DataServicesHelper.FindMenusForDevice(editDievce, _dataServices.MenuTrees);
// if (menu != null)
// await _menuRepository.UpdateAsync(menu);
//
// MessageHelper.SendLoadMessage(LoadTypes.Menu);
// MessageHelper.SendLoadMessage(LoadTypes.Devices);
// }
// }
// catch (Exception e)
// {
// NotificationHelper.ShowError($"编辑设备的过程中发生错误：{e.Message}", e);
// }
try
{
if (SelectedDevice == null)
{
NotificationHelper.ShowError("你没有选择任何设备，请选择设备后再点击编辑设备");
return;
}
DeviceDialogViewModel deviceDialogViewModel = new DeviceDialogViewModel(SelectedDevice)
{
PrimaryButContent = "编辑设备"
};
// 1. 显示设备对话框
DeviceItemViewModel device = await _dialogService.ShowDialogAsync(deviceDialogViewModel);
// 如果用户取消或对话框未返回设备，则直接返回
if (device == null)
{
return;
}
int res = await _deviceAppService.UpdateDeviceAsync(_mapper.Map<DeviceDto>(device));
if (res > 0)
{
var menu = DataServices.Menus.FirstOrDefault(m =>
m.MenuType == MenuType.DeviceMenu &&
m.TargetId == device.Id);
if (menu!=null)
{
menu.Header=device.Name;
}
}
}
catch (Exception e)
{
NotificationHelper.ShowError($"编辑设备的过程中发生错误：{e.Message}", e);
}
}
[RelayCommand]

18
DMS.WPF/ViewModels/Dialogs/DeviceDialogViewModel.cs
View File

@@ -7,15 +7,25 @@ namespace DMS.WPF.ViewModels.Dialogs;
public partial class DeviceDialogViewModel : DialogViewModelBase<DeviceItemViewModel>
{
[ObservableProperty]
private bool _isAddMode;
[ObservableProperty]
private DeviceItemViewModel _device;
public DeviceDialogViewModel(DeviceItemViewModel device)
public DeviceDialogViewModel(DeviceItemViewModel device=null)
{
_device = device;
if (device==null)
{
_device = new DeviceItemViewModel();
IsAddMode=true;
}
else
{
_device=device;
}
}
[RelayCommand]

8
DMS.WPF/Views/Dialogs/DeviceDialog.xaml
View File

@@ -65,7 +65,9 @@
<TextBlock Text="设备类型"
HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" />
<ComboBox SelectedItem="{Binding Device.DeviceType}"
<ComboBox
IsEnabled="{Binding IsAddMode}"
SelectedItem="{Binding Device.DeviceType}"
ItemsSource="{Binding Source={StaticResource deviceType} }">
<ComboBox.ItemTemplate>
<DataTemplate>
@@ -102,7 +104,9 @@
<TextBlock Text="设备通信协议"
HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" />
<ComboBox x:Name="ProtocolComboBox" SelectedItem="{Binding Device.Protocol}"
<ComboBox x:Name="ProtocolComboBox"
IsEnabled="{Binding IsAddMode}"
SelectedItem="{Binding Device.Protocol}"
ItemsSource="{Binding Source={StaticResource protocolType} }">
<ComboBox.ItemTemplate>
<DataTemplate>