diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 6a200b5..7733757 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -313,12 +313,27 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel ID = i, DAT = "SC800:SCCM[" + MachiensTcpClient[i].IP + ";" + MachiensTcpClient[i].Port + "]" });//信息插入队列 - } + } + + /**染机用户信息**/ + try + { + if ((bool)Selet_Machines(Machines, "UserButton", "ID='" + i + "'")) + { + MainWindow.InfData.Rows.Add(new object[] { + Selet_Machines(Machines, "Name", "ID='" + i + "'"), + Properties.Resources.Pequest + Selet_Machines(Machines, "UserInfo", "ID='" + i + "'"), + Selet_Machines(Machines, "SYSKEY", "ID='" + i + "'"), + Selet_Machines(Machines, "ID", "ID='" + i + "'")}); + } + } + catch (Exception) { } + }//发送800指令 - MainWindow.InfData.Rows.Add(new object[] { "1", Properties.Resources.Pequest+"a", "423", "12" }); + // MainWindow.InfData.Rows.Add(new object[] { "1", Properties.Resources.Pequest+"a", "423", "12" }); } diff --git a/WindowsView/UserInformation.xaml.cs b/WindowsView/UserInformation.xaml.cs index 985d333..bd9613b 100644 --- a/WindowsView/UserInformation.xaml.cs +++ b/WindowsView/UserInformation.xaml.cs @@ -75,11 +75,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.WindowsView var button = sender as Button; DataRowView datarow = (DataRowView)button.Tag; var id= datarow.Row.Field("ID"); - DataRow erwqer = MainWindow.InfData.Select("ID='" + id + "'").First(); + MainWindow.InfData.Select("ID='" + id + "'").First().Delete(); - erwqer.Delete(); Griddata.ItemsSource = MainWindow.InfData.DefaultView; - if (MainWindow.InfData.Rows.Count == 0) { this.Close(); } }