diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj
index bdf46c8..fe8b915 100644
--- a/SunlightCentralizedControlManagement_SCCM_.csproj
+++ b/SunlightCentralizedControlManagement_SCCM_.csproj
@@ -98,6 +98,7 @@
+
@@ -315,9 +316,6 @@
1.0.2903.40
-
- 3.5.3
-
3.0.81
diff --git a/View/ProductionPlanningView.xaml b/View/ProductionPlanningView.xaml
index 27722eb..6b11512 100644
--- a/View/ProductionPlanningView.xaml
+++ b/View/ProductionPlanningView.xaml
@@ -6,7 +6,8 @@
xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"
xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"
xmlns:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels"
- xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+ xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+ xmlns:planner="http://mindfusion.eu/scheduling/wpf"
mc:Ignorable="d" Loaded="UserControl_Loaded"
d:DesignHeight="630" d:DesignWidth="1280">
@@ -17,7 +18,8 @@
-
+
+
diff --git a/View/ProductionPlanningView.xaml.cs b/View/ProductionPlanningView.xaml.cs
index 5ff6ebc..e224081 100644
--- a/View/ProductionPlanningView.xaml.cs
+++ b/View/ProductionPlanningView.xaml.cs
@@ -46,7 +46,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
private void UserControl_Loaded(object sender, RoutedEventArgs e)//打开页面时的操作
{
- }
+ }
+
+
+
private void ListViewItem_Quit(object sender, System.Windows.Input.MouseButtonEventArgs e)//退出事件
{
diff --git a/ViewModel/ProductionPlanningModel.cs b/ViewModel/ProductionPlanningModel.cs
new file mode 100644
index 0000000..5980c12
--- /dev/null
+++ b/ViewModel/ProductionPlanningModel.cs
@@ -0,0 +1,37 @@
+using LiveChartsCore.SkiaSharpView;
+using LiveChartsCore;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using LiveChartsCore.Kernel.Sketches;
+using LiveChartsCore.SkiaSharpView.Painting;
+using ScottPlot.Colormaps;
+using System.Drawing;
+using System.Windows.Media.TextFormatting;
+using System.Xml.Linq;
+using SkiaSharp;
+using LiveChartsCore.Defaults;
+using static System.Net.WebRequestMethods;
+using System.Collections.ObjectModel;
+using DyeingComputer.Properties;
+using LiveChartsCore.Measure;
+using LiveChartsCore.Motion;
+using SunlightCentralizedControlManagement_SCCM_.Properties;
+using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper;
+using TouchSocket.Core;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Windows;
+using SunlightCentralizedControlManagement_SCCM_.View;
+
+namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
+{
+ public partial class ProductionPlanningModel : ObservableObject//ViewModelBase
+ {
+
+ }
+}
diff --git a/ViewModel/ViewModelLocator.cs b/ViewModel/ViewModelLocator.cs
index 169bf3d..79aa4e1 100644
--- a/ViewModel/ViewModelLocator.cs
+++ b/ViewModel/ViewModelLocator.cs
@@ -13,8 +13,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
public ViewModelLocator()
{
-
- }
+ }
public MainWindowViewModel Main
{
@@ -30,6 +29,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
return ServiceLocator.Current.GetInstance();
}
}
-
+ public ProductionPlanningModel Production
+ {
+ get
+ {
+ return ServiceLocator.Current.GetInstance();
+ }
+ }
}
}