|
@@ -54,11 +54,14 @@ namespace CyberX8_MainPages.ViewModels
|
|
|
/// 是否为调速泵
|
|
|
/// </summary>
|
|
|
private bool _isRegulatePump;
|
|
|
-
|
|
|
/// <summary>
|
|
|
/// 泵速
|
|
|
/// </summary>
|
|
|
private int _pumpSpeed;
|
|
|
+ /// <summary>
|
|
|
+ /// 是否配备CMM
|
|
|
+ /// </summary>
|
|
|
+ private bool _isCMMConfig;
|
|
|
private double _avgLevel;
|
|
|
/// <summary>
|
|
|
/// Module
|
|
@@ -558,9 +561,17 @@ namespace CyberX8_MainPages.ViewModels
|
|
|
set { SetProperty(ref _recipeType, value); }
|
|
|
}
|
|
|
#endregion
|
|
|
-
|
|
|
+
|
|
|
#region CMM
|
|
|
/// <summary>
|
|
|
+ /// 是否配备CMM
|
|
|
+ /// </summary>
|
|
|
+ public bool IsCMMConfig
|
|
|
+ {
|
|
|
+ get { return _isCMMConfig; }
|
|
|
+ set { SetProperty(ref _isCMMConfig, value); }
|
|
|
+ }
|
|
|
+ /// <summary>
|
|
|
/// Flow High 状态(Warning:黄色,Error:红色)
|
|
|
/// </summary>
|
|
|
public string FlowHighStatus
|
|
@@ -779,6 +790,7 @@ namespace CyberX8_MainPages.ViewModels
|
|
|
_rtDataKeys.Add($"{Module}.ReservoirUsage");
|
|
|
_rtDataKeys.Add($"{Module}.PumpSpeed");
|
|
|
_rtDataKeys.Add($"{Module}.IsRegulatePump");
|
|
|
+ _rtDataKeys.Add($"{Module}.IsCMMConfig");
|
|
|
if (_timer == null)
|
|
|
{
|
|
|
_timer = new DispatcherTimer();
|
|
@@ -987,6 +999,7 @@ namespace CyberX8_MainPages.ViewModels
|
|
|
_rtDataValueDic = QueryDataClient.Instance.Service.PollData(_rtDataKeys);
|
|
|
if (_rtDataValueDic != null)
|
|
|
{
|
|
|
+ IsCMMConfig = CommonFunction.GetValue<bool>(_rtDataValueDic, $"{Module}.IsCMMConfig");
|
|
|
IsRegulatePump = CommonFunction.GetValue<bool>(_rtDataValueDic, $"{Module}.IsRegulatePump");
|
|
|
PumpSpeed = CommonFunction.GetValue<int>(_rtDataValueDic, $"{Module}.PumpSpeed");
|
|
|
ReservoirsPersistent = CommonFunction.GetValue<ReservoirsPersistentValue>(_rtDataValueDic, $"{Module}.PersistentValue");
|