diff --git a/MainWindow.xaml b/MainWindow.xaml index 10aac5c..918b7bf 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -4,12 +4,13 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:formula_manage" + xmlns:ViewModel="clr-namespace:formula_manage.ViewModel" mc:Ignorable="d" Loaded="Window_MIN" Title="SUNLIGHT" Height="720" Width="1280" MinHeight="720" MinWidth="1280" DataContext="{Binding Source={StaticResource Locator}, Path=Main}" BorderBrush="White" Background="#FFE0E0E0"> - + @@ -152,6 +153,7 @@ + @@ -162,15 +164,14 @@ @@ -198,7 +199,7 @@ diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 70ddb7f..843e5b1 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -25,6 +25,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Threading; +using formula_manage.ViewModel; using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; using static System.Net.Mime.MediaTypeNames; //using static System.Windows.Forms.VisualStyles.VisualStyleElement; @@ -56,8 +57,7 @@ namespace formula_manage public MainWindow() { - // DataContext =new MainWindow(); - + DataContext =new MainWindowViewModel(); int ID_N = 1; WindowStartupLocation = WindowStartupLocation.CenterScreen; @@ -123,6 +123,10 @@ namespace formula_manage Grid_RRODUCT.ItemsSource = RRODUCTdataTable.DefaultView; + //this.DataContext = Grid_RRODUCT; + // this.DataContext = STUFFdataTable.DefaultView; + + Grid_RRODUCT.DataContext = this; } private async void sql_() @@ -260,9 +264,7 @@ namespace formula_manage public void DisTimer_Tick(object sender, EventArgs e)//循环事件 { - USERTIME.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - - + USERTIME.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); } public void CountDown() @@ -523,36 +525,7 @@ namespace formula_manage } private void CP_PRODUCT_CODE_KeyUp(object sender, System.Windows.Input.KeyEventArgs e) - { - - //string dsa= CP_PRODUCT_CODE //Grid_RRODUCT.SelectedItems[0].ToString(); - - // int index = Grid_RRODUCT.CurrentCell; - // DataGridTemplateColumn templeColumn = Grid_RRODUCT.Columns[1] as DataGridTemplateColumn; - - /* for (int k = 0; k < this.Grid_RRODUCT.Items.Count; k++) - { - //首先获取DataGridTemplateColumn所在列 - DataGridTemplateColumn tempColumn = this.Grid_RRODUCT.Columns[9] as DataGridTemplateColumn; - - - //然后获取DataGridTemplateColumn单元格元素 - FrameworkElement element = this.Grid_RRODUCT.Columns[9].GetCellContent(this.Grid_RRODUCT.Items[k]); - - - if (element != null) - { - //把单元格元素转换为相应的控件，再从该控件中取值 - System.Windows.Controls.CheckBox ck = Grid_RRODUCT.SelectedItems[1].CellTemplate.FindName("CP_PRODUCT_CODE", element) as System.Windows.Controls.CheckBox; - - - if (ck.IsChecked.Value) - { - //do something here - } - } - }*/ - + { if (e.Key == Key.Enter) { UserClass.PressKey.PressKeys(Keys.Right, false); diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 6892dae..13f23b5 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -17,15 +17,14 @@ using System.Threading.Tasks; using System.Windows.Forms; using System.Windows.Threading; - namespace formula_manage.ViewModel { /// /// RRODUCTiewModel /// +/// public class MainWindowViewModel : ViewModelBase { - DataTable DissolvedataTable = new DataTable(); //建立Dissolve缓存 DataTable STUFFdataTable = new DataTable(); //建立STUFF缓存 DataTable MACHINEdataTable = new DataTable(); //建立Machine缓存 @@ -73,15 +72,18 @@ public class MainWindowViewModel : ViewModelBase Stuff_data.Fill(STUFFdataTable); //stuff查询结果存入缓存 Mac_data.Fill(MACHINEdataTable); //machine查询结果存入缓存 Dissolve_data.Fill(DissolvedataTable); //machine查询结果存入缓存 - + conn_SC.Close(); //关闭连接 + + + } catch (Exception) { System.Windows.MessageBox.Show("请求原料信息失败，检查连接"); return; } - + // IEnumerable STUFFdata = STUFFdataTable.DefaultView; // Machine.ItemsSource = MACHINEdataTable.DefaultView; // MACHINEdataTable数据集传递到ComboBox：machine // Workflow.ItemsSource = DissolvedataTable.DefaultView; // DissolvedataTable数据集传递到ComboBox：Workflow @@ -93,10 +95,14 @@ public class MainWindowViewModel : ViewModelBase { sql_(); + + + + // public ObservableCollection (System.Collections.Generic.List list); // BarCollection = (ObservableCollection)STUFFdataTable.AsDataView(); // var qwe = STUFFdataTable.DefaultView; - // var product = STUFFdataTable.DefaultView; + // var product = STUFFdataTable.DefaultView; // BarCollection = (ObservableCollection)STUFFdata; @@ -129,11 +135,11 @@ public class MainWindowViewModel : ViewModelBase } */ - _product = new ObservableCollection - { - new Product{ ProductCode= "132",ProductName= "123", ProductType= 12,Concentration= 12} - }; - + // _product = new ObservableCollection((IEnumerable)); + // { + // new Product{ ProductCode= STUFFdataTable.Rows,ProductName= "123", ProductType= 12,Concentration= 12} + // }; + }