修改样式

BlankApp1/BlankApp1/Controls/Resources/DatagridStyle.xaml

@@ -73,10 +73,11 @@
         <Setter Property="IsReadOnly" Value="True"/>
         <Setter Property="HorizontalScrollBarVisibility" Value="Hidden"/>
         <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="5,0,10,0"/>
         <!--网格线颜色-->
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="BorderBrush" Value="#CBCBCB" />
+        <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="HorizontalGridLinesBrush">
             <Setter.Value>
                 <SolidColorBrush Color="#CBCBCB"/>
@@ -84,7 +85,7 @@
         </Setter>
         <Setter Property="VerticalGridLinesBrush">
             <Setter.Value>
-                <SolidColorBrush Color="#CBCBCB"/>
+                <SolidColorBrush Color="Transparent"/>
             </Setter.Value>
         </Setter>
 

BlankApp1/BlankApp1/Views/BasicConfigView/BaseConfigView.xaml

@@ -61,7 +61,7 @@
 
                 <Button  Content="查询" Width="80"  Margin="5,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" />
                 <Button  Content="重置" Width="80"  Margin="5,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" Background=" #7F7F7F"/>
-                <Button  Content="新增" Width="80"  Margin="5,0"  Command="{Binding AddPlanCommand}" Style="{StaticResource NormalButtonStyle}" Background="#00BFBF"/>
+                <Button  Content="新增" Width="80"  Margin="5,0,20,0"  Command="{Binding AddPlanCommand}" Style="{StaticResource NormalButtonStyle}" Background="#00BFBF"/>
 
                 <!--<Button Content="导出Excel" Width="80"  Margin="5,0"  Command="{Binding ExportCommand}" Style="{StaticResource NormalButtonStyle}" />-->
             </StackPanel>

BlankApp1/BlankApp1/Views/BasicConfigView/DeviceKindView.xaml

@@ -58,7 +58,7 @@
 
                 <Button  Content="查询" Width="80"  Margin="5,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" />
                 <Button  Content="重置" Width="80"  Margin="5,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" Background=" #7F7F7F"  />
-                <Button  Content="新增" Width="80"  Margin="5,0"  Command="{Binding AddCommand}" Style="{StaticResource NormalButtonStyle}" Background="#00BFBF"/>
+                <Button  Content="新增" Width="80"  Margin="5,0,20,0"  Command="{Binding AddCommand}" Style="{StaticResource NormalButtonStyle}" Background="#00BFBF"/>
 
                 <!--<Button Content="导出Excel" Width="80"  Margin="5,0"  Command="{Binding ExportCommand}" Style="{StaticResource NormalButtonStyle}" />-->
             </StackPanel>

BlankApp1/BlankApp1/Views/BasicConfigView/DeviceView.xaml

@@ -63,7 +63,7 @@
 
                 <Button  Content="查询" Width="80"  Margin="5,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" />
                 <Button  Content="重置" Width="80"  Margin="5,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}"  Background=" #7F7F7F" />
-                <Button  Content="新增" Width="80"  Margin="5,0"  Command="{Binding AddCommand}" Style="{StaticResource NormalButtonStyle}" Background="#00BFBF"/>
+                <Button  Content="新增" Width="80"  Margin="5,0,20,0"  Command="{Binding AddCommand}" Style="{StaticResource NormalButtonStyle}" Background="#00BFBF"/>
 
                 <!--<Button Content="导出Excel" Width="80"  Margin="5,0"  Command="{Binding ExportCommand}" Style="{StaticResource NormalButtonStyle}" />-->
             </StackPanel>

BlankApp1/BlankApp1/Views/BasicConfigView/PLCConfigView.xaml

@@ -35,7 +35,7 @@
             
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                 <Button Content="查询" Width="80"  Margin="5,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" />
-                <Button Content="新增PLC变量" Width="80"  Margin="5,0"  Command="{Binding AddCommand}" Style="{StaticResource NormalButtonStyle}" Background="#00BFBF"/>
+                <Button Content="新增PLC变量" Width="80"  Margin="5,0,20,0"  Command="{Binding AddCommand}" Style="{StaticResource NormalButtonStyle}" Background="#00BFBF"/>
                 <!--<Button Content="导出Excel" Width="80"  Margin="5,0"  Command="{Binding ExportCommand}" Style="{StaticResource NormalButtonStyle}" />-->
                
             </StackPanel>

BlankApp1/BlankApp1/Views/BasicConfigView/ProjectView.xaml

@@ -68,7 +68,7 @@
 
                 <Button  Content="查询" Width="80"  Margin="5,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" />
                 <Button  Content="重置" Width="80"  Margin="5,0"  Command="{Binding ResetCommand}" Style="{StaticResource NormalButtonStyle}" Background=" #7F7F7F" />
-                <Button  Content="新增" Width="80"  Margin="5,0"  Command="{Binding AddCommand}" Style="{StaticResource NormalButtonStyle}" Background="#00BFBF"/>
+                <Button  Content="新增" Width="80"  Margin="5,0,20,0"  Command="{Binding AddCommand}" Style="{StaticResource NormalButtonStyle}" Background="#00BFBF"/>
 
                 <!--<Button Content="导出Excel" Width="80"  Margin="5,0"  Command="{Binding ExportCommand}" Style="{StaticResource NormalButtonStyle}" />-->
             </StackPanel>

BlankApp1/BlankApp1/Views/MonitorManageView/LogView.xaml

@@ -25,7 +25,7 @@
             <RowDefinition/>
         </Grid.RowDefinitions>
         <StackPanel  Grid.Row="0" Orientation="Horizontal">
-            <Button  Content="开始监控"   Margin="5,0"  Command="{Binding StartCommand}" Style="{StaticResource NormalButtonStyle}" />
+            <Button  Content="开始监控"   Margin="5,0"  Command="{Binding StartCommand}" Style="{StaticResource NormalButtonStyle}" IsChecked="True"/>
             <Button  Content="停止监控"   Margin="5,0"  Command="{Binding StopCommand}" Style="{StaticResource NormalButtonStyle}" />
             <Button  Content="清理Log"   Margin="5,0"  Command="{Binding CleanCommand}" Style="{StaticResource NormalButtonStyle}" />
         </StackPanel>