diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs index 21e05db..c15f594 100644 --- a/View/MonitorView.xaml.cs +++ b/View/MonitorView.xaml.cs @@ -48,7 +48,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.View private void Griddata_SelectionChanged(object sender, SelectionChangedEventArgs e)//设备列表 { - Stop.IsEnabled = true; + Stop.IsEnabled = true; + Insert.IsEnabled = false; + edit.IsEnabled = false; + Paused.IsEnabled = false; + Resume.IsEnabled = false; + Delete.IsEnabled = false; + Jump.IsEnabled = false; MainWindowViewModel.TechnologicalProcess_bool = true; int rownum = Griddata.SelectedIndex;//获取鼠标选中行并定义变量 if (rownum != -1)//判断鼠标定位是否有效 @@ -108,6 +114,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View Paused.IsEnabled = false; Resume.IsEnabled = false; Delete.IsEnabled = false; + Jump.IsEnabled = false; MainWindowViewModel.TechnologicalProcess_bool = true; }//恢复 private void ListViewItem_Paused(object sender, MouseButtonEventArgs e) @@ -127,6 +134,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View Paused.IsEnabled = true; Resume.IsEnabled = true; Delete.IsEnabled = true; + Jump.IsEnabled = true; }//暂停 private void ListViewItem_Stop(object sender, MouseButtonEventArgs e) { @@ -178,7 +186,26 @@ namespace SunlightCentralizedControlManagement_SCCM_.View private void ListViewItem_Jump(object sender, MouseButtonEventArgs e) { + Dictionary dat_821 = new Dictionary(); + dat_821.Clear(); + dat_821.Add("INSTRUCTION", "JUMP"); + dat_821.Add("ID", ID); + dat_821.Add("Numder", Numder); + dat_821.Add("P1", P1); + dat_821.Add("P2", P2); + dat_821.Add("P3", P3); + dat_821.Add("P4", P4); + dat_821.Add("P5", P5); + DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First(); + int index = Convert.ToInt16(drEmployee.Field("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_Insert(object sender, MouseButtonEventArgs e) { @@ -186,10 +213,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View viewstop.data = ID; viewstop.AddressUpdated += new ViewStep.AddressUpdateHandler(Insert_ButtonClicked); viewstop.ShowDialog(); - }//插入 - - - + }//插入 private void Insert_ButtonClicked(object sender, AddressUpdateEventArgs e)//cr返回结果 { MainWindowViewModel.TechnologicalProcess_bool = true; @@ -251,8 +275,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.View MainWindowViewModel.TechnologicalProcess_bool = true; } } - }else { Time_D=0; } - + } + else + { + Time_D=0; + } if (!string.IsNullOrEmpty(machine)) {