|
|
@@ -287,7 +287,15 @@ namespace TeamAAS_VP.Core
|
|
|
get { return _ProductList; }
|
|
|
set { SetProperty(ref _ProductList, value); }
|
|
|
}
|
|
|
-
|
|
|
+ /// <summary>
|
|
|
+ /// 设备状态
|
|
|
+ /// </summary>
|
|
|
+ private RunDisplayMode _CurrentDisplayMode;
|
|
|
+ public RunDisplayMode CurrentDisplayMode
|
|
|
+ {
|
|
|
+ get { return _CurrentDisplayMode; }
|
|
|
+ set { SetProperty(ref _CurrentDisplayMode, value); }
|
|
|
+ }
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
@@ -2671,9 +2679,7 @@ namespace TeamAAS_VP.Core
|
|
|
}
|
|
|
if (state)
|
|
|
{
|
|
|
- ClearModeBackground = System.Windows.Media.Brushes.White;
|
|
|
- RunModelBackground = System.Windows.Media.Brushes.White;
|
|
|
- ManualModeBackground = System.Windows.Media.Brushes.Orange;
|
|
|
+ CurrentDisplayMode = RunDisplayMode.Manual;
|
|
|
SendTaskMessage("收到切换成维修模式", MessageLevel.Info);
|
|
|
}
|
|
|
}
|
|
|
@@ -2693,9 +2699,7 @@ namespace TeamAAS_VP.Core
|
|
|
}
|
|
|
if (state)
|
|
|
{
|
|
|
- ClearModeBackground = System.Windows.Media.Brushes.Yellow;
|
|
|
- RunModelBackground = System.Windows.Media.Brushes.White;
|
|
|
- ManualModeBackground = System.Windows.Media.Brushes.White;
|
|
|
+ CurrentDisplayMode = RunDisplayMode.Clear;
|
|
|
SendTaskMessage("收到切换成流线模式", MessageLevel.Info);
|
|
|
}
|
|
|
}
|
|
|
@@ -4104,16 +4108,12 @@ namespace TeamAAS_VP.Core
|
|
|
var curUser = _systemDatabaseService.GetCurrentUser();
|
|
|
if (connectStaus && mesStatus && _LastAutoRunning && curUser.userPart == UserPart.Operator)
|
|
|
{
|
|
|
- RunModelBackground = System.Windows.Media.Brushes.Green;
|
|
|
- ClearModeBackground = System.Windows.Media.Brushes.White;
|
|
|
- ManualModeBackground = System.Windows.Media.Brushes.White;
|
|
|
+ CurrentDisplayMode = RunDisplayMode.Auto;
|
|
|
SendTaskMessage("当前为运行模式", MessageLevel.Info);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- RunModelBackground = System.Windows.Media.Brushes.White;
|
|
|
- ClearModeBackground = System.Windows.Media.Brushes.White;
|
|
|
- ManualModeBackground = System.Windows.Media.Brushes.Orange;
|
|
|
+ CurrentDisplayMode = RunDisplayMode.Manual;
|
|
|
SendTaskMessage("当前为调机模式", MessageLevel.Info);
|
|
|
}
|
|
|
concurrenty = true;
|