优化一些东西；

alielie

2025-11-25 006c98e5650b530e5220f279c1e803fefe69d40d

 Plugin.TestResult/InfoWindow.xaml

@@ -13,50 +13,71 @@
        xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
        xmlns:cc="clr-namespace:HMI.Core;assembly=HMI.Core"
        InteropOwnersMask="False"
            Topmost="False"
        Topmost="False"
        Loaded="Window_Loaded"
        SizeToContent="Height"
        Unloaded="Window_Unloaded"
        SizeChanged="Window_SizeChanged"
        pu:WindowXModalDialog.Buttons="{x:Null}"
        Title="{Binding title}" Height="500" Width="800">
    <DataGrid ItemsSource="{Binding dataSource}"
              Style="{StaticResource DefaultDataGrid}">
        <DataGrid.Columns>
            <DataGridTemplateColumn Header="#" CanUserResize="False">
                <DataGridTemplateColumn.CellTemplate>
                    <DataTemplate>
                        <TextBlock Text="{Binding Converter={StaticResource rowNumber},
        Title="{Binding title}" Width="800" Height="825">
    <Grid x:Name="mainGrid">
        <Grid.RowDefinitions>
            <RowDefinition Height="500"/>
            <RowDefinition Height="150"/>
            <RowDefinition Height="150"/>
            <RowDefinition Height="25"/>
        </Grid.RowDefinitions>
        <DataGrid ItemsSource="{Binding dataSource}" AutoGenerateColumns="False"
              CanUserAddRows="False"
              CanUserDeleteRows="False"
              IsReadOnly="True"
              ColumnWidth="*"
              VirtualizingStackPanel.VirtualizationMode="Standard"
              FontSize="16">
            <DataGrid.Columns>
                <!--<DataGridTemplateColumn Header="#" CanUserResize="False" Width="Auto">
                    <DataGridTemplateColumn.CellTemplate>
                        <DataTemplate>
                            <TextBlock Text="{Binding Converter={StaticResource rowNumber},
RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"/>
                    </DataTemplate>
                </DataGridTemplateColumn.CellTemplate>
            </DataGridTemplateColumn>
            <DataGridTextColumn Width="*" Binding="{Binding step}">
                <DataGridTextColumn.Header>
                    <TextBlock Text="{Binding Converter={StaticResource lc},ConverterParameter='Ts.TestName'}"/>
                </DataGridTextColumn.Header>
            </DataGridTextColumn>
            <DataGridTextColumn Width="*" Binding="{Binding value}">
                <DataGridTextColumn.Header>
                    <TextBlock Text="{Binding Converter={StaticResource lc},ConverterParameter='Ts.TestValue'}"/>
                </DataGridTextColumn.Header>
            </DataGridTextColumn>
            <DataGridTextColumn Width="*" Binding="{Binding result}">
                <DataGridTextColumn.Header>
                    <TextBlock Text="{Binding Converter={StaticResource lc},ConverterParameter='Ts.TestResult'}"/>
                </DataGridTextColumn.Header>
            </DataGridTextColumn>
            <DataGridTextColumn Width="*" Binding="{Binding range}">
                <DataGridTextColumn.Header>
                    <TextBlock Text="{Binding Converter={StaticResource lc},ConverterParameter='Test.Range'}"/>
                </DataGridTextColumn.Header>
            </DataGridTextColumn>
            <DataGridTextColumn Width="*" Binding="{Binding condition}">
                <DataGridTextColumn.Header>
                    <TextBlock Text="{Binding Converter={StaticResource lc},ConverterParameter='Test.Condition'}"/>
                </DataGridTextColumn.Header>
            </DataGridTextColumn>
            <DataGridTextColumn Width="*" Binding="{Binding updateTime}">
                <DataGridTextColumn.Header>
                    <TextBlock Text="{Binding Converter={StaticResource lc},ConverterParameter='Test.UpdateTime'}"/>
                </DataGridTextColumn.Header>
            </DataGridTextColumn>
        </DataGrid.Columns>
    </DataGrid>
                        </DataTemplate>
                    </DataGridTemplateColumn.CellTemplate>
                </DataGridTemplateColumn>-->
                <DataGridTextColumn Header="测试项" Binding="{Binding step}"/>
                <DataGridTextColumn Header="测试值" Binding="{Binding value}"/>
                <DataGridTextColumn Header="上限" Binding="{Binding limitUp}"/>
                <DataGridTextColumn Header="下限" Binding="{Binding limitDown}"/>
                <DataGridTextColumn Header="单位" Binding="{Binding unit}"/>
                <DataGridTextColumn Header="测试结果" Binding="{Binding result}"/>
                <DataGridTextColumn Header="更新时间" Binding="{Binding updateTime}"/>
            </DataGrid.Columns>
        </DataGrid>

        <Grid Background="#f1eded" Grid.Row="3">
            <DockPanel>
                <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Margin="0,0,30,0">
                    <Label Padding="0" FontSize="12" 
VerticalAlignment="Center"
VerticalContentAlignment="Center" Content="探针使用次数:"/>
                    <Label Padding="0" FontSize="12"  Margin="0,0,15,0"
VerticalAlignment="Center"
VerticalContentAlignment="Center" Content="{Binding ProbeCount}"/>


                    <Label x:Name="alarmLabel" Padding="0" FontSize="12" 
VerticalAlignment="Center"
VerticalContentAlignment="Center" Content="预警次数:"/>
                    <Label x:Name="alarmValue" Padding="0" FontSize="12" 
VerticalAlignment="Center"
VerticalContentAlignment="Center" Content="{Binding ProbeWarn}"/>

                    <Button Style="{StaticResource LinkButton}" Margin="10,0,0,0" Click="Button_Click" >清空</Button>
                </StackPanel>

                <Label x:Name="probeCountAlarm" Visibility="Collapsed" DockPanel.Dock="Left" Padding="30,0" FontSize="12" Foreground="Red"
VerticalAlignment="Center"
VerticalContentAlignment="Center" Content="探针使用已达到预警次数，请注意！"/>
            </DockPanel>
        </Grid>
    </Grid>
</pu:WindowX>