Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient

BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj

@@ -129,12 +129,28 @@
     <None Remove="Image\边框效果2.png" />
     <None Remove="Image\退出.png" />
     <None Remove="Image\退出按钮.png" />
+    <None Remove="Image\顶部.png" />
+    <None Remove="Image\顶部切图\Button_No.png" />
+    <None Remove="Image\顶部切图\Button_Select.png" />
+    <None Remove="Image\顶部切图\Top_L.png" />
+    <None Remove="Image\顶部切图\窗体背景.png" />
+    <None Remove="Image\顶部切图\顶部矩形.png" />
+    <None Remove="Image\顶部切图\黑菠萝智慧餐饮管理系统.png" />
     <None Remove="Image\顶部矩形.png" />
     <None Remove="Image\顶部线条.png" />
     <None Remove="Image\顶部背景.png" />
     <None Remove="Image\黑菠萝科技.png" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Resource Include="Image\顶部切图\Button_No.png" />
+    <Resource Include="Image\顶部切图\Button_Select.png" />
+    <Resource Include="Image\顶部切图\Top_L.png" />
+    <Resource Include="Image\顶部切图\窗体背景.png" />
+    <Resource Include="Image\顶部切图\顶部矩形.png" />
+    <Resource Include="Image\顶部切图\黑菠萝智慧餐饮管理系统.png" />
+  </ItemGroup>
+
   <ItemGroup>
     <Folder Include="Themes\" />
   </ItemGroup>
@@ -264,6 +280,7 @@
     <Resource Include="Image\边框效果2.png" />
     <Resource Include="Image\退出.png" />
     <Resource Include="Image\退出按钮.png" />
+    <Resource Include="Image\顶部.png" />
     <Resource Include="Image\顶部矩形.png" />
     <Resource Include="Image\顶部线条.png" />
     <Resource Include="Image\顶部背景.png" />

BPASmartClient.CustomResource/Themes/GenricStyle.xaml

@@ -451,7 +451,7 @@
     <Style TargetType="{x:Type DataGridColumnHeader}">
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Height" Value="40"/>
+        <Setter Property="Height" Value="30"/>
         <Setter Property="Background" >
             <Setter.Value>
                 <ImageBrush Opacity="0.2"  ImageSource="/BPASmartClient.CustomResource;component/Image/表格标题背景2.png"></ImageBrush>
@@ -459,7 +459,7 @@
         </Setter>
         <Setter Property="BorderThickness" Value="0"></Setter>
         <Setter Property="Foreground" Value="#00c2f4"></Setter>
-        <Setter Property="FontSize" Value="20"></Setter>
+        <Setter Property="FontSize" Value="14"></Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridColumnHeader}">
@@ -892,10 +892,11 @@
         <Setter Property="Padding" Value="6,1,6,1"/>
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
         <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="Cursor" Value="Hand"></Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
-                    <Border x:Name="Bd" BorderThickness="1" Padding="{TemplateBinding Padding}" Height="24"  Margin="2" CornerRadius="2">
+                    <Border x:Name="Bd" BorderThickness="1" Padding="{TemplateBinding Padding}" Height="35"  Margin="5" CornerRadius="2">
                         <ContentPresenter x:Name="Content" Cursor="Hand"  ContentSource="Header" HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -908,13 +909,21 @@
                             </Setter>
                         </Trigger>
                         <Trigger Property="IsSelected"  Value="False">
-                            <Setter Property="Foreground" Value="#134278"/>
+                            <Setter Property="Foreground" Value="White"/>
                             <Setter Property="Background" TargetName="Bd">
                                 <Setter.Value>
                                     <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_No.png" />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Foreground" Value="#8f723c"/>
+                            <Setter Property="Background" TargetName="Bd">
+                                <Setter.Value>
+                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png"  />
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -1697,7 +1706,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type CheckBox}">
                     <StackPanel Background="Transparent" SnapsToDevicePixels="True" Orientation="Horizontal">
-                        <Image x:Name="image1" Source="Image/Cb_HalfChecked.png" Width="12" Height="14"></Image>
+                        <Image x:Name="image1" Source="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" Width="12" Height="14"></Image>
 
                         <ContentPresenter  Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     </StackPanel>
@@ -1722,10 +1731,10 @@
                             <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
                         </Trigger>
                         <Trigger Property="IsChecked" Value="true">
-                            <Setter TargetName="image1" Property="Source" Value="Image/Cb_Checked.png"/>
+                            <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_Checked.png"/>
                         </Trigger>
                         <Trigger Property="IsChecked" Value="{x:Null}">
-                            <Setter TargetName="image1" Property="Source" Value="Image/Cb_HalfChecked.png"/>
+                            <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>

BPASmartClient.CustomResource/Themes/MyStyle.xaml

@@ -4,24 +4,10 @@
 
                     >
 
-    <Style x:Key="bordertopTitle" TargetType="Border">
-        <Style.Setters>
-            <Setter Property="Height" Value="100"></Setter>
-            <Setter Property="Background">
-                <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/topTitle.png"/>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
 
-    <Style x:Key="imagetop" TargetType="Image">
-        <Style.Setters>
-            <Setter Property="VerticalAlignment" Value="Top"></Setter>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/topTitle.png"/>
-        </Style.Setters>
-    </Style>
-    
+
+
+
     <ImageBrush x:Key="imageBJ" ImageSource="/BPASmartClient.CustomResource;component/Image/图层1.png"/>
 
     <ImageBrush x:Key="image1" ImageSource="/BPASmartClient.CustomResource;component/Image/shape.png"/>
@@ -46,7 +32,7 @@
                             <Border x:Name="bd1" Visibility="Collapsed" Width="25" Height="13" HorizontalAlignment="Right" Panel.ZIndex="100" VerticalAlignment="Top" Margin="0,-5,-5,0" CornerRadius="3" Background="#33FF0000" >
                                 <TextBlock Text="{Binding ListNum}"  Foreground="#FF2AA7D3" HorizontalAlignment="Center"></TextBlock>
                             </Border>
-                            <Image x:Name="image1" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}"  Source="Image/告警.png" Panel.ZIndex="0" Stretch="UniformToFill" ></Image>
+                            <Image x:Name="image1" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}"  Source="/BPASmartClient.CustomResource;component/Image/告警.png" Panel.ZIndex="0" Stretch="UniformToFill" ></Image>
                         </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="true">
@@ -71,6 +57,47 @@
     <!--#endregion-->
     
     <!--#region Image -->
+    <Style x:Key="imagetop_L" TargetType="Image">
+        <Style.Setters>
+            <Setter Property="Height" Value="80"></Setter>
+            <Setter Property="VerticalAlignment" Value="Top"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部切图/Top_L.png"/>
+        </Style.Setters>
+    </Style>
+
+    <Style x:Key="imagetop_Title" TargetType="Image">
+        <Style.Setters>
+            <Setter Property="Width" Value="250"></Setter>
+            <Setter Property="VerticalAlignment" Value="Top"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部切图/黑菠萝智慧餐饮管理系统.png"/>
+        </Style.Setters>
+    </Style>
+
+    <Style x:Key="imagetop_矩形" TargetType="Image">
+        <Style.Setters>
+        
+            <Setter Property="VerticalAlignment" Value="Top"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部切图/顶部矩形.png"/>
+        </Style.Setters>
+    </Style>
+
+    <Style x:Key="imagetop" TargetType="Image">
+        <Style.Setters>
+            <Setter Property="VerticalAlignment" Value="Top"></Setter>
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/topTitle.png"/>
+        </Style.Setters>
+    </Style>
+
+    <Style x:Key="imagetop1" TargetType="Image">
+        <Style.Setters>
+            <Setter Property="VerticalAlignment" Value="Top"></Setter>
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部.png"/>
+        </Style.Setters>
+    </Style>
+    
     <Style x:Key="image营销额" TargetType="Image">
         <Style.Setters>
             <Setter Property="VerticalAlignment" Value="Bottom"></Setter>
@@ -167,7 +194,76 @@
     <!--#endregion-->
 
     <!--#region Border-->
+    <Style x:Key="FromBJ" TargetType="Border">
+        <Style.Setters>
+            <Setter Property="Background">
+                <Setter.Value>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/窗体背景.png"/>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+    
+    <Style x:Key="button_no" TargetType="Border">
+        <Style.Setters>
+            <Setter Property="Background">
+                <Setter.Value>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/Button_No.png"/>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+
 
+    <Style x:Key="button_select" TargetType="Border">
+        <Style.Setters>
+
+            <Setter Property="Background">
+                <Setter.Value>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/Button_Select.png"/>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+    
+    
+    <Style x:Key="bordertopL" TargetType="Border">
+        <Style.Setters>
+            <Setter Property="Height" Value="80"></Setter>
+            <Setter Property="Width" Value="300"></Setter>
+            <Setter Property="VerticalAlignment" Value="Top"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
+
+            <Setter Property="Background">
+                <Setter.Value>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/Top_L.png"/>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+
+    <Style x:Key="bordertop矩形" TargetType="Border">
+        <Style.Setters>
+            <Setter Property="Height" Value="50"></Setter>
+            <Setter Property="VerticalAlignment" Value="Top"></Setter>
+            <Setter Property="Background">
+                <Setter.Value>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/顶部矩形.png"/>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+    
+    <Style x:Key="bordertopTitle" TargetType="Border">
+        <Style.Setters>
+            <Setter Property="Height" Value="100"></Setter>
+            <Setter Property="Background">
+                <Setter.Value>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/topTitle.png"/>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
 
     <Style x:Key="border窗体背景1" TargetType="Border">
         <Style.Setters>
@@ -209,7 +305,6 @@
         </Style.Setters>
     </Style>
 
-
     <Style x:Key="border窗体背景5" TargetType="Border">
         <Style.Setters>
             <Setter Property="Background">
@@ -309,6 +404,16 @@
         </Style.Setters>
     </Style>
 
+    <Style x:Key="border顶部标题背景" TargetType="Border">
+        <Style.Setters>
+            <Setter Property="Background">
+                <Setter.Value>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部.png"/>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+
     <Style x:Key="border竖线" TargetType="Border">
         <Style.Setters>
             <Setter Property="Width" Value="1"></Setter>
@@ -573,7 +678,7 @@
         </Style.Setters>
     </Style>
 
-    <Style TargetType="Button">
+    <Style x:Key="CommonBtn_1" TargetType="Button">
         <Style.Setters>
             <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
             <Setter Property="Cursor" Value="Hand"></Setter>
@@ -610,6 +715,61 @@
             </Setter>
         </Style.Setters>
     </Style>
+
+    <Style TargetType="Button">
+        <Style.Setters>
+            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+            <Setter Property="Cursor" Value="Hand"></Setter>
+            <Setter Property="Foreground" Value="{DynamicResource foreground}"></Setter>
+            <Setter Property="Width" Value="69"></Setter>
+            <Setter Property="Height" Value="25"></Setter>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <!--<ControlTemplate.Resources>
+                            <Storyboard x:Key="OnMouseEnter1">
+                                <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)" Storyboard.TargetName="BD">
+                                    <EasingColorKeyFrame KeyTime="0:0:0.1" Value="#FF139DDB"/>
+                                </ColorAnimationUsingKeyFrames>
+                                <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)" Storyboard.TargetName="BD">
+                                    <EasingColorKeyFrame KeyTime="0:0:0.1" Value="#FF135EC2"/>
+                                </ColorAnimationUsingKeyFrames>
+                            </Storyboard>
+                        </ControlTemplate.Resources>-->
+                        <Border x:Name="BD">
+                            <TextBlock x:Name="textBlock" FontSize="12" Text="{TemplateBinding Content}"  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{DynamicResource foreground}" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="BD" Property="Background">
+                                    <Setter.Value>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png"/>
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="textBlock" Property="Foreground" Value="White" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="False">
+                                <Setter TargetName="BD" Property="Background">
+                                    <Setter.Value>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOff.png"/>
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="textBlock" Property="Foreground" Value="#FFD7DCE0" />
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="BD" Property="Background">
+                                    <Setter.Value>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png"/>
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="textBlock" Property="Foreground" Value="#3afdff" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
     <!--#endregion-->
 
     <!--#region TextBox-->

BPASmartClient/MainWindow.xaml

@@ -5,8 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BPASmartClient"
         xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-        Title="MainWindow" Width="1400"
-        Height="850"
+        Title="MainWindow" Width="1600"
+        Height="900"
         AllowsTransparency="True"
         Background="{x:Null}"
         Topmost="False"
@@ -26,73 +26,100 @@
     <Border Style="{DynamicResource border主窗体背景}" x:Name="br" >
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="0.09*" />
-                <RowDefinition Height="0.09*" />
-                <RowDefinition />
+                <RowDefinition Height="60"/>
+                <RowDefinition/>
             </Grid.RowDefinitions>
-            <Image  Grid.RowSpan="2" x:Name="MoveBorder" Style="{DynamicResource imagetop}" />
-            <TextBlock
-                    Name="TX"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    FontSize="24"
-                    Text="上位机监控系统" />
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition />
-                </Grid.RowDefinitions>
-
-                <StackPanel
-                        Grid.Row="1"
-                        Margin="10,5,10,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Orientation="Horizontal">
-                    <TextBlock
-                            FontSize="16"
-                            Foreground="#00c2f4"
-                            Text="当前订单量：" />
-                    <TextBlock
-                            FontSize="16"
-                            Foreground="#00c2f4"
-                            Text="{Binding OrderCount}" />
+            
+            <!--标题-->
+            <Grid Grid.Row="0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="300"></ColumnDefinition>
+                    <ColumnDefinition ></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Border Grid.ColumnSpan="2" Style="{DynamicResource bordertop矩形}"></Border>
+                <Border Style="{DynamicResource bordertopL}"></Border>
+                <Image Margin="10,0,0,0" VerticalAlignment="Center" Style="{DynamicResource imagetop_Title}" ></Image>
+                <Grid Grid.Column="1">
+                    <TabControl>
+                        <TabItem Header="    状态监视    "></TabItem>
+                        <TabItem Header="    产品制作    "></TabItem>
+                        <TabItem Header="    综合查询    "></TabItem>
+                        <TabItem Header="    功能列表    "></TabItem>
+                        <TabItem Header="    参数配置    "></TabItem>
+                        <TabItem Header="    系统帮助    "></TabItem>
+                    </TabControl>
+                </Grid>
+                <StackPanel Grid.Column="4" Orientation="Horizontal" HorizontalAlignment="Right" Height="50" VerticalAlignment="Top">
+                    <Border Style="{DynamicResource border竖线}" />
+                    <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 Orientation="Horizontal" Grid.Row="0">
+                            <TextBlock x:Name="time"  FontSize="16" Text="18:00:00"/>
+                            <Image Style="{DynamicResource timeImage}" Margin="10,0,0,0"/>
+                        </StackPanel>
+                        <StackPanel Grid.Row="1"  Orientation="Horizontal">
+                            <TextBlock x:Name="dateRL"  FontSize="10"  Text="星期一">星期一</TextBlock>
+                            <TextBlock x:Name="date" Margin="10,0,0,0" FontSize="10" Text="2021-11-13">2021-11-13</TextBlock>
+                        </StackPanel>
+                    </Grid>
+                    <Border Style="{DynamicResource border竖线}" />
+                    <Button x:Name="ButClose" Grid.Column="4" Margin="10,0,20,0" Style="{DynamicResource CommonBtnStyle退出按钮}"  VerticalAlignment="Center"  ToolTip="退出程序"  Cursor="Hand"  Content="退出"/>
                 </StackPanel>
+            </Grid>
 
-                <StackPanel
-                        Grid.Row="1"
-                        Margin="10,5,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        Orientation="Horizontal">
-                    <TextBlock
-                            Margin="10,0,0,0"
-                            FontSize="16"
-                            Foreground="#00c2f4"
-                            Text="网络状态：" />
-                   
-                </StackPanel>
+            <!--底部窗体-->
+            <Grid Grid.Row="1" Margin="10">
+                <Border Style="{DynamicResource border窗体背景1}" Visibility="Collapsed" Width="500"  HorizontalAlignment="Left" VerticalAlignment="Stretch">
+                    <Grid Margin="20">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="40"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <TextBlock HorizontalAlignment="Center" Margin="0,10,0,0">相关设备状态</TextBlock>
 
-                <UniformGrid HorizontalAlignment="Right" Columns="3">
-                    <Button
-                            Name="ButMin"
-                            Width="40"
-                            Content="&#xe664;"
-                            Style="{StaticResource TitleBarStyle}" />
-                    <Button
-                            Name="ButMax"
-                            Content="&#xe65d;"
-                            Style="{StaticResource TitleBarStyle}" />
-                    <Button
-                            Name="ButClose"
-                            Content="&#xe639;"
-                            FontSize="26"
-                            Style="{StaticResource TitleBarStyle}" />
-                </UniformGrid>
+                        <DataGrid x:Name="datagrid" Margin="0,50,0,0" ItemsSource="{Binding EquiPment, UpdateSourceTrigger=PropertyChanged}" Grid.Row="1">
+                            <DataGrid.Columns>
+                                <DataGridTemplateColumn Header="    " Width="24">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <Ellipse Width="12" Height="12" ToolTip="{Binding Status, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Fill="{Binding color, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTemplateColumn Header="设备名称" Width="4.4*">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock HorizontalAlignment="Center" Text="{Binding Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Foreground="#00ccff"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTemplateColumn Header="设备状态" Width="4.4*">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock HorizontalAlignment="Center" Text="{Binding Status, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Foreground="#00ccff"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTemplateColumn Header="维护" Width="4.4*">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <Image Width="12" Height="12" ToolTip="设备维护" Style="{DynamicResource image个人信息}" Cursor="Hand" x:Name="ShowFromButton"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                            </DataGrid.Columns>
+                        </DataGrid>
+                    </Grid>
+                </Border>
+                <Button Grid.Row="2" Content="测试" HorizontalAlignment="Center"  Margin="153,123,0,0" VerticalAlignment="Top" Click="Button_Click"/>
 
             </Grid>
             
-            <Button Content="Button" HorizontalAlignment="Left" Margin="153,123,0,0" VerticalAlignment="Top" Click="Button_Click"/>
 
         </Grid>
     </Border>

BPASmartClient/MainWindow.xaml.cs

@@ -28,8 +28,6 @@ namespace BPASmartClient
         public MainWindow()
         {
             InitializeComponent();
-            this.ButMin.Click += (o,e) => { this.WindowState = WindowState.Minimized; };
-            this.ButMax.Click += (o,e) => { this.WindowState = this.WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized; };
             this.ButClose.Click += (o,e) => { this.Close(); };
             this.br.MouseLeftButtonDown += (o,e) =>
             {