diff --git a/SlnMesnac.WPF/MainWindow.xaml b/SlnMesnac.WPF/MainWindow.xaml
index 87adc8c..469652e 100644
--- a/SlnMesnac.WPF/MainWindow.xaml
+++ b/SlnMesnac.WPF/MainWindow.xaml
@@ -30,9 +30,16 @@
-
+
+
+
+
+
+
+
+
-
+
diff --git a/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs b/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
index dca08c9..5730916 100644
--- a/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
@@ -18,6 +18,7 @@ using System.Threading;
using System.Threading.Tasks;
using System.Timers;
using System.Windows;
+using System.Windows.Threading;
namespace SlnMesnac.WPF.ViewModel
{
@@ -33,10 +34,46 @@ namespace SlnMesnac.WPF.ViewModel
private readonly BaseConfigInfoPage configInfoPage = new BaseConfigInfoPage();
private readonly RecipeManagePage recipeManagePage = new RecipeManagePage();
private readonly AgvAndTaskMonitorPage agvAndTaskMonitorPage = new AgvAndTaskMonitorPage();
- private System.Timers.Timer timer = new System.Timers.Timer(1000*5);
+ private System.Timers.Timer timer = new System.Timers.Timer(1000 * 5);
PlcAbsractFactory? plc = null;
private BaseBusiness? baseBusiness = null;
#region 参数定义
+
+ private string _time;
+ public string Time
+ {
+ get { return _time; }
+ set
+ {
+ _time = value;
+ RaisePropertyChanged(nameof(Time));
+ }
+ }
+
+ private string _Date;
+ public string Date
+ {
+ get { return _Date; }
+ set
+ {
+ _Date = value;
+ RaisePropertyChanged(nameof(Date));
+ }
+ }
+
+ private string _PageName;
+ public string PageName
+ {
+ get { return _PageName; }
+ set
+ {
+ _PageName = value;
+ RaisePropertyChanged(nameof(PageName));
+ }
+ }
+
+
+
///
/// PLC设备状态
///
@@ -104,16 +141,30 @@ namespace SlnMesnac.WPF.ViewModel
_logger = App.ServiceProvider.GetService>();
UserContent = prodMgmtPage;
-
+ PageName = "京源环保SCADA";
ControlOnClickCommand = new RelayCommand