guohongshuang/SamplePreSystem-CS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化样品管理

Browse Source
This commit is contained in:
guohongshuang
2026-05-08 15:08:20 +08:00
parent a28bfb9198
commit 06a5f9707d
9 changed files with 215 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
SamplePreSystem.UI/Views/MonitorManager/MonitorView.xaml
View File

@@ -38,10 +38,13 @@
<RowDefinition Height="30" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<StackPanel
Grid.Row="0"
Height="30"
VerticalAlignment="Center">
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<TextBlock
Margin="10,0"
Padding="6"
@@ -49,7 +52,74 @@
VerticalAlignment="Center"
FontWeight="Bold"
Text="样品列表" />
</StackPanel>
<StackPanel
Grid.Column="1"
Height="30"
VerticalAlignment="Center"
Orientation="Horizontal">
<Button
Width="80"
Height="25"
Margin="5,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Content="启动"
Style="{StaticResource IconTextButtonStyle}"
Tag="Play"
ToolTip="启动" />
<Button
Width="80"
Height="25"
Margin="5,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Content="暂停"
Style="{StaticResource IconTextButtonStyle}"
Tag="Pause"
ToolTip="暂停" />
<Button
Width="80"
Height="25"
Margin="5,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Content="继续"
Style="{StaticResource IconTextButtonStyle}"
Tag="PlayPause"
ToolTip="继续" />
<Button
Width="80"
Height="25"
Margin="5,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Content="停止"
Style="{StaticResource IconTextButtonStyle}"
Tag="Stop"
ToolTip="停止" />
<Button
Width="80"
Height="25"
Margin="5,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Content="复位"
FontSize="13"
Style="{StaticResource IconTextButtonStyle}"
Tag="Refresh"
ToolTip="复位" />
</StackPanel>
</Grid>
<DataGrid
x:Name="dg_sample"
Grid.Row="1"
@@ -286,14 +356,12 @@
<!-- 功能单元 -->
<Grid Grid.Column="2">
<Grid.RowDefinitions>
<RowDefinition Height="31*" />
<RowDefinition Height="44*" />
<RowDefinition Height="15*" />
<RowDefinition Height="3*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<!-- 功能岛信息 -->
<Border
Grid.RowSpan="2"
Margin="0,5,5,5"
Background="White"
BorderThickness="1"
@@ -347,6 +415,8 @@
</Style>
</Border.Style>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
@@ -357,10 +427,13 @@
<ColumnDefinition />
</Grid.ColumnDefinitions>
<!-- 功能岛名称 -->
<TextBlock
Margin="5"
HorizontalAlignment="Left"
Text="{Binding unitName}" />
<!-- 详情链接 -->
<TextBlock
Grid.Column="1"
Margin="5"
@@ -372,11 +445,8 @@
[详情]
</Hyperlink>
</TextBlock>
<!--<Image Grid.Row="1" Grid.Column="0"
Source="{Binding imgPath}" Height="48" Width="48" Margin="5"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>-->
<!-- 图标 -->
<Border
Grid.Row="1"
Grid.Column="0"
@@ -395,15 +465,13 @@
Kind="{Binding packIconKind}" />
</Border>
<UniformGrid
Grid.Row="1"
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Columns="1"
Rows="2">
Rows="3">
<StackPanel
Margin="0,2"
@@ -425,8 +493,41 @@
CornerRadius="3" />
<TextBlock VerticalAlignment="Center" Text="{Binding StateName}" />
</StackPanel>
<!-- 功能按钮 -->
<!--
<StackPanel
Grid.Row="1"
HorizontalAlignment="Center"
Orientation="Horizontal">
<Button
Width="45" Margin="2,0"
Height="24" Background="White" Foreground="OrangeRed"
ToolTip="暂停">
<materialDesign:PackIcon Kind="Pause" />
</Button>
<Button
Width="45" Background="White" Foreground="DarkBlue"
Height="24"
ToolTip="继续">
<materialDesign:PackIcon Kind="PlayPause" />
</Button>
<Button
Width="45" Background="White" Foreground="Green"
Height="24"
ToolTip="复位">
<materialDesign:PackIcon Kind="Refresh" />
</Button>
</StackPanel>-->
</UniformGrid>
</Grid>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
@@ -438,7 +539,7 @@
<!-- 故障信息 -->
<Border
Grid.Row="2"
Grid.Row="1"
Margin="0,0,5,5"
Background="White"
BorderThickness="1"