提交了仪表的模型

This commit is contained in:
2024-07-28 22:59:11 +08:00
parent c9f4e88e04
commit a76546ebe6
59 changed files with 3273 additions and 586 deletions

View File

@@ -1,6 +1,11 @@
using CapMachine.Core;
using CapMachine.Model;
using CapMachine.Wpf.PrismEvent;
using CapMachine.Wpf.Views;
using MaterialDesignThemes.Wpf;
using Prism.Commands;
using Prism.Events;
using Prism.Regions;
using Prism.Services.Dialogs;
using System.Collections.ObjectModel;
using System.Text;
@@ -10,10 +15,13 @@ namespace CapMachine.Wpf.ViewModels
{
public class ProConfigViewModel : NavigationViewModel
{
public ProConfigViewModel(IDialogService dialogService, IFreeSql freeSql)
public ProConfigViewModel(IDialogService dialogService, IFreeSql freeSql,IEventAggregator eventAggregator, IRegionManager regionManager)
{
//LogService = logService;
FreeSql = freeSql;
EventAggregator = eventAggregator;
RegionManager = regionManager;
//MachineDataService = machineDataService;
DialogService = dialogService;
@@ -29,12 +37,16 @@ namespace CapMachine.Wpf.ViewModels
//各个单独仪表的初始化
SelectedMeterSpeed = new MeterSpeed();
SelectedPs = new MeterPs();
}
/// <summary>
/// FreeSQL 实例函数
/// </summary>
public IFreeSql FreeSql { get; }
public IEventAggregator EventAggregator { get; }
public IRegionManager RegionManager { get; }
/// <summary>
/// 弹窗服务
@@ -276,6 +288,37 @@ namespace CapMachine.Wpf.ViewModels
#endregion
private DelegateCommand _ProStepPsCmd;
/// <summary>
/// 新增PS命令
/// </summary>
public DelegateCommand ProStepPsCmd
{
set
{
_ProStepPsCmd = value;
}
get
{
if (_ProStepPsCmd == null)
{
_ProStepPsCmd = new DelegateCommand(() => ProStepPsCmdCmdMethod());
}
return _ProStepPsCmd;
}
}
private void ProStepPsCmdCmdMethod()
{
//var openDrawerCommand = MaterialDesignThemes.Wpf.DrawerHost.OpenDrawerCommand;
RegionManager.RequestNavigate("ProStepDrawerContentRegion", nameof(ProStepConfigPsView));
//EventAggregator.GetEvent<ProStepDrawerEvent>().Publish("Right");
}
#region Ps表
private ObservableCollection<MeterPs> _ListMeterPsItems;