diff --git a/MainWindow.xaml b/MainWindow.xaml index 3f6cf9f..008fef5 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -79,7 +79,7 @@ - + @@ -103,7 +103,7 @@ - + diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 22a8b53..5aba651 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -74,9 +74,9 @@ namespace SunlightCentralizedControlManagement_SCCM_ gdMian.Margin = new Thickness(e.NewSize.Width, 50, 0, 0); } - private void ListViewItem_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) + private void ListViewItem_ProductionPlanning(object sender, MouseButtonEventArgs e) { - + Picture.Content = new View.ProductionPlanningView(); } private void ListViewItem_Whole(object sender, MouseButtonEventArgs e) { @@ -98,12 +98,16 @@ namespace SunlightCentralizedControlManagement_SCCM_ { Picture.Content = new View.ProgramgroupView(); } + private void ListViewItem_ConveyorCenters(object sender, MouseButtonEventArgs e) + { + + } + private void Buttonhelp_Click(object sender, RoutedEventArgs e) { WindowsView.Help help_page = new WindowsView.Help(); help_page.Show(); } - private void ButtonSYS_Click(object sender, RoutedEventArgs e) { Picture.Content = new View.SYSSetView(); diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj index 65ec867..c9b89cb 100644 --- a/SunlightCentralizedControlManagement_SCCM_.csproj +++ b/SunlightCentralizedControlManagement_SCCM_.csproj @@ -107,6 +107,9 @@ MachinesView.xaml + + ProductionPlanningView.xaml + SYSSetView.xaml @@ -172,6 +175,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + MSBuild:Compile Designer diff --git a/View/MachinesView.xaml b/View/MachinesView.xaml index cb3e324..328fd84 100644 --- a/View/MachinesView.xaml +++ b/View/MachinesView.xaml @@ -85,6 +85,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/View/ProductionPlanningView.xaml.cs b/View/ProductionPlanningView.xaml.cs new file mode 100644 index 0000000..5ff6ebc --- /dev/null +++ b/View/ProductionPlanningView.xaml.cs @@ -0,0 +1,75 @@ +using SunlightCentralizedControlManagement_SCCM_.UserClass; +using SunlightCentralizedControlManagement_SCCM_.WindowsView; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.Entity; +using System.Data.SQLite; +using System.Diagnostics.Eventing.Reader; +using System.Linq; +using System.Net; +using System.Net.NetworkInformation; +using System.Security.Cryptography; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; +using System.Xml.Linq; +using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper; +using static SunlightCentralizedControlManagement_SCCM_.WindowsView.ViewStep; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; + +namespace SunlightCentralizedControlManagement_SCCM_.View +{ + /// + /// ProgramgroupView.xaml 的交互逻辑 + /// + public partial class ProductionPlanningView : UserControl + { + public ProductionPlanningView() + { + InitializeComponent(); + } + + private SQLiteHelper SQLiteHelpers = null; //定义数据库 + private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db"; //数据库路径 + + private void UserControl_Loaded(object sender, RoutedEventArgs e)//打开页面时的操作 + { + + } + + private void ListViewItem_Quit(object sender, System.Windows.Input.MouseButtonEventArgs e)//退出事件 + { + } + + private void ListViewItem_edit(object sender, System.Windows.Input.MouseButtonEventArgs e)//编辑事件 + { + + } + + private void ListViewItem_Insert(object sender, System.Windows.Input.MouseButtonEventArgs e)//插入事件 + { + } + + private void ListViewItem_Save(object sender, System.Windows.Input.MouseButtonEventArgs e)//保存事件 + { + + } + + private void ListViewItem_Delete(object sender, System.Windows.Input.MouseButtonEventArgs e)//删除事件 + { + + } + + } +} diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index f9eca35..a398e38 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -215,7 +215,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel public static int SYS_AT2; public static int SYS_AT3; - public string sys_Time; //显示系统时间 public string Sys_Time //通知UI控件参数改变 { @@ -247,7 +246,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel return "ERR"; } } - public static void Updata_Machines(DataTable DB, string name, int key, string Value)//更新数据 { try @@ -268,8 +266,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel } } - - public static DataTable dt_d = new DataTable("DIO"); public static DataTable dt_a = new DataTable("AIO"); public static DataTable dt_m = new DataTable("M");