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-01-03 09:11:02 +08:00
parent 6ff9103fa2
commit 3a5674054d
10 changed files with 408 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,9 @@ namespace CapMachine.Wpf.ViewModels
TagManager = MachineRtDataService.TagManger;
_EventAggregator.GetEvent<ChartRtEvent>().Subscribe(GetChartRtEvent);
//赋值实例化
ListHandSwitchData = MachineRtDataService.ListHandSwitchData;
ListTag = new ObservableCollection<ITag>(TagManager.DicTags.Values.ToList());
ListMeterTag = TagManager.DicTags.Values.Where(a => a.IsMeter == true).ToList();
@@ -57,28 +60,7 @@ namespace CapMachine.Wpf.ViewModels
Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]");
CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]");
ListHandSwitchData = new ObservableCollection<HandSwitchData>()
{
new HandSwitchData(){Name="自动",ActionAddress="M0.0",StateAddress="M0.0" },
new HandSwitchData(){Name="抽真空",ActionAddress="M0.1",StateAddress="M0.1" },
new HandSwitchData(){Name="复位",ActionAddress="M0.2",StateAddress="M0.2" },
new HandSwitchData(){Name="消音",ActionAddress="M0.3",StateAddress="M0.3" },
new HandSwitchData(){Name="HV电源",ActionAddress="M1.1",StateAddress="Q0.1" },
new HandSwitchData(){Name="HV启动",ActionAddress="M1.2",StateAddress="Q0.6" },
new HandSwitchData(){Name="LV电源",ActionAddress="M1.3",StateAddress="Q0.2" },
new HandSwitchData(){Name="水泵",ActionAddress="M1.4",StateAddress="Q0.3" },
new HandSwitchData(){Name="冷凝器电加热",ActionAddress="M1.5",StateAddress="Q0.4" },
new HandSwitchData(){Name="吸气混合器电加热",ActionAddress="M1.6",StateAddress="Q0.5" },
new HandSwitchData(){Name="吸排气球阀",ActionAddress="M1.7",StateAddress="Q0.7" },
new HandSwitchData(){Name="试验箱",ActionAddress="M2.0",StateAddress="VW32" },
new HandSwitchData(){Name="水SEV1",ActionAddress="M2.1",StateAddress="Q1.0" },
new HandSwitchData(){Name="水SEV2",ActionAddress="M2.2",StateAddress="Q1.1" },
new HandSwitchData(){Name="HCV1",ActionAddress="M2.3",StateAddress="Q1.2" },
new HandSwitchData(){Name="HCV2",ActionAddress="M2.4",StateAddress="Q1.3" },
new HandSwitchData(){Name="ECV1",ActionAddress="M2.5",StateAddress="Q1.4" },
new HandSwitchData(){Name="ECV2",ActionAddress="M2.6",StateAddress="Q1.5" },
new HandSwitchData(){Name="使能",ActionAddress="M2.7",StateAddress="V15.1" },
};
}
public ConfigService ConfigService { get; }
@@ -121,18 +103,22 @@ namespace CapMachine.Wpf.ViewModels
/// </summary>
public TagManager TagManager { get; set; }
//// <summary>
///// 手自动切换集合数据
///// </summary>
public List<HandSwitchData> ListHandSwitchData { get; set; }
private ObservableCollection<HandSwitchData> _ListHandSwitchData;
// <summary>
/// 手自动切换集合数据
/// <summary>
/// 复位标签
/// </summary>
public ObservableCollection<HandSwitchData> ListHandSwitchData
{
get { return _ListHandSwitchData; }
set { _ListHandSwitchData = value; RaisePropertyChanged(); }
}
public HandSwitchData ResetTag { get; set; }
/// <summary>
/// 消音标签
/// </summary>
public HandSwitchData MuteTag { get; set; }
#region 工艺图数据
/// <summary>
@@ -230,19 +216,29 @@ namespace CapMachine.Wpf.ViewModels
switch (Par)
{
case "开始":
MachineRtDataService.SysStart();
this.SysRunServer.MachineRunState1.FireStart();
DataRecordService.StartRecord();
break;
case "结束":
MachineRtDataService.SysEnd();
this.SysRunServer.MachineRunState1.FireEnd();
DataRecordService.EndRecord();
break;
case "复位":
MachineRtDataService.SysReset();
this.SysRunServer.MachineRunState1.FireReset();
DataRecordService.EndRecord();
break;
case "消音":
MachineRtDataService.SysMute();
//ShowDialogExpInfo();
break;
case "试验信息":
@@ -292,7 +288,7 @@ namespace CapMachine.Wpf.ViewModels
{
if (!string.IsNullOrEmpty(item.Value.AutoHandSwitchAddress))
{
var Result = MachineRtDataService.SiemensDrive.Write(item.Value.AutoHandSwitchAddress, MeterControl.AutoHandState==true?1:0);
var Result = MachineRtDataService.SiemensDrive.Write(item.Value.AutoHandSwitchAddress, MeterControl.AutoHandState == true ? (short)1 : (short)0);
}
break;
}
@@ -341,7 +337,7 @@ namespace CapMachine.Wpf.ViewModels
case "MV":
if (!string.IsNullOrEmpty(item.Value.MVAddress))
{
var Result = MachineRtDataService.SiemensDrive.Write(item.Value.MVAddress, (short)((double)ChannelValue.Value* item.Value.Precision));
var Result = MachineRtDataService.SiemensDrive.Write(item.Value.MVAddress, (short)((double)ChannelValue.Value));
break;
}
break;
@@ -355,7 +351,7 @@ namespace CapMachine.Wpf.ViewModels
default:
break;
}
}
}
}
@@ -411,7 +407,11 @@ namespace CapMachine.Wpf.ViewModels
{
//ToDo
Console.WriteLine($"{FindData.Name}-{FindData.ActionAddress}-{FindData.StateAddress}-{Data}");
var Result = MachineRtDataService.SiemensDrive.Write(FindData.ActionAddress, true);
var Result = MachineRtDataService.SiemensDrive.Write(FindData.ActionAddress, (bool)Data);
if (Result.IsSuccess)
{
}
//FindData.State = false;
}
}