TestPlatfoming.git

			@@ -16,13 +16,7 @@
			<UserControl.Resources>
			<ResourceDictionary>
			<ResourceDictionary.MergedDictionaries>
			<pu:StyleDictionary Includes="TreeView" />
			<ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
			<ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
			</ResourceDictionary.MergedDictionaries>

			<uic:PathImageConverter x:Key="path2Image"/>
			<uic:DataGridRowNumberConverter x:Key="rowNumber"/>
			</ResourceDictionary>
			</UserControl.Resources>
			<Border Style="{StaticResource CardBoarder}">
			@@ -41,10 +35,11 @@
			<DockPanel Grid.ColumnSpan="2">
			<StackPanel DockPanel.Dock="Right" Style="{StaticResource ButtonGroup}">
			<Button Style="{StaticResource AddBtn}" x:Name="addBtn" Click="Button_Click"/>
			<Button Style="{StaticResource EditBtn}" x:Name="editBtn" Click="Button_Click"/>
			<Button Style="{StaticResource RfhBtn}" x:Name="rfhBtn" Click="Button_Click"/>
			<Button Style="{StaticResource DelBtn}" x:Name="delBtn" Click="Button_Click"/>
			</StackPanel>
			<TextBlock Style="{StaticResource TitleBox}" Text="数据查询"/>
			<TextBlock Style="{StaticResource TitleBox}" Text="{DynamicResource Dv.Title}"/>
			</DockPanel>

			<!--<Grid>
			@@ -55,28 +50,40 @@
			</Grid>-->
			<StackPanel Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" Style="{StaticResource ButtonGroup}">

			<TextBlock Style="{StaticResource TitleBox}" FontSize="{StaticResource ContentFontSize2}" Text="开始时间"/>
			<TextBlock Style="{StaticResource TitleBox}" FontSize="{StaticResource ContentFontSize2}"
			Text="{DynamicResource Dv.SelectItem}"/>
			<ComboBox x:Name="programInput"
			MinWidth="180"
			SelectionChanged="programInput_SelectionChanged"/>

			<TextBlock Style="{StaticResource TitleBox}" FontSize="{StaticResource ContentFontSize2}"
			Text="{DynamicResource App.StartTime}"/>
			<pu:DateTimePicker Style="{StaticResource TimePicker}" SelectedDateTime="{x:Null}" x:Name="startTimeInput"/>
			<TextBlock Style="{StaticResource TitleBox}" FontSize="{StaticResource ContentFontSize2}" Text="结束时间"/>
			<TextBlock Style="{StaticResource TitleBox}" FontSize="{StaticResource ContentFontSize2}"
			Text="{DynamicResource App.EndTime}"/>
			<pu:DateTimePicker Style="{StaticResource TimePicker}" SelectedDateTime="{x:Null}" x:Name="endTimeInput"/>

			<Button Style="{StaticResource PrimaryButton}" pu:ButtonHelper.Icon=""
			x:Name="srhBtn" Click="Button_Click">查询</Button>

			<Button Style="{StaticResource QueryBtn}"
			x:Name="srhBtn" Click="Button_Click"/>

			<Button Style="{StaticResource PrimaryButton}" pu:ButtonHelper.Icon=""
			x:Name="resetBtn" Click="Button_Click">重置</Button>
			<Button Style="{StaticResource ResetBtn}"
			x:Name="resetBtn" Click="Button_Click"/>

			<Menu x:Name="anyBtn" Style="{StaticResource CommonMenu}">
			<Button Style="{StaticResource ExportBtn}"
			x:Name="exportBtn" Click="Button_Click"/>

			<!--<Menu x:Name="anyBtn" Style="{StaticResource CommonMenu}">
			<MenuItem Header="分析">
			<MenuItem Header="CPK" Click="MenuItem_Click"/>
			<MenuItem Header="RandR" />
			</MenuItem>
			</Menu>
			</Menu>-->

			</StackPanel>

			<DockPanel Grid.Row="2" Grid.ColumnSpan="2" Margin="0,10,0,0">
			<pu:Drawer DockPanel.Dock="Left" x:Name="DrwMenu" MinWidth="34" MaxWidth="400"
			<pu:Drawer DockPanel.Dock="Left" x:Name="DrwMenu" MinWidth="35" MaxWidth="400"
			Padding="0"
			ShadowColor="{x:Null}"
			AnimationDuration="0" BorderThickness="2,0,0,2" BorderBrush="{StaticResource CommonBoarder}">
			@@ -90,42 +97,48 @@
			<ColumnDefinition Width="Auto"/>
			</Grid.ColumnDefinitions>

			<DockPanel Grid.ColumnSpan="2" Background="{StaticResource CommonBoarder}">
			<ToggleButton x:Name="drawerBtn" BorderThickness="0"
			DockPanel.Dock="Right"
			Background="Transparent"
			Width="34" Height="34" HorizontalAlignment="Right"
			RenderTransformOrigin="0.5,0.5"
			FontFamily="{StaticResource iconfont}"
			Content="" IsChecked="{Binding IsOpen, ElementName=DrwMenu, Mode=TwoWay}">
			<ToggleButton.Style>
			<Style TargetType="ToggleButton" BasedOn="{StaticResource CommonToggle}">
			<Style.Triggers>
			<DataTrigger Binding="{Binding IsOpen, ElementName=DrwMenu}" Value="False">
			<Setter Property="RenderTransform">
			<Setter.Value>
			<RotateTransform Angle="-90"/>
			</Setter.Value>
			</Setter>
			</DataTrigger>
			<DataTrigger Binding="{Binding IsOpen, ElementName=DrwMenu}" Value="True">
			<Setter Property="Background" Value="Red"/>
			<Setter Property="RenderTransform">
			<Setter.Value>
			<RotateTransform Angle="90"/>
			</Setter.Value>
			</Setter>
			</DataTrigger>
			<Trigger Property="IsChecked" Value="True">
			<Setter Property="Background" Value="Red"/>
			</Trigger>
			</Style.Triggers>
			</Style>
			</ToggleButton.Style>
			</ToggleButton>
			<Border Grid.ColumnSpan="2" BorderThickness="2" BorderBrush="{StaticResource CommonBoarder}" Background="{StaticResource VerBar}">
			<DockPanel Height="35">
			<ToggleButton x:Name="drawerBtn" BorderThickness="0"
			DockPanel.Dock="Right"
			Background="Transparent"
			Width="35" Height="35" HorizontalAlignment="Right"
			RenderTransformOrigin="0.5,0.5"
			Foreground="{StaticResource PrimaryColorContract}"
			FontFamily="{StaticResource iconfont}"
			Content="" IsChecked="{Binding IsOpen, ElementName=DrwMenu, Mode=TwoWay}">
			<ToggleButton.Style>
			<Style TargetType="ToggleButton" BasedOn="{StaticResource CommonToggle}">
			<Style.Triggers>
			<DataTrigger Binding="{Binding IsOpen, ElementName=DrwMenu}" Value="False">
			<Setter Property="RenderTransform">
			<Setter.Value>
			<RotateTransform Angle="-90"/>
			</Setter.Value>
			</Setter>
			</DataTrigger>
			<DataTrigger Binding="{Binding IsOpen, ElementName=DrwMenu}" Value="True">
			<Setter Property="Background" Value="Red"/>
			<Setter Property="RenderTransform">
			<Setter.Value>
			<RotateTransform Angle="90"/>
			</Setter.Value>
			</Setter>
			</DataTrigger>
			<Trigger Property="IsChecked" Value="True">
			<Setter Property="Background" Value="Red"/>
			</Trigger>
			</Style.Triggers>
			</Style>
			</ToggleButton.Style>
			</ToggleButton>

			<TextBlock Text="高级查询" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
			</DockPanel>
			<TextBlock Text="{DynamicResource Dv.Advanced}" FontSize="16"
			Foreground="{StaticResource PrimaryColorContract}"
			VerticalAlignment="Center" HorizontalAlignment="Center"/>
			</DockPanel>
			</Border>


			<Grid Grid.Row="1">
			<Grid.RowDefinitions>
			@@ -137,12 +150,12 @@
			<ColumnDefinition/>
			</Grid.ColumnDefinitions>

			<DockPanel Margin="10,10,10,0" Grid.ColumnSpan="2">
			<Label Content="选择查询项目"/>
			<!--<DockPanel Margin="10,10,10,0" Grid.ColumnSpan="2">
			<Label Content="{DynamicResource Dv.SelectItem}"/>
			<ComboBox Grid.Column="1" x:Name="programInput" SelectionChanged="programInput_SelectionChanged"/>
			</DockPanel>
			</DockPanel>-->

			<DataGrid Margin="10" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource DefaultDataGrid}"
			<DataGrid Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource DefaultDataGrid}"
			IsReadOnly="False"
			SelectionMode="Single"
			BorderThickness="0"
			@@ -156,9 +169,17 @@
			</DataTemplate>
			</DataGridTemplateColumn.CellTemplate>
			</DataGridTemplateColumn>
			<DataGridTextColumn IsReadOnly="True" Width="*" Binding="{Binding Key}" Header="筛选条件" />

			<DataGridTemplateColumn Width="*" Header="对比方式">
			<DataGridTextColumn IsReadOnly="True" Width="*" Binding="{Binding Key}">
			<DataGridTextColumn.Header>
			<TextBlock Text="{DynamicResource Dv.Field}"/>
			</DataGridTextColumn.Header>
			</DataGridTextColumn>

			<DataGridTemplateColumn Width="*">
			<DataGridTemplateColumn.Header>
			<TextBlock Text="{DynamicResource Dv.Condition}"/>
			</DataGridTemplateColumn.Header>
			<DataGridTemplateColumn.CellTemplate>
			<DataTemplate>
			<TextBlock Text="{Binding Condition}"/>
			@@ -178,7 +199,10 @@
			</DataGridTemplateColumn.CellEditingTemplate>
			</DataGridTemplateColumn>

			<DataGridTextColumn Width="*" Binding="{Binding Value}" Header="筛选值" >
			<DataGridTextColumn Width="*" Binding="{Binding Value}" >
			<DataGridTextColumn.Header>
			<TextBlock Text="{DynamicResource Dv.Value}"/>
			</DataGridTextColumn.Header>
			<DataGridTextColumn.HeaderTemplate>
			<DataTemplate>
			<StackPanel Orientation="Horizontal">
			@@ -196,7 +220,7 @@
			<Label Grid.Row="1" Grid.Column="1" Width="100" Height="34"
			VerticalContentAlignment="Center"
			HorizontalContentAlignment="Center"
			Content="高级查询"
			Content="{DynamicResource Dv.Advanced}"
			FontSize="16">
			<Label.LayoutTransform>
			<RotateTransform CenterX="25" CenterY="25" Angle="270"/>