SV2功能增加
一些功能的修复
This commit is contained in:
@@ -54,7 +54,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
//ListTag = new ObservableCollection<ITag>(TagManager.DicTags.Values.ToList());
|
||||
RefreshListTag();
|
||||
|
||||
ListMeterTag = TagManager.DicTags.Values.Where(a => a.Group == "程序").OrderBy(a=>a.Id).ToList();
|
||||
ListMeterTag = TagManager.DicTags.Values.Where(a => a.Group == "程序").OrderBy(a => a.Id).ToList();
|
||||
|
||||
SpeedTag = TagManager.DicTags.GetValueOrDefault("转速[rpm]");
|
||||
ExPressTag = TagManager.DicTags.GetValueOrDefault("排气压力[BarA]");
|
||||
@@ -454,6 +454,62 @@ namespace CapMachine.Wpf.ViewModels
|
||||
|
||||
}
|
||||
|
||||
|
||||
private DelegateCommand<object> _ExdCmd;
|
||||
/// <summary>
|
||||
/// 拓展操作指令
|
||||
/// </summary>
|
||||
public DelegateCommand<object> ExdCmd
|
||||
{
|
||||
set
|
||||
{
|
||||
_ExdCmd = value;
|
||||
}
|
||||
get
|
||||
{
|
||||
if (_ExdCmd == null)
|
||||
{
|
||||
_ExdCmd = new DelegateCommand<object>((p) => ExdCmdCall(p));
|
||||
}
|
||||
return _ExdCmd;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 操作指令执行方法
|
||||
/// </summary>
|
||||
/// <exception cref="NotImplementedException"></exception>
|
||||
private void ExdCmdCall(object Par)
|
||||
{
|
||||
if (Par != null && Par is Meter)
|
||||
{
|
||||
//
|
||||
var MeterControl = (Meter)Par;
|
||||
//Console.WriteLine($"{MeterControl.MeterName}-{MeterControl.AutoHandState}");
|
||||
//弹窗
|
||||
DialogService.ShowDialog("DialogMeterExdView", new DialogParameters() { { "MeterCmdMsg", new MeterCmdMsg() {Name= MeterControl.MeterName,Par="SV2" } } }, (par) =>
|
||||
{
|
||||
if (par.Result == ButtonResult.OK)
|
||||
{
|
||||
//试验信息
|
||||
var ListChartTabGroupDto = par.Parameters.GetValue<ExpInfoDto>("ReturnValue");
|
||||
|
||||
|
||||
}
|
||||
else if (par.Result == ButtonResult.Cancel)
|
||||
{
|
||||
//取消
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private DelegateCommand<object> _HandValueCmd;
|
||||
/// <summary>
|
||||
/// 手动给值
|
||||
|
||||
Reference in New Issue
Block a user