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

变量的更改

Browse Source
This commit is contained in:
Tyrone CT
2025-07-04 22:16:28 +08:00
parent 61035aaf2e
commit f703e18523
28 changed files with 3758 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CapMachine.Wpf/ViewModels/DialogChartRtConfigViewModel.cs
View File

@@ -84,7 +84,7 @@ namespace CapMachine.Wpf.ViewModels
/// </summary>
private void LoadChartSourceData()
{
foreach (var item in MachineRtDataService.TagManger.DicTags)
foreach (var item in MachineRtDataService.TagManger.DicTags.OrderBy(a => a.Value.Id))
{
ChartSrcDataListViewItems.Add(new ChartSrcData()
{

2
CapMachine.Wpf/ViewModels/DialogHistoryChartRtConfigViewModel.cs
View File

@@ -82,7 +82,7 @@ namespace CapMachine.Wpf.ViewModels
/// </summary>
private void LoadChartSourceData()
{
foreach (var item in MachineRtDataService.TagManger.DicTags)
foreach (var item in MachineRtDataService.TagManger.DicTags.OrderBy(a => a.Value.Id))
{
ChartSrcDataListViewItems.Add(new ChartSrcData()
{

4
CapMachine.Wpf/ViewModels/MonitorViewModel.cs
View File

@@ -47,8 +47,8 @@ namespace CapMachine.Wpf.ViewModels
//赋值实例化
ListHandSwitchData = MachineRtDataService.ListHandSwitchData;
ListTag = new ObservableCollection<ITag>(TagManager.DicTags.Values.ToList());
ListMeterTag = TagManager.DicTags.Values.Where(a => a.IsMeter == true).ToList();
ListTag = new ObservableCollection<ITag>(TagManager.DicTags.Values.OrderBy(a => a.Id).ToList());
ListMeterTag = TagManager.DicTags.Values.OrderBy(a=>a.Id).Take(11).ToList();
SpeedTag = TagManager.DicTags.GetValueOrDefault("转速[rpm]");
ExPressTag = TagManager.DicTags.GetValueOrDefault("排气压力[BarA]");