diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs index 541f328..f4b66e3 100644 --- a/UserClass/AsyncTcpClient.cs +++ b/UserClass/AsyncTcpClient.cs @@ -90,7 +90,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass { DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First(); drEmployee.BeginEdit(); - drEmployee["State"] = "899"; + drEmployee["State"] = "800"; drEmployee["WorkOrder"] = "------"; drEmployee["Dyelot"] = ""; drEmployee["Temperature"] = "---.-"; @@ -123,7 +123,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First(); drEmployee.BeginEdit(); drEmployee["SYSKEY"] = Chart_new.GetValue("SYSKEY").ToString(); - drEmployee["NAME"] = Chart_new.GetValue("MACHINE").ToString(); + // drEmployee["NAME"] = Chart_new.GetValue("MACHINE").ToString(); drEmployee["Groups"] = Chart_new.GetValue("GROUP").ToString(); drEmployee["State"] = "802"; drEmployee.EndEdit(); diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs index 6062ad0..15d65a5 100644 --- a/View/MonitorView.xaml.cs +++ b/View/MonitorView.xaml.cs @@ -40,7 +40,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View { public MonitorView() { - DataContext = new MainWindowViewModel(); + //DataContext = new MainWindowViewModel(); InitializeComponent(); CountDown(); } diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index bd2be36..a78112a 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -15,7 +15,9 @@ using System.Data.SqlClient; using System.Linq; using System.Reflection; using System.Text; +using System.Threading; using System.Threading.Tasks; +using System.Timers; using System.Windows.Controls; using System.Windows.Forms; using System.Windows.Media; @@ -149,14 +151,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel LogGing.LogGingDATA("[Database='" + ex + "']=SQLSERVER"); ERR_c++; } - } + } + public void CountDown() { - DispatcherTimer timer1s = new DispatcherTimer//初始化循环,每1秒调用一次Tick - { - Interval = TimeSpan.FromSeconds(1)//秒 - }; - timer1s.Tick += Tick_Event_1S; + DispatcherTimer timer1s = new DispatcherTimer(DispatcherPriority.Normal);//初始化循环,每1秒调用一次Tick + timer1s.Interval = TimeSpan.FromMilliseconds(950);//秒 + timer1s.Tick += Tick_Main_1S; timer1s.Start(); DispatcherTimer dis50ms = new DispatcherTimer @@ -164,7 +165,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel Interval = TimeSpan.FromMilliseconds(10) //毫秒 }; dis50ms.Tick += new EventHandler(DisTimer_50MS);//每一秒执行的方法 - dis50ms.Start();//计时开始 + dis50ms.Start();//计时开始 }//时间周期初始化 void DisTimer_50MS(object sender, EventArgs e)//Tick_Event周期执行事件50MS { @@ -174,7 +175,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel MachiensTcpClient[t.ID].SendAsync(t.DAT); } } - void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S + + + void Tick_Main_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S { DATA_view(); //下传工单信息