WPFProject/PanuonWindow.xaml
@@ -27,18 +27,6 @@
    <Window.Resources>
        <hc:LangConverter x:Key="lc"/>
        <dc:CollectionVisibility x:Key="cv"/>
        <Style x:Key="UserMenu" TargetType="Menu" BasedOn="{StaticResource {x:Static pu:StyleKeys.MenuStyle}}">
            <Setter Property="Background" Value="{StaticResource PrimaryColor}"/>
            <Setter Property="Foreground" Value="#FFF"/>
            <Setter Property="pu:IconHelper.FontFamily" Value="{StaticResource iconfont}"/>
            <Setter Property="pu:IconHelper.Margin" Value="0,0,10,0"/>
            <Setter Property="BorderThickness" Value="0"/>
            <Setter Property="Cursor" Value="Hand"/>
            <Setter Property="pu:MenuHelper.SubmenuItemsForeground" Value="#3a3a3a"/>
            <Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="White"/>
            <Setter Property="pu:MenuHelper.TopLevelItemsHoverBackground" Value="{x:Null}"/>
            <Setter Property="pu:MenuHelper.TopLevelDropDownPlacement" Value="BottomLeft"/>
        </Style>
    </Window.Resources>
    <Window.Background>
        <ImageBrush Stretch="Uniform" AlignmentX="Left" AlignmentY="Top"  
@@ -70,7 +58,30 @@
                    </Grid.RowDefinitions>
                    <StackPanel Grid.Row="0" VerticalAlignment="Top" Margin="10,10,0,0" Orientation="Horizontal">
                        <Menu Margin="0" Padding="0" VerticalAlignment="Top"
  VerticalContentAlignment="Center" Style="{StaticResource UserMenu}" Background="Transparent">
  VerticalContentAlignment="Center" Background="Transparent">
                            <Menu.Resources>
                                <ResourceDictionary>
                                    <ResourceDictionary.MergedDictionaries>
                                        <pu:StyleDictionary Includes="Menu" />
                                    </ResourceDictionary.MergedDictionaries>
                                </ResourceDictionary>
                            </Menu.Resources>
                            <Menu.Style>
                                <Style TargetType="Menu" BasedOn="{StaticResource {x:Static pu:StyleKeys.MenuStyle}}">
                                    <Setter Property="Background" Value="{StaticResource PrimaryColor}"/>
                                    <Setter Property="Foreground" Value="#FFF"/>
                                    <Setter Property="pu:IconHelper.FontFamily" Value="{StaticResource iconfont}"/>
                                    <Setter Property="pu:IconHelper.Margin" Value="0,0,10,0"/>
                                    <Setter Property="BorderThickness" Value="0"/>
                                    <Setter Property="Cursor" Value="Hand"/>
                                    <Setter Property="pu:MenuHelper.SubmenuItemsForeground" Value="#3a3a3a"/>
                                    <Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="White"/>
                                    <Setter Property="pu:MenuHelper.TopLevelItemsHoverBackground" Value="{x:Null}"/>
                                    <Setter Property="pu:MenuHelper.TopLevelDropDownPlacement" Value="BottomLeft"/>
                                </Style>
                            </Menu.Style>
                            <MenuItem x:Name="userMenu" Header="{Binding WelcomeTitle}" FontSize="16">
                                <MenuItem Icon="&#xe61d;" Cursor="Hand" FontSize="14" Header="退出登录" 
                                      x:Name="MiLogout" Click="MenuItem_Click"/>
@@ -134,7 +145,7 @@
    HorizontalContentAlignment="Left" Style="{StaticResource LinkButton}"
    Click="Clear_AllAlarm_Click"
    Content="清除全部报警"/>
                        <!--<local:ResourceUI x:Name="resourceUI" Loaded="resourceUI_Loaded" DockPanel.Dock="Right"/>-->
                        <!--<local:ResourceUI x:Name="resourceUI" Loaded="resourceUI_Loaded" DockPanel.Dock="Right"/>-->
                    </DockPanel>
                </Grid>