diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj index 0a74b87..5c763c6 100644 --- a/SunlightCentralizedControlManagement_SCCM_.csproj +++ b/SunlightCentralizedControlManagement_SCCM_.csproj @@ -150,6 +150,9 @@ DispenseMacInfo.xaml + + UserInf.xaml + UserInformation.xaml @@ -289,6 +292,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -525,6 +532,11 @@ + + + + + diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs index 4753ca9..5a5a675 100644 --- a/View/MonitorView.xaml.cs +++ b/View/MonitorView.xaml.cs @@ -142,68 +142,74 @@ namespace SunlightCentralizedControlManagement_SCCM_.View private void MenuItem_LOCK_XML(object sender, RoutedEventArgs e) { - bool mode = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First().Field("LOCK"); + if (!string.IsNullOrEmpty(machine)) + { + bool mode = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First().Field("LOCK"); - Dictionary dat_ = new Dictionary(); - dat_.Clear(); + Dictionary dat_ = new Dictionary(); + dat_.Clear(); - if (!mode) - { - dat_.Add("NAME", "LOCK"); - dat_.Add("VALUE", "True"); - MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "LOCK", "Name='" + machine + "'", "True"); - } - else - { - dat_.Add("NAME", "LOCK"); - dat_.Add("VALUE", "False"); - MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "LOCK", "Name='" + machine + "'", "False"); - } + if (!mode) + { + dat_.Add("NAME", "LOCK"); + dat_.Add("VALUE", "True"); + MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "LOCK", "Name='" + machine + "'", "True"); + } + else + { + dat_.Add("NAME", "LOCK"); + dat_.Add("VALUE", "False"); + MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "LOCK", "Name='" + machine + "'", "False"); + } - DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First(); - int index = Convert.ToInt16(drEmployee.Field("ID")); - MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString - { - ID = index, - DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() - }); + DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First(); + int index = Convert.ToInt16(drEmployee.Field("ID")); + MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString + { + ID = index, + DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() + }); - if (!mode) - { - MessageBox.Show(machine + Properties.Resources.user_lock, "800", MessageBoxButton.OK, MessageBoxImage.Information); - } - else - { - MessageBox.Show(machine + Properties.Resources.user_unlock, "800", MessageBoxButton.OK, MessageBoxImage.Information); + if (!mode) + { + MessageBox.Show(machine + Properties.Resources.user_lock, "800", MessageBoxButton.OK, MessageBoxImage.Information); + } + else + { + MessageBox.Show(machine + Properties.Resources.user_unlock, "800", MessageBoxButton.OK, MessageBoxImage.Information); + } } }//锁定 private void MenuItem_AUTO_XML(object sender, RoutedEventArgs e) { - bool mode = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First().Field("AUTO"); + if (!string.IsNullOrEmpty(machine)) + { + bool mode = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First().Field("AUTO"); - Dictionary dat_ = new Dictionary(); - dat_.Clear(); + Dictionary dat_ = new Dictionary(); + dat_.Clear(); - if (!mode) - { - dat_.Add("NAME", "AUTO"); - dat_.Add("VALUE", "True"); - MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "AUTO", "Name='" + machine + "'", "True"); - } - else - { - dat_.Add("NAME", "AUTO"); - dat_.Add("VALUE", "FALSE"); - MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "AUTO", "Name='" + machine + "'", "False"); - } + if (!mode) + { + dat_.Add("NAME", "AUTO"); + dat_.Add("VALUE", "True"); + MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "AUTO", "Name='" + machine + "'", "True"); + } + else + { + dat_.Add("NAME", "AUTO"); + dat_.Add("VALUE", "FALSE"); + MainWindowViewModel.Updata_Machines(MainWindowViewModel.Machines, "AUTO", "Name='" + machine + "'", "False"); + } - DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First(); - int index = Convert.ToInt16(drEmployee.Field("ID")); - MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString - { - ID = index, - DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() - }); + DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First(); + int index = Convert.ToInt16(drEmployee.Field("ID")); + MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString + { + ID = index, + DAT = "SC829" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_.ToJsonString() + }); + } }//手自动 private void MenuItem_Stop_XML(object sender, RoutedEventArgs e) @@ -224,8 +230,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View }//停止 private void MenuItem_Start_XML(object sender, RoutedEventArgs e) { - + if (!string.IsNullOrEmpty(machine)) + { + } }//开始 private void ListViewItem_DyeingMachine(object sender, MouseButtonEventArgs e) { diff --git a/WindowsView/UserInf.xaml b/WindowsView/UserInf.xaml new file mode 100644 index 0000000..d43f87d --- /dev/null +++ b/WindowsView/UserInf.xaml @@ -0,0 +1,23 @@ + + + + + + +