修改样式

BlankApp1/BlankApp1/Views/BusinessManageView/DeviceTestView.xaml

@@ -21,13 +21,22 @@
             </b:EventTrigger>
         </b:Interaction.Triggers>
         <Grid.RowDefinitions>
+            <RowDefinition Height="30"/>
             <RowDefinition Height="40"/>
             <RowDefinition Height="40"/>
             <RowDefinition/>
             <RowDefinition Height="40"/>
+            <RowDefinition Height="30"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <UniformGrid Grid.Row="0" Columns="4">
+        <DockPanel Grid.Row="0"  >
+            <StackPanel Orientation="Horizontal" >
+                <TextBlock Text="▊"  TextAlignment="Center" VerticalAlignment="Center" Foreground="#409EFF" Margin="5,0,5,0"/>
+                <TextBlock Text="设备列表"  Style="{StaticResource NormalTextBlockStyle}" Margin="0,0,5,0"/>
+            </StackPanel>
+            <Button Content="返回" Width="80"  Margin="15,0"  HorizontalAlignment="Right" Command="{Binding GoBackCommand}" Style="{StaticResource NormalButtonStyle}" Background="#EC808D" />
+        </DockPanel>
+        <UniformGrid Grid.Row="1" Columns="4">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="设备编号:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
                 <TextBox  Height="28" Width="120" Text="{Binding DeviceNo}" />
@@ -48,7 +57,7 @@
 
 
         </UniformGrid>
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition/>
@@ -66,12 +75,11 @@
             <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
 
                 <Button  Content="查询" Width="80"  Margin="5,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" />
-                <Button  Content="重置" Width="80"  Margin="5,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" />
-                
-                <Button Content="返回" Width="80"  Margin="5,0"  Command="{Binding GoBackCommand}" Style="{StaticResource NormalButtonStyle}" />
+                <Button  Content="重置" Width="80"  Margin="15,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" Background="#7F7F7F" />
+
             </StackPanel>
         </Grid>
-        <DataGrid  Grid.Row="2"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
+        <DataGrid  Grid.Row="3"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
                  ItemsSource="{Binding DeviceItemList}" IsReadOnly="True" Padding="0" HorizontalScrollBarVisibility="Disabled" >
             <b:Interaction.Triggers>
@@ -94,7 +102,7 @@
             </DataGrid.Columns>
 
         </DataGrid>
-        <Grid Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Grid Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center">
             <wpfdev:Pagination IsLite="False"    Margin="0"  Width="auto" Height="30" HorizontalAlignment="Center"  
                        Count="{Binding TotalCount,Mode=TwoWay}" 
                        CountPerPage="{Binding CountPerPage,Mode=TwoWay}"
@@ -107,7 +115,13 @@
                 </hc:Interaction.Triggers>
             </hc:Pagination>-->
         </Grid>
-        <DataGrid  Grid.Row="4"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
+        <StackPanel Grid.Row="5" Orientation="Horizontal">
+            <StackPanel Orientation="Horizontal" >
+                <TextBlock Text="▊"  TextAlignment="Center" VerticalAlignment="Center" Foreground="#409EFF" Margin="5,0,5,0"/>
+                <TextBlock Text="测试方案列表"  Style="{StaticResource NormalTextBlockStyle}" Margin="0,0,5,0"/>
+            </StackPanel>
+        </StackPanel>
+        <DataGrid  Grid.Row="6"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
            ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
           ItemsSource="{Binding SchItemList}" IsReadOnly="True" Padding="0"  HorizontalScrollBarVisibility="Disabled">
             <DataGrid.Columns >

BlankApp1/BlankApp1/Views/BusinessManageView/ProjectTestResultView.xaml

@@ -20,8 +20,8 @@
         </b:Interaction.Triggers>
 
         <Grid.RowDefinitions>
-            <RowDefinition Height="60"/>
-            <RowDefinition Height="60"/>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="50"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
 
@@ -51,11 +51,11 @@
 
 
         </StackPanel>
-        <Border Grid.Row="1"  BorderBrush="#CBCBCB" BorderThickness="0,1" />
+        <Border Grid.Row="1"  BorderBrush="#CBCBCB" BorderThickness="0,0,0,1" />
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" >
 
             <Button  Content="查询" Width="80"  Margin="5,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" />
-            <Button  Content="重置" Width="80"  Margin="15,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" />
+            <Button  Content="重置" Width="80"  Margin="15,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" Background="#7F7F7F"/>
         </StackPanel>
     
         <ScrollViewer Grid.Row="2">

BlankApp1/BlankApp1/Views/BusinessManageView/ProjectTestView.xaml

@@ -20,8 +20,8 @@
         </b:Interaction.Triggers>
       
             <Grid.RowDefinitions>
-                <RowDefinition Height="60"/>
-                <RowDefinition Height="60"/>
+                <RowDefinition Height="50"/>
+                <RowDefinition Height="50"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
       
@@ -49,13 +49,12 @@
                 <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding EndTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
             </StackPanel>
             
-
         </StackPanel>
-        <Border Grid.Row="1"  BorderBrush="#CBCBCB" BorderThickness="0,1" />
+        <Border Grid.Row="1"  BorderBrush="#CBCBCB" BorderThickness="0,0,0,1" />
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" >
 
             <Button  Content="查询" Width="80"  Margin="5,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" />
-            <Button  Content="重置" Width="80"  Margin="15,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" />
+            <Button  Content="重置" Width="80"  Margin="15,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" Background=" #7F7F7F" />
         </StackPanel>
      
         <ScrollViewer Grid.Row="2">

BlankApp1/BlankApp1/Views/BusinessManageView/ResultQueryView.xaml

@@ -21,13 +21,22 @@
             </b:EventTrigger>
         </b:Interaction.Triggers>
         <Grid.RowDefinitions>
+            <RowDefinition Height="30"/>
             <RowDefinition Height="40"/>
             <RowDefinition Height="40"/>
             <RowDefinition/>
             <RowDefinition Height="40"/>
+            <RowDefinition Height="30"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <UniformGrid Grid.Row="0" Columns="4">
+        <DockPanel Grid.Row="0"  >
+            <StackPanel Orientation="Horizontal" >
+                <TextBlock Text="▊"  TextAlignment="Center" VerticalAlignment="Center" Foreground="#409EFF" Margin="5,0,5,0"/>
+                <TextBlock Text="设备列表"  Style="{StaticResource NormalTextBlockStyle}" Margin="0,0,5,0"/>
+            </StackPanel>
+            <Button Content="返回" Width="80"  Margin="15,0"  HorizontalAlignment="Right" Command="{Binding GoBackCommand}" Style="{StaticResource NormalButtonStyle}" Background="#EC808D" />
+        </DockPanel>
+        <UniformGrid Grid.Row="1" Columns="4">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="设备编号:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
                 <TextBox  Height="28" Width="120" Text="{Binding DeviceNo}" />
@@ -48,7 +57,7 @@
 
 
         </UniformGrid>
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition/>
@@ -66,12 +75,11 @@
             <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
 
                 <Button  Content="查询" Width="80"  Margin="5,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" />
-                <Button  Content="重置" Width="80"  Margin="5,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" />
+                <Button  Content="重置" Width="80"  Margin="15,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" Background="#7F7F7F"/>
                 
-                <Button Content="返回" Width="80"  Margin="5,0"  Command="{Binding GoBackCommand}" Style="{StaticResource NormalButtonStyle}" />
             </StackPanel>
         </Grid>
-        <DataGrid  Grid.Row="2"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
+        <DataGrid  Grid.Row="3"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
        ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
       ItemsSource="{Binding DeviceResultItemList}" IsReadOnly="True" Padding="0" HorizontalScrollBarVisibility="Disabled" >
             <b:Interaction.Triggers>
@@ -93,7 +101,7 @@
             </DataGrid.Columns>
 
         </DataGrid>
-        <Grid Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Grid Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center">
             <wpfdev:Pagination IsLite="False"    Margin="0"  Width="auto" Height="30" HorizontalAlignment="Center"  
                        Count="{Binding TotalCount,Mode=TwoWay}" 
                        CountPerPage="{Binding CountPerPage,Mode=TwoWay}"
@@ -106,8 +114,13 @@
                 </hc:Interaction.Triggers>
             </hc:Pagination>-->
         </Grid>
-
-        <Grid Grid.Row="4">
+        <StackPanel Grid.Row="5" Orientation="Horizontal">
+            <StackPanel Orientation="Horizontal" >
+                <TextBlock Text="▊"  TextAlignment="Center" VerticalAlignment="Center" Foreground="#409EFF" Margin="5,0,5,0"/>
+                <TextBlock Text="测试记录列表"  Style="{StaticResource NormalTextBlockStyle}" Margin="0,0,5,0"/>
+            </StackPanel>
+        </StackPanel>
+        <Grid Grid.Row="6">
             <DataGrid  Grid.Row="2"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
  ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
 ItemsSource="{Binding SchItemResultList}" IsReadOnly="True" Padding="0"  HorizontalScrollBarVisibility="Disabled">