diff --git a/View/ProgramgroupView.xaml b/View/ProgramgroupView.xaml index 73c11e9..adaa3a8 100644 --- a/View/ProgramgroupView.xaml +++ b/View/ProgramgroupView.xaml @@ -54,7 +54,6 @@ - @@ -105,8 +104,10 @@ - - + + + + diff --git a/View/ProgramgroupView.xaml.cs b/View/ProgramgroupView.xaml.cs index 937e6a8..82e5ad6 100644 --- a/View/ProgramgroupView.xaml.cs +++ b/View/ProgramgroupView.xaml.cs @@ -38,23 +38,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表 SQLiteHelpers.Close(); //关闭连接 - } - - private void ProgramgroupView_edit_Click(object sender, RoutedEventArgs e) - { - /*if (Programgroup_ID == null) return; - - container.Content = new ProgramstepsView();*/ - } - - - - - - - - - + } public static string Programgroup_Numder { get; set; } public static string Programgroup_ID { get; set; } @@ -75,7 +59,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.View private void Grid_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)//双击表格编辑事件 { - + int rownum = Grid.SelectedIndex;//获取鼠标选中行并定义变量 + if (rownum != -1)//判断鼠标定位是否有效 + { + Programgroup_ID = (Grid.Columns[0].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列, + Programgroup_Numder = (Grid.Columns[1].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第1列, + container.Content = new ProgramstepsView();//打开步设置 + } } private void ListViewItem_New(object sender, System.Windows.Input.MouseButtonEventArgs e) @@ -116,6 +106,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View Rename.IsEnabled = false; Remark.IsEnabled = false; Delete.IsEnabled = false; + if (Programgroup_ID == null) return; + container.Content = new ProgramstepsView(); } private void ListViewItem_Rename(object sender, System.Windows.Input.MouseButtonEventArgs e)//重命名 diff --git a/View/ProgramstepsView .xaml.cs b/View/ProgramstepsView .xaml.cs index 2fd15d8..7e3e7e8 100644 --- a/View/ProgramstepsView .xaml.cs +++ b/View/ProgramstepsView .xaml.cs @@ -44,7 +44,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View } private SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 + private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db"; //数据库路径 DataSet sql; //内存数据缓存 string ProgramID;