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

View/CurveDiagramView.xaml

@@ -6,7 +6,5 @@
              xmlns:local="clr-namespace:DyeingComputer.View"
              mc:Ignorable="d" 
              d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
-    <Grid>
+    <Grid/>
-            
-    </Grid>
 </UserControl>

View/EquipmentSimulationView.xaml

@@ -6,7 +6,5 @@
              xmlns:local="clr-namespace:DyeingComputer.View"
              mc:Ignorable="d" 
              d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
-    <Grid>
+    <Grid/>
-            
-    </Grid>
 </UserControl>

View/HistoryRecordsView.xaml

@@ -6,7 +6,5 @@
              xmlns:local="clr-namespace:DyeingComputer.View"
              mc:Ignorable="d" 
              d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
-    <Grid>
+    <Grid/>
-            
-    </Grid>
 </UserControl>

View/TechnologicalProcessView.xaml

@@ -4,9 +4,67 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:DyeingComputer.View"
+             xmlns:lang="clr-namespace:DyeingComputer.Properties"              
              mc:Ignorable="d" 
             d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
     <Grid>
+        <TextBox HorizontalAlignment="Left" Margin="0,0,0,0" TextWrapping="Wrap" Text="TextBox" Width="400"/>
         
+        <DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True"
+      Margin="400,0,0,0" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"       
+      HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"         
+      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">
+            <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 Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTextColumn Binding="{Binding Program}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="60" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="100" Binding="{Binding StepID}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}" Width="300" Binding="{Binding StepName}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="*" Binding="{Binding ParameterName}" IsReadOnly="True"/>
+                <DataGridTextColumn Binding="{Binding Parameter1}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTextColumn Binding="{Binding Parameter2}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTextColumn Binding="{Binding Parameter3}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTextColumn Binding="{Binding Parameter4}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTextColumn Binding="{Binding Parameter5}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTextColumn Binding="{Binding Parameter6}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTextColumn Binding="{Binding Parameter7}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTextColumn Binding="{Binding Parameter8}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTextColumn Binding="{Binding Parameter9}" Width="0" MinWidth="0" MaxWidth="0"/>
+                <DataGridTextColumn Binding="{Binding Parameter10}" Width="0" MinWidth="0" MaxWidth="0"/>
+            </DataGrid.Columns>
+        </DataGrid>
     </Grid>
 </UserControl>