diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 7769c30..781e5a3 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -102,8 +102,7 @@ namespace SunlightCentralizedControlManagement_SCCM_ private void ButtonSYS_Click(object sender, RoutedEventArgs e) { - // Picture.Content = new View.MachinesSet();//EngineerSetView(); - Picture.Content = new View.EngineerSetView(); + Picture.Content = new View.SYSSetView(); } } } diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj index efb1818..71ea356 100644 --- a/SunlightCentralizedControlManagement_SCCM_.csproj +++ b/SunlightCentralizedControlManagement_SCCM_.csproj @@ -103,6 +103,9 @@ CurveDiagram.xaml + + SYSSetView.xaml + CurveView.xaml @@ -161,6 +164,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + Designer MSBuild:Compile diff --git a/View/CurveView.xaml b/View/CurveView.xaml index 0cc3285..e57a385 100644 --- a/View/CurveView.xaml +++ b/View/CurveView.xaml @@ -111,7 +111,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -137,7 +137,7 @@ - + diff --git a/View/SYSSetView.xaml b/View/SYSSetView.xaml new file mode 100644 index 0000000..7509b0e --- /dev/null +++ b/View/SYSSetView.xaml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/View/SYSSetView.xaml.cs b/View/SYSSetView.xaml.cs new file mode 100644 index 0000000..799a541 --- /dev/null +++ b/View/SYSSetView.xaml.cs @@ -0,0 +1,51 @@ +using MaterialDesignThemes.Wpf; +using OpenTK.Graphics.ES11; +using SunlightCentralizedControlManagement_SCCM_.ViewModel; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Net; +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.Markup; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; +using System.Xaml; +using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper; + +namespace SunlightCentralizedControlManagement_SCCM_.View +{ + /// + /// CurveView.xaml 的交互逻辑 + /// + public partial class SYSSetView : UserControl + { + public SYSSetView() + { + InitializeComponent(); + } + + private void UserControl_Loaded(object sender, RoutedEventArgs e) + { + Picture.Content = new View.EngineerSetView(); + } + + private void ListViewItem_Machine(object sender, MouseButtonEventArgs e) + { + Picture.Content = new View.MachinesSet(); + } + + private void ListViewItem_EngineerSet(object sender, MouseButtonEventArgs e) + { + Picture.Content = new View.EngineerSetView(); + } + } +}