From 6cbd292c74f7b425f1317528706d700b1178a29c Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Fri, 20 May 2022 14:40:02 +0800
Subject: [PATCH] 3434

---
 BPASmartClient/Control/AdminstratorsView.xaml |  6 +++---
 BPASmartClient/MainWindow.xaml                | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/BPASmartClient/Control/AdminstratorsView.xaml b/BPASmartClient/Control/AdminstratorsView.xaml
index e5b3d5f6..a228acef 100644
--- a/BPASmartClient/Control/AdminstratorsView.xaml
+++ b/BPASmartClient/Control/AdminstratorsView.xaml
@@ -37,17 +37,17 @@
         </Grid.RowDefinitions>
         <TextBlock Text="账号：" 
                    VerticalAlignment="Bottom" HorizontalAlignment="Right"
-                   Margin="20"
+                   Margin="20" Foreground="#feffff"
                    Style="{StaticResource TxLogin}"
                 />
         <TextBlock Text="密码：" Grid.Row="1"
                    VerticalAlignment="Top" HorizontalAlignment="Right"
-                   Margin="20"
+                   Margin="20" Foreground="#feffff"
                    Style="{StaticResource TxLogin}"/>
         <TextBox x:Name="tbx_admin" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
                  Text="{Binding Admin, Mode=TwoWay}"
                  Foreground="#F8F8FF" FontSize="20"
-                 Width="180" Height="28"
+                 Width="180" Height="28" 
                  VerticalAlignment="Bottom" HorizontalAlignment="Center"
                  VerticalContentAlignment="Top" HorizontalContentAlignment="Center"
                  Margin="20" 
diff --git a/BPASmartClient/MainWindow.xaml b/BPASmartClient/MainWindow.xaml
index 20dac7db..bbaa780d 100644
--- a/BPASmartClient/MainWindow.xaml
+++ b/BPASmartClient/MainWindow.xaml
@@ -26,7 +26,6 @@
         </ResourceDictionary>
     </Window.Resources>
 
-
     <Border x:Name="br" Style="{DynamicResource border主窗体背景}">
         <Grid>
             <Grid.RowDefinitions>
@@ -214,20 +213,25 @@
                     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左上}" />
+                
                 <Grid Margin="10">
                     <Border Width="600" Style="{DynamicResource borderFromTitle}" />
+                   
                     <StackPanel Orientation="Horizontal" >
                         <CheckBox
                         Content="开机启动" Margin="5,0,5,0"
@@ -250,7 +254,6 @@
                         Cursor="Hand" />
                     </StackPanel>
 
-
                     <TextBlock
                         x:Name="Title"
                         HorizontalAlignment="Center"
@@ -258,6 +261,7 @@
                         Foreground="#feffff">
                         日志监控界面
                     </TextBlock>
+                    
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                         <Button
                         Name="login" Margin="5,0,5,0"
@@ -282,13 +286,10 @@
                         Style="{DynamicResource CommonBtn_返回}" />
                     </StackPanel>
                 </Grid>
+                
                 <!--#region 底部窗体栏-->
-
                 <ContentControl x:Name="contentRegion" Grid.Row="1" />
                 <!--#endregion-->
-                <!--<Button Grid.Row="2" Content="返回" Style="{DynamicResource CommonBtn_返回}" HorizontalAlignment="Left"   VerticalAlignment="Top" Click="Button_Click"/>
-
-                <Button Grid.Row="2" Visibility="Collapsed" Content="测试" HorizontalAlignment="Left"  Margin="153,123,0,0" VerticalAlignment="Top" Click="Button_Click"/>-->
             </Grid>