修改样式

BlankApp1/BlankApp1/Views/MainWindow.xaml

@@ -13,6 +13,12 @@
   MouseMove="Window_MouseMove"
   AllowsTransparency="True"
   WindowStyle="None">
+    <Window.Style>
+        <Style TargetType="Window">
+            <Setter Property="BorderBrush" Value="#C5C5C5"/>
+            <Setter Property="BorderThickness" Value="1"/>
+        </Style>
+    </Window.Style>
     <Window.Resources>
         <Style TargetType="TextBlock" x:Key="txtHeadStyle">
             <Setter Property="FontSize" Value="14"/>
@@ -85,15 +91,15 @@
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="50"/>
+            <RowDefinition Height="60"/>
             <RowDefinition />
             <RowDefinition Height="30"/>
         </Grid.RowDefinitions>
         <Border Grid.Row="0"  BorderBrush="#CBCBCB" BorderThickness="0,0,0,1" />
         <Grid Grid.Row="0"  Cursor="Hand"  >
-            <StackPanel Orientation="Horizontal" Margin="15,5,0,2">
-                <Image Source="../Assets/Images/Logo.png" Height="42" Width="auto"/>
-                <TextBlock FontSize="26"  Text="PLC测试平台" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="10,0,0,0" />
+            <StackPanel Orientation="Horizontal" >
+                <Image Source="../Assets/Images/Logo.png" HorizontalAlignment="Stretch" Stretch="Uniform" Height="42" Width="140" Margin="0,15,0,0" />
+                <TextBlock FontSize="24"  Text="PLC点位测试平台" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="10,0,0,0" />
 
             </StackPanel>
             <StackPanel  Orientation="Horizontal" HorizontalAlignment="Right" Margin=" 0,0,14,0">
@@ -112,19 +118,7 @@
                 <ColumnDefinition Width="180"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <StackPanel Grid.Column="0" Orientation="Vertical">
-                <RadioButton Content="基础配置" Tag="&#xe62d;" Style="{StaticResource NavTabButtonStyle}" IsChecked="True"
-                                    CommandParameter="BaseConfigView" Margin="5,10,0,10"/>
-                <RadioButton Content="业务管理" Tag="&#xe626;" Style="{StaticResource NavTabButtonStyle}" 
-                                    CommandParameter="TestTwoView" Margin="5,0,0,10"/>
-                <RadioButton Content="监控管理" Tag="&#xe600;" Style="{StaticResource NavTabButtonStyle}" 
-                                    Command="{Binding BackCommand}" Margin="5,0,0,10"/>
-                <RadioButton Content="下一步" Tag="&#xe601;" Style="{StaticResource NavTabButtonStyle}" 
-                                    Command="{Binding NextCommand}" Margin="5,0,0,10"/>
-                <RadioButton Content="数据查询" Tag="&#xe600;" Style="{StaticResource NavTabButtonStyle}" 
-                            CommandParameter="QueryView" Margin="5,0,0,10"/>
-
-            </StackPanel>
+          
             <Border Grid.Column="1" BorderBrush="#CBCBCB" BorderThickness="1,0,0,0"></Border>
             <ContentControl Grid.Column="0" prism:RegionManager.RegionName="MenuRegion"  />
             <Grid Grid.Column="1">
@@ -172,5 +166,8 @@
             </StackPanel>
 
         </Border>
+        <Grid Grid.RowSpan="3"  Background="#80000000" Visibility="Collapsed"/>
+
+    
     </Grid>
 </Window>

BlankApp1/BlankApp1/Views/TreeMenuView.xaml

@@ -73,7 +73,7 @@
                                 <ToggleButton x:Name="Expander" Grid.Column="1" ClickMode="Press"
                                                       IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
                                                       Template="{StaticResource ArrowButtonTemplate}"/>
-                                <ItemsPresenter x:Name="ItemsHost" Margin="18,0,0,0" Grid.ColumnSpan="2" Grid.Row="1" />
+                                <ItemsPresenter x:Name="ItemsHost" Margin="10,0,0,0" Grid.ColumnSpan="2" Grid.Row="1" />
                             </Grid>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsExpanded" Value="false">
@@ -106,7 +106,7 @@
             </Style>
         </Grid.Resources>
         <TreeView BorderThickness="0" Background="Transparent" 
-                  ItemsSource="{Binding Menus}" Margin="0,15,5,15"
+                  ItemsSource="{Binding Menus}" Margin="0,5,5,15"
                   ScrollViewer.VerticalScrollBarVisibility="Auto">
             <TreeView.ItemTemplate>
                 <HierarchicalDataTemplate ItemsSource="{Binding Children}">