TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更改了CAN和LIN的标志着色问题

Browse Source 
保存图片触发两次
CANLIN的一些数据回读到PLC
This commit is contained in:
Tyrone CT
2025-01-12 15:32:02 +08:00
parent e49a48fb25
commit 914a8b3dbc
15 changed files with 333 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CapMachine.Wpf/ViewModels/HistoryDataViewModel.cs
View File

@@ -40,6 +40,7 @@ namespace CapMachine.Wpf.ViewModels
public IFreeSql FreeSql { get; }
public IEventAggregator EventAggregator { get; }
public IMapper Mapper { get; }
public ConfigService ConfigService { get; }
public ILogService Logger { get; }
/// <summary>
@@ -50,13 +51,13 @@ namespace CapMachine.Wpf.ViewModels
/// <param name="eventAggregator"></param>
/// <param name="mapper"></param>
/// <param name="logger"></param>
public HistoryDataViewModel(IDialogService dialogService, IFreeSql freeSql, IEventAggregator eventAggregator, IMapper mapper)
public HistoryDataViewModel(IDialogService dialogService, IFreeSql freeSql, IEventAggregator eventAggregator, IMapper mapper,ConfigService configService)
{
DialogService = dialogService;
FreeSql = freeSql;
EventAggregator = eventAggregator;
Mapper = mapper;
ConfigService = configService;
ListChartTabGroupDto = Mapper.Map<List<ChartTabGroupDto>>(FreeSql.Select<HistoryChartTabGroup>().Where(a => a.IsEnable == true).ToList());
@@ -948,6 +949,8 @@ namespace CapMachine.Wpf.ViewModels
EventAggregator.GetEvent<HistoryChartSetEvent>().Publish(new ChartSetMsg() { Machine = CurSelectedMachine, GroupTabIndex = SeletedGroupTabIndex, ChartSetInfo = "游标放大" });
break;
case "保存照片":
//临时的屏蔽状态
ConfigService.ChartSavePageTempState = true;
//Chart操作
EventAggregator.GetEvent<HistoryChartSetEvent>().Publish(new ChartSetMsg() { Machine = CurSelectedMachine, GroupTabIndex = SeletedGroupTabIndex, ChartSetInfo = "保存照片" });
break;