增加了初始弹窗,但是没有成功

更改了CAN和LIN协调
更改了配置程序的名称顺序
This commit is contained in:
2025-01-11 12:04:34 +08:00
parent 620c5e8178
commit e49a48fb25
53 changed files with 5118 additions and 131 deletions

View File

@@ -1,9 +1,12 @@
using CapMachine.Model;
using CapMachine.Model.CANLIN;
using CapMachine.Wpf.Dtos;
using CapMachine.Wpf.Models;
using CapMachine.Wpf.PrismEvent;
using Prism.Events;
using Prism.Mvvm;
using Prism.Services.Dialogs;
using static CapMachine.Wpf.Models.ComEnum;
namespace CapMachine.Wpf.Services
{
@@ -18,10 +21,10 @@ namespace CapMachine.Wpf.Services
CurUserDto = new UserDto();
EventAggregator = eventAggregator;
DialogService = dialogService;
}
/// <summary>
/// Csv文件锁
@@ -65,6 +68,31 @@ namespace CapMachine.Wpf.Services
/// </summary>
public int ChartRtDataCacheTimeSec { get; set; } = 3600_8;
/// <summary>
/// CAN和LIN的运行状态模型
/// </summary>
public CanLinRunStateModel CanLinRunStateModel { get; set; } = new CanLinRunStateModel();
private int _PlcCycleTime;
/// <summary>
/// PLC循环时间
/// </summary>
public int PlcCycleTime
{
get { return _PlcCycleTime; }
set
{
if (value!= _PlcCycleTime)
{
_PlcCycleTime = value;
RaisePropertyChanged();
}
}
}
private HistoryExp _CurExpInfo;
/// <summary>
@@ -109,7 +137,7 @@ namespace CapMachine.Wpf.Services
public PPCService PPCService { get; }
public IDialogService DialogService { get; }