sc/SunlightCentralizedControlManagement
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

Browse Source
This commit is contained in:
sc committed 2024-12-11 19:33:13 +08:00
2 parents 387f42577b b188854ddd
commit 5741892b2c
1 file changed
+32 -5
Download Patch File Download Diff File Expand all files Collapse all files
View/MonitorView.xaml.cs
+32 -5
View File
@@ -49,6 +49,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
private void Griddata_SelectionChanged(object sender, SelectionChangedEventArgs e)//设备列表
{
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<string, object> dat_821 = new Dictionary<string, object>();
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<object>("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)
{
@@ -187,9 +214,6 @@ 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;
@@ -251,8 +275,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
MainWindowViewModel.TechnologicalProcess_bool = true;
}
}
}else { Time_D=0; }
}
else
{
Time_D=0;
}
if (!string.IsNullOrEmpty(machine))
{