23232

BPASmartClient.CustomResource/Themes/MyStyle.xaml

@@ -963,7 +963,6 @@
             <Setter Property="VerticalContentAlignment" Value="Center" />
             <Setter Property="Cursor" Value="Hand" />
             <Setter Property="Foreground" Value="{DynamicResource foreground}" />
-            <Setter Property="Width" Value="68" />
             <Setter Property="Height" Value="25" />
             <Setter Property="Template">
                 <Setter.Value>
@@ -977,7 +976,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮图标.png" />
                                     </Border.Background>
                                 </Border>-->
-                                <TextBlock
+                                <TextBlock Margin="10,0,10,0"
                                     x:Name="textBlock"
                                     VerticalAlignment="Center"
                                     FontSize="14"

BPASmartClient/Control/LogOrAlarmView.xaml

@@ -34,8 +34,8 @@
                 </ComboBox.ItemTemplate>
             </ComboBox>
             <DatePicker  Margin="10,0,10,0"  Text="{Binding DateTimeStr,Mode=TwoWay,NotifyOnTargetUpdated=True}"></DatePicker>
-            <Button Margin="10,0,0,0" Cursor="Hand" Command="{Binding QueryCommand}" Style="{DynamicResource CommonBtn_返回}" Width="75">查询数据</Button>
-            <Button Margin="10,0,0,0" Cursor="Hand" Command="{Binding OpenCommand}" Style="{DynamicResource CommonBtn_返回}" Width="102">打开文件目录</Button>
+            <Button Margin="10,0,0,0" Cursor="Hand" Command="{Binding QueryCommand}" >查询数据</Button>
+            <Button Margin="10,0,0,0" Cursor="Hand" Command="{Binding OpenCommand}" >打开文件目录</Button>
         </StackPanel>
 
         <!--  表格栏  -->

BPASmartClient/Control/LogView.xaml

@@ -33,8 +33,8 @@
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
-            <Button  Margin="10,0,0,0" Cursor="Hand" Command="{Binding ExcelCommand}"  Style="{DynamicResource CommonBtn_返回}" Width="75">导出日志</Button>
-            <Button  Margin="10,0,0,0" Cursor="Hand" Command="{Binding OpenCommand}"  Style="{DynamicResource CommonBtn_返回}" Width="75">打开文件</Button>
+            <Button  Margin="10,0,0,0" Cursor="Hand" Command="{Binding ExcelCommand}"  >导出日志</Button>
+            <Button  Margin="10,0,0,0" Cursor="Hand" Command="{Binding OpenCommand}"  >打开文件</Button>
         </StackPanel>
 
         <!--表格栏-->