From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject
---
HMI.IOMonitor/IOMonitor.xaml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/HMI.IOMonitor/IOMonitor.xaml b/HMI.IOMonitor/IOMonitor.xaml
index 3cd6837..6238d29 100644
--- a/HMI.IOMonitor/IOMonitor.xaml
+++ b/HMI.IOMonitor/IOMonitor.xaml
@@ -38,8 +38,8 @@
<DockPanel Grid.Row="0" Grid.ColumnSpan="2">
<StackPanel DockPanel.Dock="Right" Style="{StaticResource ButtonGroup}">
- <Button Style="{StaticResource PrimaryButton}" x:Name="addBtn" Click="Button_Click">鏂板</Button>
- <Button Style="{StaticResource PrimaryButton}" x:Name="importBtn" Click="Button_Click">瀵煎叆</Button>
+ <Button Style="{StaticResource AddBtn}" x:Name="addBtn" Click="Button_Click"/>
+ <Button Style="{StaticResource ImportBtn}" x:Name="importBtn" Click="Button_Click"/>
</StackPanel>
<TextBlock DockPanel.Dock="Left" VerticalAlignment="Center"
@@ -62,7 +62,7 @@
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="DI鍚嶇О"
- FontSize="{StaticResource TitleFontSize}"/>
+ FontSize="{StaticResource ContentFontSize}"/>
<ComboBox Grid.Row="0" Grid.Column="1" x:Name="diName"
IsEditable="True" Style="{StaticResource FormComboxStyle}"/>
@@ -73,13 +73,13 @@
x:Name="diReset" Click="Button_Click">DI閲嶇疆</Button>
<Label Grid.Row="1" Grid.Column="0" Content="DI缂栧彿"
- FontSize="{StaticResource TitleFontSize}"/>
+ FontSize="{StaticResource ContentFontSize}"/>
<ComboBox Grid.Row="1" Grid.Column="1" x:Name="diCode"
IsEditable="True"
Style="{StaticResource FormComboxStyle}"/>
<Label Grid.Row="2" Grid.Column="0" Content="DI鍒嗙粍"
- FontSize="{StaticResource TitleFontSize}"/>
+ FontSize="{StaticResource ContentFontSize}"/>
<ComboBox Grid.Row="2" Grid.Column="1" x:Name="diGroup"
IsEditable="True" Style="{StaticResource FormComboxStyle}"/>
@@ -154,7 +154,7 @@
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="DO鍚嶇О"
- FontSize="{StaticResource TitleFontSize}"/>
+ FontSize="{StaticResource ContentFontSize}"/>
<ComboBox Grid.Row="0" Grid.Column="1" x:Name="doName"
IsEditable="True" Style="{StaticResource FormComboxStyle}"/>
@@ -165,12 +165,12 @@
>DO閲嶇疆</Button>
<Label Grid.Row="1" Grid.Column="0" Content="DO缂栧彿"
- FontSize="{StaticResource TitleFontSize}"/>
+ FontSize="{StaticResource ContentFontSize}"/>
<ComboBox Grid.Row="1" Grid.Column="1" x:Name="doCode"
IsEditable="True" Style="{StaticResource FormComboxStyle}"/>
<Label Grid.Row="2" Grid.Column="0" Content="DO鍒嗙粍"
- FontSize="{StaticResource TitleFontSize}"/>
+ FontSize="{StaticResource ContentFontSize}"/>
<ComboBox Grid.Row="2" Grid.Column="1" x:Name="doGroup"
IsEditable="True" Style="{StaticResource FormComboxStyle}"/>
--
Gitblit v1.9.1