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

MainWindow.xaml

@@ -79,7 +79,7 @@
                             <TextBlock Text="{x:Static lang:Resources.Monitor}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
-                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
+                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_ProductionPlanning">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="ClipboardTextClock" Width="25" Height="25" Margin="10" VerticalAlignment="Center" />
                             <TextBlock Text="{x:Static lang:Resources.ProductionPlanning}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -103,7 +103,7 @@
                             <TextBlock Text="{x:Static lang:Resources.Programgroup}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
-                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
+                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_ConveyorCenters">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Pipe" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
                             <TextBlock Text="{x:Static lang:Resources.ConveyorCenters}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>

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();

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -107,6 +107,9 @@
     <Compile Include="View\MachinesView.xaml.cs">
       <DependentUpon>MachinesView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\ProductionPlanningView.xaml.cs">
+      <DependentUpon>ProductionPlanningView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\SYSSetView.xaml.cs">
       <DependentUpon>SYSSetView.xaml</DependentUpon>
     </Compile>
@@ -172,6 +175,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\ProductionPlanningView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\SYSSetView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

View/MachinesView.xaml

@@ -85,6 +85,7 @@
                 <RowDefinition Height="5"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
+            <ContentControl Grid.Row="0" x:Name="machineView"/>
             <GridSplitter Grid.Row="1" Height="5" HorizontalAlignment="Stretch" Background="#FF00204E"/>
             <Grid Grid.Row="2" x:Name="SET_GRID" Visibility="Collapsed">
                 <DataGrid x:Name="SET_Grid" AlternationCount="2" Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=99}" AutoGenerateColumns="False"

View/ProductionPlanningView.xaml

@@ -0,0 +1,62 @@
+<UserControl x:Class="SunlightCentralizedControlManagement_SCCM_.View.ProductionPlanningView "
+             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:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" Loaded="UserControl_Loaded"
+            d:DesignHeight="630" d:DesignWidth="1280">
+    <UserControl.Resources>
+        <ConvertMoels:RowToIndexConverter x:Key="RowToIndexConverter"/>
+    </UserControl.Resources>
+    <Grid>     
+      
+        <StackPanel x:Name="scr" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal">            
+            <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Quit" x:Name="Quit">
+                    <StackPanel Orientation="Horizontal" >
+                        <materialDesign:PackIcon Kind="PresenceExit" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
+                        <TextBlock Text="{x:Static lang:Resources.Quit}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                    </StackPanel>
+                </ListViewItem>
+            </ListView>
+            <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_edit" IsEnabled="False" x:Name="edit">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="Edit" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
+                        <TextBlock Text="{x:Static lang:Resources.edit}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                    </StackPanel>
+                </ListViewItem>
+            </ListView>
+            <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Insert" IsEnabled="False" x:Name="Insert">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="InsertComment" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
+                        <TextBlock Text="{x:Static lang:Resources.Insert}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                    </StackPanel>
+                </ListViewItem>
+            </ListView>
+            <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Save" x:Name="Save">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="Note" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
+                        <TextBlock Text="{x:Static lang:Resources.Save}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                    </StackPanel>
+                </ListViewItem>
+            </ListView>
+            <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
+                <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Delete" IsEnabled="False" x:Name="Delete">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="Delete" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
+                        <TextBlock Text="{x:Static lang:Resources.Delete}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                    </StackPanel>
+                </ListViewItem>
+            </ListView>           
+        </StackPanel>
+        
+        
+    </Grid>
+</UserControl>

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
+{
+    /// <summary>
+    /// ProgramgroupView.xaml 的交互逻辑
+    /// </summary>
+    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)//删除事件
+        {
+           
+        }
+
+    }
+}

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");