修改样式

BlankApp1/BlankApp1/Views/BusinessManageView/DeviceResultCardView.xaml

@@ -7,56 +7,59 @@
              xmlns:prism="http://prismlibrary.com/"
               prism:ViewModelLocator.AutoWireViewModel="True"
              Height="240" Width="280">
-    <Grid>
+    <Border BorderBrush="#CBCBCB"  BorderThickness="1" CornerRadius="5">
+        <Grid>
 
-        <Grid.InputBindings>
-            <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DoubleClickCommand}" CommandParameter="{Binding ElementName=txtName}">
-            </MouseBinding>
-        </Grid.InputBindings>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="0.6*"/>
-            <RowDefinition/>
-        </Grid.RowDefinitions>
-        <Border BorderBrush="#CBCBCB" Grid.Row="1" BorderThickness="1"/>
-        <Grid Grid.Row="0" Background="#409EFF" >
-            <TextBlock  x:Name="txtName" Text="{Binding ProjectName}" Foreground="White" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-        </Grid>
-
-        <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="2*"/>
-                <ColumnDefinition Width="3*"/>
-            </Grid.ColumnDefinitions>
+            <Grid.InputBindings>
+                <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DoubleClickCommand}" CommandParameter="{Binding ElementName=txtName}">
+                </MouseBinding>
+            </Grid.InputBindings>
             <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
+                <RowDefinition Height="0.6*"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <Grid.Resources>
-                <Style TargetType="Label">
-                    <Setter Property="FontSize" Value="20"/>
-                    <Setter Property="Width" Value="auto"/>
-                    <Setter Property="HorizontalAlignment" Value="Right"/>
-                    <Setter Property="VerticalAlignment" Value="Center"/>
-                    <Setter Property="Margin" Value="10 0 0 0"/>
-                </Style>
-            </Grid.Resources>
-            <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}"  Grid.Row="0" Text="项目代号：" TextAlignment="Right"/>
-            <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" Grid.Row="1" Text="负责人：" TextAlignment="Right"/>
-            <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" Grid.Row="2" Text="设备数量：" TextAlignment="Right"/>
-            <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" Grid.Row="3" Text="已测设备数量：" TextAlignment="Right"/>
-            <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" Grid.Row="4" Text="通过设备数量：" TextAlignment="Right"/>
-            <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" Grid.Row="5" Text="不通过设备数量：" TextAlignment="Right"/>
-            <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtProjectNo"  Grid.Row="0" Grid.Column="1" />
-            <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtProjectLeader" Grid.Row="1" Grid.Column="1"  HorizontalAlignment="Left"/>
-            <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtDeviceCount" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left"/>
-            <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtTestCount" Grid.Row="3" Grid.Column="1"  HorizontalAlignment="Left"/>
-            <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtPassCount" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left"/>
-            <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtNoPassCount" Grid.Row="5" Grid.Column="1"  HorizontalAlignment="Left"/>
-        </Grid>
+          
+            <Border Grid.Row="0" Background="#409EFF" CornerRadius="5,5,0,0" >
+                <TextBlock  x:Name="txtName" Text="{Binding ProjectName}" Foreground="White" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+            </Border>
 
-    </Grid>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="3*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <Grid.Resources>
+                    <Style TargetType="Label">
+                        <Setter Property="FontSize" Value="20"/>
+                        <Setter Property="Width" Value="auto"/>
+                        <Setter Property="HorizontalAlignment" Value="Right"/>
+                        <Setter Property="VerticalAlignment" Value="Center"/>
+                        <Setter Property="Margin" Value="10 0 0 0"/>
+                    </Style>
+                </Grid.Resources>
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}"  Grid.Row="0" Text="项目代号：" TextAlignment="Right"/>
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" Grid.Row="1" Text="负责人：" TextAlignment="Right"/>
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" Grid.Row="2" Text="设备数量：" TextAlignment="Right"/>
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" Grid.Row="3" Text="已测设备数量：" TextAlignment="Right"/>
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" Grid.Row="4" Text="通过设备数量：" TextAlignment="Right"/>
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" Grid.Row="5" Text="不通过设备数量：" TextAlignment="Right"/>
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtProjectNo"  Grid.Row="0" Grid.Column="1" />
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtProjectLeader" Grid.Row="1" Grid.Column="1"  HorizontalAlignment="Left"/>
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtDeviceCount" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left"/>
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtTestCount" Grid.Row="3" Grid.Column="1"  HorizontalAlignment="Left"/>
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtPassCount" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left"/>
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtNoPassCount" Grid.Row="5" Grid.Column="1"  HorizontalAlignment="Left"/>
+            </Grid>
+
+        </Grid>
+    </Border>
+      
 </UserControl>

BlankApp1/BlankApp1/Views/BusinessManageView/DeviceTestCardView.xaml

@@ -7,21 +7,22 @@
               xmlns:prism="http://prismlibrary.com/"
               prism:ViewModelLocator.AutoWireViewModel="True"
              Height="240" Width="280">
-    <Grid>
-      
+    <Border BorderBrush="#CBCBCB"  BorderThickness="1" CornerRadius="5">
+        <Grid>
+
             <Grid.InputBindings>
-            <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DoubleClickCommand}" CommandParameter="{Binding ElementName=txtName}">
+                <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DoubleClickCommand}" CommandParameter="{Binding ElementName=txtName}">
                 </MouseBinding>
             </Grid.InputBindings>
             <Grid.RowDefinitions>
                 <RowDefinition Height="0.6*"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <Border BorderBrush="#CBCBCB" Grid.Row="1" BorderThickness="1"/>
-            <Grid Grid.Row="0" Background="#409EFF" >
-                <TextBlock  x:Name="txtName" Text="{Binding ProjectName}" Foreground="White" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Grid>
             
+            <Border Grid.Row="0" Background="#409EFF" CornerRadius="5,5,0,0" >
+                <TextBlock  x:Name="txtName" Text="{Binding ProjectName}" Foreground="White" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+            </Border>
+
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="2*"/>
@@ -52,6 +53,8 @@
                 <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtDeviceCount" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left"/>
                 <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtNoTestCount" Grid.Row="3" Grid.Column="1"  HorizontalAlignment="Left"/>
             </Grid>
-  
-    </Grid>
+
+        </Grid>
+    </Border>
+   
 </UserControl>