设备监控界面修改

BPASmartClient.Academy/View/DeviceMotionView.xaml

@@ -1,34 +1,46 @@
-<UserControl x:Class="BPASmartClient.Academy.View.DeviceMotionView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:bpa="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-             xmlns:local="clr-namespace:BPASmartClient.Academy.View"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="BPASmartClient.Academy.View.DeviceMotionView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:bpa="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.Academy.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <UserControl.Resources>
         <Style x:Key="checkBox" TargetType="{x:Type CheckBox}">
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type CheckBox}">
-                        <Border x:Name="bord" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"  Background="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-                            <ContentControl Foreground="{TemplateBinding Foreground}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"  />
+                        <Border
+                            x:Name="bord"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <ContentControl
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                Foreground="{TemplateBinding Foreground}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="True">
-                                <Setter Property="Background" TargetName="bord">
+                                <Setter TargetName="bord" Property="Background">
                                     <Setter.Value>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/红色圆角矩形背景.png"/>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/红色圆角矩形背景.png" />
                                     </Setter.Value>
                                 </Setter>
                             </Trigger>
                             <Trigger Property="IsChecked" Value="False">
-                                <Setter Property="Background" TargetName="bord">
+                                <Setter TargetName="bord" Property="Background">
                                     <Setter.Value>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOff.png"/>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOff.png" />
                                     </Setter.Value>
                                 </Setter>
                             </Trigger>
@@ -38,26 +50,36 @@
             </Setter>
         </Style>
         <Style x:Key="radiobutton" TargetType="{x:Type RadioButton}">
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type RadioButton}">
-                        <Border x:Name="bord" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"  Background="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-                            <ContentControl Foreground="{TemplateBinding Foreground}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"  />
+                        <Border
+                            x:Name="bord"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <ContentControl
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                Foreground="{TemplateBinding Foreground}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="True">
-                                <Setter Property="Background" TargetName="bord">
+                                <Setter TargetName="bord" Property="Background">
                                     <Setter.Value>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/红色圆角矩形背景.png"/>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/红色圆角矩形背景.png" />
                                     </Setter.Value>
                                 </Setter>
                             </Trigger>
                             <Trigger Property="IsChecked" Value="False">
-                                <Setter Property="Background" TargetName="bord">
+                                <Setter TargetName="bord" Property="Background">
                                     <Setter.Value>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOff.png"/>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOff.png" />
                                     </Setter.Value>
                                 </Setter>
                             </Trigger>
@@ -69,36 +91,58 @@
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition/>
-            <RowDefinition Height="0.5*"/>
+            <RowDefinition />
+            <RowDefinition Height="0.5*" />
         </Grid.RowDefinitions>
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="2*"/>
-                <ColumnDefinition/>
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition />
             </Grid.ColumnDefinitions>
             <Grid Margin="10,2">
                 <Grid.Background>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/背景边框4.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/背景边框4.png" />
                 </Grid.Background>
             </Grid>
             <Grid Grid.Column="1" Margin="0,2,10,2">
                 <Grid.Background>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/背景边框4.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/背景边框4.png" />
                 </Grid.Background>
-                <UniformGrid Rows="4" >
-                    <CheckBox Style="{StaticResource Beveledcheck}" Content="系统启动" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,20"/>
-                    <StackPanel Orientation="Vertical"  VerticalAlignment="Center">
-                        <TextBlock Text="阀门开关：" HorizontalAlignment="Left" Foreground="White" VerticalAlignment="Top"/>
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                            <RadioButton Content="配料搅拌:开" Style="{StaticResource radiobutton}" GroupName="1" Width="120" Foreground="Black" Height="40" BorderThickness="0"/>
-                            <RadioButton Content="配料搅拌:关" IsChecked="True" Style="{StaticResource radiobutton}" GroupName="1" Width="120" Foreground="Black" Height="40" BorderThickness="0"/>
+                <UniformGrid Rows="4">
+                    <CheckBox
+                        Margin="10,20"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        Content="系统启动"
+                        Style="{StaticResource Beveledcheck}" />
+                    <StackPanel VerticalAlignment="Center" Orientation="Vertical">
+                        <TextBlock
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Foreground="White"
+                            Text="阀门开关：" />
+                        <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
+                            <RadioButton
+                                Width="120"
+                                Height="40"
+                                BorderThickness="0"
+                                Content="配料搅拌:开"
+                                Foreground="Black"
+                                GroupName="1"
+                                Style="{StaticResource radiobutton}" />
+                            <RadioButton
+                                Width="120"
+                                Height="40"
+                                BorderThickness="0"
+                                Content="配料搅拌:关"
+                                Foreground="Black"
+                                GroupName="1"
+                                IsChecked="True"
+                                Style="{StaticResource radiobutton}" />
                         </StackPanel>
                     </StackPanel>
                 </UniformGrid>
             </Grid>
         </Grid>
-    <Grid>
-
     </Grid>
 </UserControl>