diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs index 15ac300..f7cb617 100644 --- a/UserClass/AsyncTcpClient.cs +++ b/UserClass/AsyncTcpClient.cs @@ -343,6 +343,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass } catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } }//系统设置表 + else if (SYSAPI == "SC859") + { + try + { + DAT = DAT.Substring(DAT.IndexOf("]") + 1); + MachinesView.LOG_dataTable = JsonConvert.DeserializeObject(DAT);//反序列化 + } + catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; } + } else if (SYSAPI == "SC910") { try diff --git a/View/MachinesView.xaml b/View/MachinesView.xaml index 19a9ad9..fcec75e 100644 --- a/View/MachinesView.xaml +++ b/View/MachinesView.xaml @@ -30,7 +30,7 @@ CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False" CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" AutoGenerateColumns="False" MinColumnWidth="30" - HorizontalAlignment="Left" Width="310" MouseDoubleClick="Griddata_MouseDoubleClick"> + HorizontalAlignment="Left" Width="250" MouseDoubleClick="Griddata_MouseDoubleClick"> + + + + + + + + + + + + + + diff --git a/View/MachinesView.xaml.cs b/View/MachinesView.xaml.cs index 410b2f3..12f6370 100644 --- a/View/MachinesView.xaml.cs +++ b/View/MachinesView.xaml.cs @@ -63,6 +63,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View } string machine; + int LOG_ = 0; + public static DataTable LOG_dataTable = new DataTable(); private void Griddata_MouseDoubleClick(object sender, MouseButtonEventArgs e) { int rownum = Griddata.SelectedIndex;//获取鼠标选中行并定义变量 @@ -81,6 +83,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View private void ListViewItem_ArrowLeftRight(object sender, MouseButtonEventArgs e) { + LOG_GRID.Visibility = Visibility.Collapsed; IO_GRID.Visibility = Visibility.Visible; SYS_GRID.Visibility = Visibility.Collapsed; SET_GRID.Visibility = Visibility.Collapsed; @@ -88,13 +91,70 @@ namespace SunlightCentralizedControlManagement_SCCM_.View } private void ListViewItem_VideoHomeSystem(object sender, MouseButtonEventArgs e) { + LOG_GRID.Visibility = Visibility.Collapsed; IO_GRID.Visibility = Visibility.Collapsed; SYS_GRID.Visibility = Visibility.Visible; SET_GRID.Visibility = Visibility.Collapsed; view = 2; } + private void ListViewItem_LOG(object sender, MouseButtonEventArgs e) + { + if (LOG_ > 3) { LOG_ = 0; } + else + { LOG_++; } + + LOG_GRID.Visibility = Visibility.Visible; + IO_GRID.Visibility = Visibility.Collapsed; + SYS_GRID.Visibility = Visibility.Collapsed; + SET_GRID.Visibility = Visibility.Collapsed; + view = 3; + + Dictionary dat_859 =new Dictionary(); + + if (LOG_ == 0) + { + dat_859.Add("INSTRUCTION", "SERVER"); + dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss")); + dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")); + } + else if (LOG_ == 1) + { + dat_859.Add("INSTRUCTION", "OperationLog"); + dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss")); + dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")); + } + else if (LOG_ == 2) + { + dat_859.Add("INSTRUCTION", "IOLog"); + dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss")); + dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")); + } + else + { + dat_859.Add("INSTRUCTION", "ERRLog"); + dat_859.Add("TIME_S", DateTime.Now.AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss")); + dat_859.Add("TIME_E", DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")); + } + + if (!string.IsNullOrEmpty(machine)) + { + DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First(); + int State_ = Convert.ToInt16(drEmployee.Field("State")); + int index = Convert.ToInt16(drEmployee.Field("ID")); + if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息 + { + MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString + { + ID = index, + DAT = "SC859" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + +dat_859.ToJsonString() + }); + } + } + } private void ListViewItem_Dharmachakra(object sender, MouseButtonEventArgs e) { + LOG_GRID.Visibility = Visibility.Collapsed; IO_GRID.Visibility = Visibility.Collapsed; SYS_GRID.Visibility = Visibility.Collapsed; SET_GRID.Visibility = Visibility.Visible; @@ -276,6 +336,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View { IO_data(); DATA_view(); + if (LOG_dataTable.Rows.Count > 0) { + LOG_Grid.ItemsSource = LOG_dataTable.DefaultView; + // LOG_dataTable.Clear(); + } } private async void DATA_view()//IO显示 {