diff --git a/View/MonitorView.xaml b/View/MonitorView.xaml
index b55595c..b9adf16 100644
--- a/View/MonitorView.xaml
+++ b/View/MonitorView.xaml
@@ -97,7 +97,7 @@
- ("ID"));
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString { ID = index,
DAT = "SC821" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index) + dat_821.ToJsonString() });
+
+ MainWindowViewModel.TechnologicalProcess_bool = true;
}
private void ListViewItem_Jump(object sender, MouseButtonEventArgs e)
@@ -186,9 +187,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Insert_ButtonClicked);
viewstop.ShowDialog();
}//插入
+
+
+
private void Insert_ButtonClicked(object sender, AddressUpdateEventArgs e)//cr返回结果
{
-
MainWindowViewModel.TechnologicalProcess_bool = true;
Dictionary dat_821 = new Dictionary();
dat_821.Clear();
@@ -221,6 +224,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString { ID = index,
DAT = "SC821" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index) + dat_821.ToJsonString() });
+ MainWindowViewModel.TechnologicalProcess_bool = true;
}
}//删除
@@ -233,9 +237,23 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
timer1s.Tick += Tick_Event_1S;
timer1s.Start();
}//时间周期初始化
-
+ int Time_D = 0;
void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S
{
+ if (Paused.IsEnabled)
+ {
+ if (!Resume.IsEnabled)
+ {
+ Time_D++;
+ if (Time_D > 10)
+ {
+ Paused.IsEnabled = false;
+ MainWindowViewModel.TechnologicalProcess_bool = true;
+ }
+ }
+ }else { Time_D=0; }
+
+
if (!string.IsNullOrEmpty(machine))
{
try