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

MainWindow.xaml

@@ -71,9 +71,7 @@
         <RadioButton Content="{x:Static lang:Resources.EngineerSet}" x:Name="Engineer_Set" Tag="&#xF0f0;" Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Left" Height="40" Margin="800,0,0,0" VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_Page" Visibility="Hidden"/>
         <RadioButton Content="{x:Static lang:Resources.Previous}" x:Name="Previous" Tag="&#xF060;" Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Right" Height="40" Margin="0,0,0,0" VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_toolbar" GroupName="toolbar" Visibility="Hidden"/>
 
-        <Grid Margin="0,50,0,40">
+        <ContentControl x:Name="container" Margin="0,50,0,40"/>
-            <ContentControl x:Name="container"/>
-        </Grid>
 
         <Grid Margin="0,0,0,0" VerticalAlignment="Top" Height="50" Background="#FFD2D2D2">
             <TextBox Text="{x:Static lang:Resources.Temperature}" HorizontalAlignment="Left" Height="20" Margin="0,0,0,0" 

MainWindow.xaml.cs

@@ -156,9 +156,6 @@ namespace DyeingComputer
             }
         }
 
-        private void KeyBinding_Changed(object sender, EventArgs e)
+ 
-        {
-          //  if(Next.Visibility == Visibility.Visible) container.Content = new WorkOrderView();
-        }
     }
 }

View/ParameterSetView.xaml

@@ -7,7 +7,7 @@
              xmlns:lang="clr-namespace:DyeingComputer.Properties" 
              xmlns:localUserClass="clr-namespace:DyeingComputer.UserClass"
              mc:Ignorable="d" Loaded="UserControl_Loaded"
-             d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
+             d:DesignHeight="630" d:DesignWidth="1280">
     <Grid>
         <DataGrid x:Name="Grid" AlternationCount="2" Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=99}" AutoGenerateColumns="False" 
                 HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"         

View/ProgramgroupView.xaml

@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:DyeingComputer.View"
              xmlns:lang="clr-namespace:DyeingComputer.Properties" 
              mc:Ignorable="d" 
-            d:DesignHeight="630" d:DesignWidth="1280" HorizontalAlignment="Left">
+            d:DesignHeight="630" d:DesignWidth="1280">
     <Grid>
         <Rectangle Margin="0,0,0,0" Fill="#FFCCCCCC" VerticalAlignment="Top" Height="40"/>
         <Button Content="{x:Static lang:Resources.edit}" x:Name="ProgramgroupView_edit" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="200,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_edit_Click"/>

View/ProgramstepsView .xaml

@@ -7,7 +7,7 @@
              xmlns:lang="clr-namespace:DyeingComputer.Properties" 
              xmlns:ConvertMoels="clr-namespace:DyeingComputer.ConvertMoels"
              mc:Ignorable="d" Loaded="UserControl_Loaded"
-            d:DesignHeight="630" d:DesignWidth="1280" HorizontalAlignment="Left">
+            d:DesignHeight="630" d:DesignWidth="1280">
     <UserControl.Resources>
         <ConvertMoels:RowToIndexConverter x:Key="RowToIndexConverter"/>
     </UserControl.Resources>

View/SysSetView.xaml

@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:DyeingComputer.View"
              xmlns:lang="clr-namespace:DyeingComputer.Properties" 
              mc:Ignorable="d" Loaded="UserControl_Loaded"
-             d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
+             d:DesignHeight="630" d:DesignWidth="1280">
     <Grid>
         <DataGrid x:Name="Grid" AlternationCount="2" Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=99}" AutoGenerateColumns="False" 
          HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"         

View/TechnologicalProcessView.xaml

@@ -6,17 +6,17 @@
              xmlns:local="clr-namespace:DyeingComputer.View"
              xmlns:lang="clr-namespace:DyeingComputer.Properties"              
              mc:Ignorable="d" 
-            d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
+             d:DesignHeight="630" d:DesignWidth="1280">
     <Grid>
-        <TextBlock x:Name="log" HorizontalAlignment="Left" Margin="0,0,0,0" TextWrapping="Wrap" Width="400" FontSize="20" MinHeight="630" Background="White"/>
+        <TextBlock x:Name="log" HorizontalAlignment="Left" Margin="0,0,0,0" TextWrapping="Wrap" Width="600" FontSize="20" Background="White"/>
-        <TextBlock x:Name="name" HorizontalAlignment="Left" Margin="400,0,0,0" TextWrapping="Wrap" FontSize="24" Background="#FFD0D0D0" Text="NAME" Height="30" Block.TextAlignment="Center">
+        <TextBlock x:Name="name" HorizontalAlignment="Left" Margin="600,0,0,0" TextWrapping="Wrap" FontSize="24" Background="#FFD0D0D0" Text="NAME" Height="30" Block.TextAlignment="Center">
             <TextBlock.LayoutTransform>
                 <!--文字同样旋转90度-->
                 <RotateTransform Angle="270"/>
             </TextBlock.LayoutTransform>
         </TextBlock>
         <DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True"
-      Margin="430,0,0,0" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"       
+      Margin="630,0,0,0" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"       
       HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="Black"         
       BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"      
       CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"

View/TechnologicalProcessView.xaml.cs

@@ -24,5 +24,7 @@ namespace DyeingComputer.View
         {
             InitializeComponent();
         }
+
+        public static object workName;
     }
 }

View/WorkOrderView.xaml

@@ -10,7 +10,7 @@
              xmlns:ConvertMoels="clr-namespace:DyeingComputer.ConvertMoels"
              d:DataContext="{d:DesignInstance Type=viewmodel:WorkOrderViewModel}"
              mc:Ignorable="d" KeyDown="UserControl_KeyDown"
-             d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
+             d:DesignHeight="630" d:DesignWidth="1280" >
     <UserControl.Resources>
         <ConvertMoels:StatenConvert x:Key="StatenConvert"/>
         <ConvertMoels:GramsSQLConvert x:Key="GramsSQLConvert"/>
@@ -58,7 +58,6 @@
                     </Style.Triggers>
                 </Style>
             </DataGrid.CellStyle>
-
             <DataGrid.Columns>
                 <!--列信息绑定-->
                 <DataGridTextColumn Header="{x:Static lang:Resources.WorkOrderNumder}" Width="250" Binding="{Binding WorkOrder}" IsReadOnly="True">
@@ -84,7 +83,6 @@
                 <DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Width="*" Binding="{Binding Remark}" IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
-
         <ScottPlot:WpfPlot x:Name="tu" Margin="0,40,0,0" Height="300" VerticalAlignment="Top" />
     </Grid>
 </UserControl>

View/WorkOrderView.xaml.cs

@@ -3,6 +3,7 @@ using DyeingComputer.ViewModel;
 using ScottPlot;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
 using System.Linq;
 using System.Text;
@@ -158,6 +159,10 @@ namespace DyeingComputer.View
             if (e.Key == Key.K) 
             {
                 MainWindowViewModel.WorkNumder = WorkOrder_Numder;
+                TechnologicalProcessView.workName = Process_id;
+
+                var _mainWindow = Application.Current.Windows .Cast<Window>() .FirstOrDefault(window => window is MainWindow) as MainWindow;//跨页面
+                _mainWindow.container.Content = new TechnologicalProcessView();//获取控件
             }
         }
     }