Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

MainWindow.xaml

@@ -85,7 +85,7 @@
                             <TextBlock Text="{x:Static lang:Resources.ProductionPlanning}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
-                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
+                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_Curve">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="ShowChart" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
                             <TextBlock Text="{x:Static lang:Resources.Curve}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>

MainWindow.xaml.cs

@@ -86,6 +86,10 @@ namespace SunlightCentralizedControlManagement_SCCM_
         {
             Picture.Content = new View.MonitorView();
         }
+        private void ListViewItem_Curve(object sender, MouseButtonEventArgs e)
+        {
+            Picture.Content = new View.CurveView();
+        }
 
         private void Buttonhelp_Click(object sender, RoutedEventArgs e)
         {

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -97,6 +97,9 @@
     <Compile Include="UserClass\UserControlMenuItem.cs" />
     <Compile Include="ViewModel\MainWindowViewModel.cs" />
     <Compile Include="ViewModel\ViewModelLocator.cs" />
+    <Compile Include="View\CurveView.xaml.cs">
+      <DependentUpon>CurveView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\EngineerSetView.xaml.cs">
       <DependentUpon>EngineerSetView.xaml</DependentUpon>
     </Compile>
@@ -133,6 +136,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="View\CurveView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\EngineerSetView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

View/CurveView.xaml

@@ -0,0 +1,53 @@
+<UserControl x:Class="SunlightCentralizedControlManagement_SCCM_.View.CurveView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"		
+             xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"	      
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" 
+             d:DesignHeight="900" d:DesignWidth="1800">
+    <Grid>
+        <DataGrid x:Name="Griddata" AlternationCount="2" IsReadOnly="True" SelectionChanged="Griddata_SelectionChanged"
+ Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=999}" AutoGenerateColumns="False" MinColumnWidth="30"       
+ HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All"         
+ BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"      
+ CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
+ CanUserAddRows="True" CanUserDeleteRows="False" HeadersVisibility ="Column" 
+ Background="White" SelectionMode="Single" FontSize="15" TabIndex="1" Focusable="True" BorderBrush="Black" HorizontalAlignment="Left" Width="150">
+            <DataGrid.RowStyle >
+                <Style TargetType="{x:Type DataGridRow}">
+                    <Setter Property="Height" Value="30" />
+                    <Setter Property="FontSize" Value="25" />
+                    <Style.Triggers>
+                        <Trigger Property="ItemsControl.AlternationIndex" Value="0">
+                            <Setter Property="Background" Value="#FFFFFFFF" />
+                        </Trigger>
+                        <Trigger Property="ItemsControl.AlternationIndex" Value="1">
+                            <Setter Property="Background" Value="#FFF0F0F0" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="False"/>
+                    </Style.Triggers>
+                </Style>
+            </DataGrid.RowStyle>
+            <DataGrid.CellStyle>
+                <Style TargetType="DataGridCell">
+                    <Setter Property="BorderThickness" Value="0"/>
+                    <Setter Property="MinWidth" Value="20"/>
+                    <Style.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="Background" Value="#FFC0C0C0"/>
+                            <Setter Property="BorderBrush" Value="#FFC0C0C0"/>
+                            <Setter Property="Foreground" Value="Black"/>
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </DataGrid.CellStyle>
+            <DataGrid.Columns>
+                <!--列信息绑定-->
+                <DataGridTextColumn Header="{x:Static lang:Resources.Machine}" Binding="{Binding Name}" Width="auto" IsReadOnly="True"/>
+            </DataGrid.Columns>
+        </DataGrid>
+    </Grid>
+</UserControl>

View/CurveView.xaml.cs

@@ -0,0 +1,36 @@
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+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 SunlightCentralizedControlManagement_SCCM_.View
+{
+    /// <summary>
+    /// CurveView.xaml 的交互逻辑
+    /// </summary>
+    public partial class CurveView : UserControl
+    {
+        public CurveView()
+        {
+            InitializeComponent();
+
+            Griddata.ItemsSource = MainWindowViewModel.Machines.DefaultView;
+        }
+
+        private void Griddata_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+
+        }
+    }
+}