sc
/
Audit_APP
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP

master
忱 沈 4 years ago
committed by sc
parent
ba67f7d733 cae051635c
commit
90d8164362
4 changed files with 108 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      MainWindow.xaml
  2. 70
      View/QueryView.xaml
  3. 63
      View/StatisticsView.xaml
  4. 8
      View/StatisticsView.xaml.cs

1
MainWindow.xaml
View File

@ -115,7 +115,6 @@
<ImageBrush ImageSource="/Logo/sunlight_sc.png"/>
</Rectangle.Fill>
</Rectangle>
<!--righe-->
<Grid Grid.Column="1">
<ContentControl x:Name="container" Margin="180,0,0,0"/>

70
View/QueryView.xaml
View File

@ -8,36 +8,44 @@
d:DesignHeight="900" d:DesignWidth="1100">
<Grid>
<DataGrid HorizontalAlignment="Left" Margin="15,35,0,150" VerticalAlignment="Stretch" Width="300" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="Black" GridLinesVisibility="All" SelectionChanged="DataGrid_Directory" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1">
<DataGrid.Columns>
<DataGridTextColumn Header="工单" Width="160" FontSize="25"/>
<DataGridTextColumn Header="重染" Width="50" FontSize="25"/>
<DataGridTextColumn Header="染机" Width="90" FontSize="25"/>
</DataGrid.Columns>
</DataGrid>
<DataGrid HorizontalAlignment="Left" Margin="330,35,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="Black" GridLinesVisibility="All" SelectionChanged="DataGrid_Detailed" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1">
<DataGrid.Columns>
<DataGridTextColumn Header="步骤" Width="50" FontSize="25"/>
<DataGridTextColumn Header="原料代码" Width="100" FontSize="25"/>
<DataGridTextColumn Header="原料名称" Width="100" FontSize="25"/>
<DataGridTextColumn Header="目标用量" Width="150" FontSize="25"/>
<DataGridTextColumn Header="实际用量" Width="150" FontSize="25"/>
<DataGridTextColumn Header="偏差" Width="70" FontSize="25"/>
<DataGridTextColumn Header="结束时间" Width="300" FontSize="25"/>
</DataGrid.Columns>
</DataGrid>
<TextBox HorizontalAlignment="Left" Height="35" Margin="65,0,0,100" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="250"/>
<TextBox HorizontalAlignment="Left" Height="35" Margin="65,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="80"/>
<TextBox HorizontalAlignment="Left" Height="35" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115"/>
<DatePicker HorizontalAlignment="Left" Height="35" Margin="420,0,0,100" VerticalAlignment="Bottom" Width="225"/>
<DatePicker HorizontalAlignment="Left" Height="35" Margin="685,0,0,100" VerticalAlignment="Bottom" Width="225"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="工单" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="重染" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="155,0,0,50" TextWrapping="Wrap" Text="染机" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="330,0,0,50" TextWrapping="Wrap" Text="开单时间" VerticalAlignment="Bottom" Width="90" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="330,0,0,100" TextWrapping="Wrap" Text="日期范围" VerticalAlignment="Bottom" Width="90" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="45" Margin="645,0,0,101" TextWrapping="Wrap" Text="～" VerticalAlignment="Bottom" Width="40" FontSize="40"/>
<Label Content="" HorizontalAlignment="Left" Height="30" Margin="420,0,0,50" VerticalAlignment="Bottom" Width="225" Background="White" BorderBrush="#FFCCCCCC"/>
<Button Content="查询" HorizontalAlignment="Left" Height="65" Margin="935,0,0,50" VerticalAlignment="Bottom" Width="145" FontSize="40" BorderBrush="{x:Null}" Background="#FFCECECE" Click="Button_Click"/>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
</Border>
<Grid Grid.Row="1">
<DataGrid HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="300" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="Black" GridLinesVisibility="All" SelectionChanged="DataGrid_Directory" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1">
<DataGrid.Columns>
<DataGridTextColumn Header="工单" Width="160" FontSize="25"/>
<DataGridTextColumn Header="重染" Width="50" FontSize="25"/>
<DataGridTextColumn Header="染机" Width="90" FontSize="25"/>
</DataGrid.Columns>
</DataGrid>
<DataGrid HorizontalAlignment="Left" Margin="330,15,15,150" VerticalAlignment="Stretch" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="Black" GridLinesVisibility="All" SelectionChanged="DataGrid_Detailed" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1">
<DataGrid.Columns>
<DataGridTextColumn Header="步骤" Width="50" FontSize="25"/>
<DataGridTextColumn Header="原料代码" Width="100" FontSize="25"/>
<DataGridTextColumn Header="原料名称" Width="100" FontSize="25"/>
<DataGridTextColumn Header="目标用量" Width="150" FontSize="25"/>
<DataGridTextColumn Header="实际用量" Width="150" FontSize="25"/>
<DataGridTextColumn Header="偏差" Width="70" FontSize="25"/>
<DataGridTextColumn Header="结束时间" Width="300" FontSize="25"/>
</DataGrid.Columns>
</DataGrid>
<TextBox HorizontalAlignment="Left" Height="35" Margin="65,0,0,100" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="250"/>
<TextBox HorizontalAlignment="Left" Height="35" Margin="65,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="80"/>
<TextBox HorizontalAlignment="Left" Height="35" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115"/>
<DatePicker HorizontalAlignment="Left" Height="35" Margin="420,0,0,100" VerticalAlignment="Bottom" Width="225"/>
<DatePicker HorizontalAlignment="Left" Height="35" Margin="685,0,0,100" VerticalAlignment="Bottom" Width="225"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="工单" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="重染" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="155,0,0,50" TextWrapping="Wrap" Text="染机" VerticalAlignment="Bottom" Width="45" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="330,0,0,50" TextWrapping="Wrap" Text="开单时间" VerticalAlignment="Bottom" Width="90" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="330,0,0,100" TextWrapping="Wrap" Text="日期范围" VerticalAlignment="Bottom" Width="90" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="45" Margin="645,0,0,101" TextWrapping="Wrap" Text="～" VerticalAlignment="Bottom" Width="40" FontSize="40"/>
<Label Content="" HorizontalAlignment="Left" Height="30" Margin="420,0,0,50" VerticalAlignment="Bottom" Width="225" Background="White" BorderBrush="#FFCCCCCC"/>
<Button Content="查询" HorizontalAlignment="Left" Height="65" Margin="935,0,0,50" VerticalAlignment="Bottom" Width="145" FontSize="40" BorderBrush="{x:Null}" Background="#FFCECECE" Click="Button_Click"/>
</Grid>
</Grid>
</UserControl>

63
View/StatisticsView.xaml
View File

@ -5,8 +5,67 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Audit.View"
mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Statistics}"
d:DesignHeight="900" d:DesignWidth="1000">
d:DesignHeight="900" d:DesignWidth="1000"
xmlns:mah="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro">
<UserControl.Resources>
<Style x:Key="RadioButtonStyle" TargetType="{x:Type RadioButton}">
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}"/>
<Setter Property="BorderBrush" Value="#FFF0F0F0"/>
<Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}"/>
<Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Control}"/>
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}"/>
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}"/>
<Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="OverridesDefaultStyle" Value="True"/>
<Setter Property="Padding" Value="6 0 0 0"/>
<Setter Property="SnapsToDevicePixels" Value="True"/>
<Setter Property="Stylus.IsPressAndHoldEnabled" Value="False"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type RadioButton}">
<Grid>
<Border x:Name="border" Background="{TemplateBinding Background}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition>
</ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Grid.Column="1"
Text="{TemplateBinding Content}"
FontFamily="Fonts/#FontAwesome"
HorizontalAlignment="Center"
Width="40" FontSize="20" Margin="0,5,0,0"/>
</Grid>
</Border>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#FFA0A0A0" TargetName="border"/>
</Trigger>
<Trigger Property="IsChecked" Value="True">
<Setter Property="Background" Value="#FFF5F5F5" TargetName="border"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</UserControl.Resources>
<Grid>
<TextBlock Text="StatisticsView" FontSize="100"/>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
</Border>
<Grid Grid.Row="0">
<RadioButton Content="染料" HorizontalAlignment="Left" Height="30" Margin="0,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" Style="{DynamicResource RadioButtonStyle}" Checked="RadioButton_subdirectory"/>
<RadioButton Content="助剂" HorizontalAlignment="Left" Height="30" Margin="100,0,0,1" VerticalAlignment="Top" Width="100" Background="#FFE0E0E0" Style="{DynamicResource RadioButtonStyle}" Checked="RadioButton_subdirectory"/>
</Grid>
<Grid Grid.Row="1">
<Grid Grid.Column="1">
<ContentControl x:Name="ContentControl" Margin="0,31,0,0"/>
</Grid>
</Grid>
</Grid>
</UserControl>

8
View/StatisticsView.xaml.cs
View File

@ -20,9 +20,17 @@ namespace Audit.View
/// </summary>
public partial class StatisticsView : UserControl
{
///<Summary>
/// StatisticsView
///</Summary>
public StatisticsView()
{
InitializeComponent();
}
private void RadioButton_subdirectory(object sender, RoutedEventArgs e)
{
}
}
}

Write Preview
Loading…
Cancel
Save