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-06-30 22:03:49 +08:00
parent a1de03a94e
commit 5e0c530187
9 changed files with 171 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Views/DevicesView.xaml.cs
View File

@@ -1,6 +1,9 @@
using System.Windows;
using System.Windows.Controls;
using iNKORE.UI.WPF.Modern.Controls;
using Microsoft.Extensions.DependencyInjection;
using PMSWPF.Services;
using PMSWPF.ViewModels;
namespace PMSWPF.Views;
@@ -9,6 +12,7 @@ public partial class DevicesView : UserControl
public DevicesView()
{
InitializeComponent();
DataContext=App.Current.Services.GetRequiredService<DevicesViewModel>();
}
private void BasicGridView_ItemClick(object sender, ItemClickEventArgs e)

60
Views/MainView.xaml.cs
View File

@@ -68,34 +68,34 @@ public partial class MainView : Window
_viewModel.OnLoaded();
}
private void NavigationView_OnItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args)
{
ViewModelBase navgateVM = App.Current.Services.GetRequiredService<HomeViewModel>();
switch (args.InvokedItem)
{
case "主页":
// mainViewModel.NavgateTo<HomeViewModel>();
navgateVM = App.Current.Services.GetRequiredService<HomeViewModel>();
_logger.LogInformation("导航到到主页面");
break;
case "设备":
navgateVM = App.Current.Services.GetRequiredService<DevicesViewModel>();
// mainViewModel.NavgateTo<DevicesViewModel>();
_logger.LogInformation("导航到到设备页面");
break;
case "数据转换":
navgateVM = App.Current.Services.GetRequiredService<DataTransformViewModel>();
// mainViewModel.NavgateTo<DataTransformViewModel>();
_logger.LogInformation("导航到到数据转换页面");
break;
case "设置":
// mainViewModel.NavgateTo<SettingViewModel>();
navgateVM = App.Current.Services.GetRequiredService<SettingViewModel>();
_logger.LogInformation("导航到到设备页面");
break;
}
MessageHelper.SendNavgatorMessage(navgateVM);
}
// private void NavigationView_OnItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args)
// {
// ViewModelBase navgateVM = App.Current.Services.GetRequiredService<HomeViewModel>();
//
// switch (args.InvokedItem)
// {
// case "主页":
// // mainViewModel.NavgateTo<HomeViewModel>();
// navgateVM = App.Current.Services.GetRequiredService<HomeViewModel>();
// _logger.LogInformation("导航到到主页面");
// break;
// case "设备":
// navgateVM = App.Current.Services.GetRequiredService<DevicesViewModel>();
// // mainViewModel.NavgateTo<DevicesViewModel>();
// _logger.LogInformation("导航到到设备页面");
// break;
// case "数据转换":
// navgateVM = App.Current.Services.GetRequiredService<DataTransformViewModel>();
// // mainViewModel.NavgateTo<DataTransformViewModel>();
// _logger.LogInformation("导航到到数据转换页面");
// break;
// case "设置":
// // mainViewModel.NavgateTo<SettingViewModel>();
// navgateVM = App.Current.Services.GetRequiredService<SettingViewModel>();
// _logger.LogInformation("导航到到设备页面");
// break;
// }
//
// MessageHelper.SendNavgatorMessage(navgateVM);
// }
}