冲突解决

BPASmartClient/MainWindow.xaml

@@ -6,6 +6,7 @@
         xmlns:local="clr-namespace:BPASmartClient"
         xmlns:vm="clr-namespace:BPASmartClient.ViewModel;assembly=BPASmartClient.ViewModel"
         xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+        xmlns:control="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
         Title="MainWindow" Width="1600"
         Height="900"
         AllowsTransparency="True"
@@ -17,69 +18,32 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
-                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml"/>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
     <Window.DataContext>
-        <vm:MainViewModel />
+        <vm:MainViewModel></vm:MainViewModel>
     </Window.DataContext>
-
-    <Border x:Name="br" Style="{DynamicResource border主窗体背景}">
+    
+    <Border Style="{DynamicResource border主窗体背景}" x:Name="br" >
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="60" />
-                <RowDefinition />
+                <RowDefinition Height="60"/>
+                <RowDefinition/>
             </Grid.RowDefinitions>
 
-            <!--  标题  -->
+            <!--标题-->
             <Grid Grid.Row="0">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="300" />
-                    <ColumnDefinition />
+                    <ColumnDefinition Width="300"></ColumnDefinition>
+                    <ColumnDefinition ></ColumnDefinition>
                 </Grid.ColumnDefinitions>
                 <Border Grid.ColumnSpan="2" Style="{DynamicResource bordertop矩形}"></Border>
                 <Border Style="{DynamicResource bordertopL}"></Border>
                 <Image Margin="20,0,0,0" VerticalAlignment="Center" Style="{DynamicResource imagetop_Title}" ></Image>
-                <Border Grid.ColumnSpan="2" Style="{DynamicResource bordertop矩形}" />
-                <Border Style="{DynamicResource bordertopL}" />
-                <Image
-                    Margin="10,0,0,0"
-                    VerticalAlignment="Center"
-                    Style="{DynamicResource imagetop_Title}" />
                 <Grid Grid.Column="1">
-                    <Menu>
-                        <MenuItem Header="状态监视">
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="日志监视"
-                                Tag="LogView" />
-                            <Separator />
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="订单监视"
-                                Tag="OrderStatusView" />
-                            <Separator />
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="设备监视"
-                                Tag="RealTimeDataControl" />
-                            <Separator />
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="告警监视"
-                                Tag="RealTimeDataControl" />
-                            <Separator />
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="IOT监视"
-                                Tag="RealTimeDataControl" />
                     <Menu >
                         <MenuItem Header="状态监视"  >
                             <MenuItem Header="日志监视" FontSize="12" Click="MenuItem_Click"  Tag="LogView" />
@@ -93,187 +57,69 @@
                             <MenuItem Header="IOT监视" FontSize="12" Click="MenuItem_Click"  Tag="RealTimeDataControl" />
                         </MenuItem>
                         <MenuItem Header="综合查询">
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="告警查询"
-                                Tag="HistoryFaultControl" />
-                            <Separator />
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="日志查询"
-                                Tag="MaintenanceNotificationControl" />
-                            <Separator />
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="维护查询"
-                                Tag="WorkorderManagementControl" />
+                            <MenuItem Header="告警查询"  FontSize="12" Click="MenuItem_Click"  Tag="HistoryFaultControl"/>
+                            <Separator/>
+                            <MenuItem Header="日志查询" FontSize="12" Click="MenuItem_Click"  Tag="MaintenanceNotificationControl"/>
+                            <Separator/>
+                            <MenuItem Header="维护查询" FontSize="12" Click="MenuItem_Click"  Tag="WorkorderManagementControl"/>
                         </MenuItem>
                         <MenuItem Header="功能列表">
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="加盟商管理"
-                                Tag="OnOffControl" />
-                            <Separator />
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="功能列表2"
-                                Tag="SystemParameterControl" />
+                            <MenuItem Header="加盟商管理" FontSize="12" Click="MenuItem_Click"  Tag="OnOffControl"/>
+                            <Separator/>
+                            <MenuItem Header="功能列表2" FontSize="12" Click="MenuItem_Click"  Tag="SystemParameterControl" />
                         </MenuItem>
                         <MenuItem Header="参数配置">
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="参数设置"
-                                Tag="OnOffControl" />
-                            <Separator />
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="系统设置"
-                                Tag="SystemParameterControl" />
-                            <Separator />
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="退出程序"
-                                Tag="RealTimevideoControl" />
+                            <MenuItem Header="参数设置" FontSize="12" Click="MenuItem_Click"  Tag="OnOffControl"/>
+                            <Separator/>
+                            <MenuItem Header="系统设置" FontSize="12" Click="MenuItem_Click"  Tag="SystemParameterControl" />
+                            <Separator/>
+                            <MenuItem Header="退出程序" FontSize="12"  Click="MenuItem_Click"  Tag="RealTimevideoControl"/>
                         </MenuItem>
                         <MenuItem Header="系统帮助">
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="版本更新历史"
-                                Tag="OnOffControl" />
-                            <Separator />
-                            <MenuItem
-                                Click="MenuItem_Click"
-                                FontSize="12"
-                                Header="帮助文档"
-                                Tag="SystemParameterControl" />
+                            <MenuItem Header="版本更新历史" FontSize="12" Click="MenuItem_Click"  Tag="OnOffControl"/>
+                            <Separator/>
+                            <MenuItem Header="帮助文档" FontSize="12" Click="MenuItem_Click"  Tag="SystemParameterControl" />
                         </MenuItem>
                     </Menu>
                 </Grid>
 
-                <StackPanel
-                    Grid.Column="4"
-                    Height="50"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Top"
-                    Orientation="Horizontal">
+                <StackPanel Grid.Column="4" Orientation="Horizontal" HorizontalAlignment="Right" Height="50" VerticalAlignment="Top">
                     <Border Style="{DynamicResource border竖线}" />
-                    <StackPanel
-                        Margin="5"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
+                    <StackPanel  Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" >
                         <TextBlock FontSize="12">网</TextBlock>
                         <TextBlock FontSize="12">络</TextBlock>
                     </StackPanel>
-                    <ToggleButton
-                        Margin="5"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Cursor="Hand"
-                        DataContext="{Binding GaoJingMessage}"
-                        Style="{DynamicResource StatusBtnStyle网络连接状态}"
-                        ToolTip="网络连接状态" />
                     <ToggleButton Margin="5" VerticalAlignment="Center"  ToolTip="网络连接状态" HorizontalAlignment="Center" Style="{DynamicResource StatusBtnStyle网络连接状态}" IsChecked="True" DataContext="{Binding GaoJingMessage}"  Cursor="Hand"/>
                     <Border Style="{DynamicResource border竖线}" />
-                    <ToggleButton
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Cursor="Hand"
-                        DataContext="{Binding GaoJingMessage}"
-                        Style="{DynamicResource StatusBtnStyle告警}"
-                        ToolTip="告警消息" />
+                    <ToggleButton VerticalAlignment="Center"  ToolTip="告警消息" HorizontalAlignment="Center" Style="{DynamicResource StatusBtnStyle告警}" DataContext="{Binding GaoJingMessage}"  Cursor="Hand"/>
                     <Border Style="{DynamicResource border竖线}" />
-                    <Grid Margin="10,0,10,0" VerticalAlignment="Center">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="30" />
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <StackPanel Grid.Row="0" Orientation="Horizontal">
-                            <TextBlock
-                                x:Name="time"
-                                FontSize="16"
-                                Text="18:00:00" />
-                            <Image Margin="10,0,0,0" Style="{DynamicResource timeImage}" />
-                        </StackPanel>
-                        <StackPanel Grid.Row="1" Orientation="Horizontal">
-                            <TextBlock x:Name="dateRL" FontSize="10">星期一</TextBlock>
-                            <TextBlock
-                                x:Name="date"
-                                Margin="10,0,0,0"
-                                FontSize="10">
-                                2021-11-13
-                            </TextBlock>
-                        </StackPanel>
-                    </Grid>
                     <control:DateTimeUI Margin="10,0,10,0"  VerticalAlignment="Center"></control:DateTimeUI>
                     <Border Style="{DynamicResource border竖线}" />
-                    <Button
-                        x:Name="ButClose"
-                        Grid.Column="4"
-                        Margin="10,0,20,0"
-                        VerticalAlignment="Center"
-                        Content="退出"
-                        Cursor="Hand"
-                        Style="{DynamicResource CommonBtnStyle退出按钮}"
-                        ToolTip="退出程序" />
                     <Button x:Name="ButClose" Grid.Column="4" Margin="10,0,20,0" Style="{DynamicResource CommonBtn_返回}"   VerticalAlignment="Center"  ToolTip="退出程序"  Cursor="Hand" Content="退出"/>
                 </StackPanel>
             </Grid>
 
-            <!--  底部窗体  -->
+            <!--底部窗体-->
             <Grid Grid.Row="1" Margin="10">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="45" />
-                    <RowDefinition />
+                    <RowDefinition Height="45"/>
+                    <RowDefinition/>
                 </Grid.RowDefinitions>
-                <!--  顶部装饰  -->
-                <Border
-                    Grid.Row="0"
-                    Grid.RowSpan="2"
-                    Style="{DynamicResource border右下}" />
-                <Border
-                    Grid.Row="0"
-                    Grid.RowSpan="2"
-                    Style="{DynamicResource border左下}" />
-                <Border
-                    Grid.Row="0"
-                    Grid.RowSpan="2"
-                    Style="{DynamicResource border右上}" />
-                <Border
-                    Grid.Row="0"
-                    Grid.RowSpan="2"
-                    Style="{DynamicResource border左上}" />
+                <!--顶部装饰-->
+                <Border Grid.Row="0" Style="{DynamicResource border右下}" Grid.RowSpan="2" />
+                <Border Grid.Row="0" Style="{DynamicResource border左下}" Grid.RowSpan="2"  />
+                <Border Grid.Row="0" Style="{DynamicResource border右上}" Grid.RowSpan="2"  />
+                <Border Grid.Row="0" Style="{DynamicResource border左上}" Grid.RowSpan="2"  />
                 <Grid Margin="10">
-                    <Border Width="600" Style="{DynamicResource borderFromTitle}" />
-                    <Button
-                        Grid.Row="0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Click="Button_Click"
-                        Content="返回"
-                        Style="{DynamicResource CommonBtn_返回}" />
-                    <TextBlock
-                        x:Name="Title"
-                        HorizontalAlignment="Center"
-                        FontSize="16"
-                        Foreground="#feffff">
-                        日志监控界面
-                    </TextBlock>
                     <Border Style="{DynamicResource borderFromTitle}" Width="600"></Border>
                     <Button Grid.Row="0" Content="返回" Style="{DynamicResource CommonBtn_返回}" HorizontalAlignment="Left"   VerticalAlignment="Top" Click="Button_Click" Cursor="Hand"/>
+                    <Button Grid.Row="0" Content="弹窗" Style="{DynamicResource CommonBtn_返回}" Margin="100,0,0,0" HorizontalAlignment="Left"   VerticalAlignment="Top" Click="Button_Click_1"  Cursor="Hand"/>
+
                     <TextBlock x:Name="Title" HorizontalAlignment="Center" FontSize="18" Foreground="#feffff">日志监控界面</TextBlock>
                 </Grid>
                 <!--#region 底部窗体栏-->
 
-                <ContentControl x:Name="contentRegion" Grid.Row="1" />
+                <ContentControl Grid.Row="1"  x:Name="contentRegion"/>
                 <!--#endregion-->
                 <!--<Button Grid.Row="2" Content="返回" Style="{DynamicResource CommonBtn_返回}" HorizontalAlignment="Left"   VerticalAlignment="Top" Click="Button_Click"/>
 

BPASmartClient/MainWindow.xaml.cs

@@ -89,5 +89,12 @@ namespace BPASmartClient
                 MessageLog.GetInstance.ShowEx($"BPASmartClient 中引发错误,MainWindow.xaml.cs 类,描述：[{ex.Message}]");
             }
         }
+
+
+
+        private void Button_Click_1(object sender,RoutedEventArgs e)
+        {
+            
+        }
     }
 }