diff --git a/BPASmart.CustomResource/BPASmart.CustomResource.csproj b/BPASmart.CustomResource/BPASmart.CustomResource.csproj
new file mode 100644
index 00000000..ec24c2a3
--- /dev/null
+++ b/BPASmart.CustomResource/BPASmart.CustomResource.csproj
@@ -0,0 +1,24 @@
+
+
+
+ net6.0-windows
+ enable
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BPASmart.CustomResource/Image/方形背景2.png b/BPASmart.CustomResource/Image/方形背景2.png
new file mode 100644
index 00000000..66a9622c
Binary files /dev/null and b/BPASmart.CustomResource/Image/方形背景2.png differ
diff --git a/BPASmart.CustomResource/Image/方形背景3.png b/BPASmart.CustomResource/Image/方形背景3.png
new file mode 100644
index 00000000..da0f51a4
Binary files /dev/null and b/BPASmart.CustomResource/Image/方形背景3.png differ
diff --git a/BPASmart.Model/用户/UserPower.cs b/BPASmart.Model/用户/UserPower.cs
index 0e3b6d23..39267fbf 100644
--- a/BPASmart.Model/用户/UserPower.cs
+++ b/BPASmart.Model/用户/UserPower.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace BPASmart.Model.用户
+namespace BPASmart.Model
{
public enum UserPower
{
diff --git a/BPASmart.RecipeManagement/MainControl.xaml b/BPASmart.RecipeManagement/MainControl.xaml
new file mode 100644
index 00000000..b567e487
--- /dev/null
+++ b/BPASmart.RecipeManagement/MainControl.xaml
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BPASmart.RecipeManagement/MainControl.xaml.cs b/BPASmart.RecipeManagement/MainControl.xaml.cs
new file mode 100644
index 00000000..cc8f27b1
--- /dev/null
+++ b/BPASmart.RecipeManagement/MainControl.xaml.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmart.RecipeManagement
+{
+ ///
+ /// MainControl.xaml 的交互逻辑
+ ///
+ public partial class MainControl : UserControl
+ {
+ public MainControl()
+ {
+ InitializeComponent();
+ }
+
+ private void mylistview_MouseDown(object sender, MouseButtonEventArgs e)
+ {
+
+ }
+
+ private void NavButton_Click(object sender, RoutedEventArgs e)
+ {
+ try
+ {
+ if (sender is RadioButton bt)
+ {
+ Type type = Type.GetType($"BPASmart.RecipeManagement.View.{bt.Tag?.ToString()}");
+ ConstructorInfo cti = type.GetConstructor(System.Type.EmptyTypes);
+ contentRegion.Content = (FrameworkElement)cti.Invoke(null);
+ }
+ }
+ catch (Exception ex)
+ {
+
+ }
+ }
+ }
+}
diff --git a/BPASmart.RecipeManagement/MainWindow.xaml b/BPASmart.RecipeManagement/MainWindow.xaml
index 043dc376..eeccbae1 100644
--- a/BPASmart.RecipeManagement/MainWindow.xaml
+++ b/BPASmart.RecipeManagement/MainWindow.xaml
@@ -12,88 +12,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -150,91 +71,10 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/BPASmart.RecipeManagement/MainWindow.xaml.cs b/BPASmart.RecipeManagement/MainWindow.xaml.cs
index 7ef08ff9..04373941 100644
--- a/BPASmart.RecipeManagement/MainWindow.xaml.cs
+++ b/BPASmart.RecipeManagement/MainWindow.xaml.cs
@@ -38,10 +38,6 @@ namespace BPASmart.RecipeManagement
}
- private void mylistview_MouseDown(object sender, MouseButtonEventArgs e)
- {
- this.DragMove();
- }
private void Button_Click(object sender, RoutedEventArgs e)
{
@@ -49,22 +45,7 @@ namespace BPASmart.RecipeManagement
}
- private void NavButton_Click(object sender, RoutedEventArgs e)
- {
- try
- {
- if (sender is RadioButton bt)
- {
- Type type = Type.GetType($"BPASmart.RecipeManagement.View.{bt.Tag?.ToString()}");
- ConstructorInfo cti = type.GetConstructor(System.Type.EmptyTypes);
- contentRegion.Content = (FrameworkElement)cti.Invoke(null);
- }
- }
- catch (Exception ex)
- {
-
- }
- }
+
private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
diff --git a/BPASmart.RecipeManagement/View/RecipeManager.xaml b/BPASmart.RecipeManagement/View/RecipeManager.xaml
index be408325..82ac3ad5 100644
--- a/BPASmart.RecipeManagement/View/RecipeManager.xaml
+++ b/BPASmart.RecipeManagement/View/RecipeManager.xaml
@@ -117,9 +117,12 @@
-
-
+
diff --git a/BPASmart.RecipeManagement/ViewModel/MainControl.cs b/BPASmart.RecipeManagement/ViewModel/MainControl.cs
new file mode 100644
index 00000000..4c1bde11
--- /dev/null
+++ b/BPASmart.RecipeManagement/ViewModel/MainControl.cs
@@ -0,0 +1,20 @@
+using BPASmart.Model;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmart.RecipeManagement.ViewModel
+{
+ public class MainControl:ObservableObject
+ {
+ public MainControl()
+ {
+ Json.Read();
+ Json.Read();
+ }
+ }
+}
diff --git a/BPASmart.RecipeManagement/ViewModel/MainWindowViewModel.cs b/BPASmart.RecipeManagement/ViewModel/MainWindowViewModel.cs
index b89deae2..391a6702 100644
--- a/BPASmart.RecipeManagement/ViewModel/MainWindowViewModel.cs
+++ b/BPASmart.RecipeManagement/ViewModel/MainWindowViewModel.cs
@@ -14,8 +14,7 @@ namespace BPASmart.RecipeManagement.ViewModel
public MainWindowViewModel()
{
- Json.Read();
- Json.Read();
+
}
}
diff --git a/BPASmart.RecipeManagement/ViewModel/RecipeManagerViewModel.cs b/BPASmart.RecipeManagement/ViewModel/RecipeManagerViewModel.cs
index 9f320402..f6cf1d6d 100644
--- a/BPASmart.RecipeManagement/ViewModel/RecipeManagerViewModel.cs
+++ b/BPASmart.RecipeManagement/ViewModel/RecipeManagerViewModel.cs
@@ -16,12 +16,22 @@ namespace BPASmart.RecipeManagement.ViewModel
public class RecipeManagerViewModel : ObservableObject
{
public ObservableCollection RecipeList { get; set; } = Json.Data.locaRecipes;
-
+ ///
+ /// 创建配方
+ ///
public RelayCommand CreateRecipeCommand { get; set; }
+
public RelayCommand