优化bug；

alielie

2025-10-10 15bbd62b0b24b72c717ae91ab45348a2083ad04e

 Plugin.TestResult/ViewControl.xaml

@@ -1,4 +1,4 @@
<hb:PluginControl x:Class="Plugin.TestResult_WPF.ViewControl"
<hb:PluginMaskControl x:Class="Plugin.TestResult_WPF.ViewControl"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -11,6 +11,7 @@
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
             mc:Ignorable="d" 
                      Style="{StaticResource pluginMaskControl}"
             Loaded="UserControl_Loaded"
             d:DesignHeight="450" d:DesignWidth="800">
    <UserControl.Resources>
@@ -39,11 +40,12 @@
        </Grid.ColumnDefinitions>
        <local:TestResultView x:Name="testResultView" Grid.Column="0" Loaded="testResultView_Loaded" />
        <StackPanel Grid.Column="1" Background="#FFF">
            <GroupBox Header="产品信息">
            <GroupBox Header="{DynamicResource Tr.ProductInfo}">
                <ComboBox x:Name="modelSelect" Style="{StaticResource FormComboxStyle}"
                          SelectionChanged="modelSelect_SelectionChanged"></ComboBox>
                          pu:ComboBoxHelper.ClearButtonVisibility="Collapsed"
                          SelectionChanged="modelSelect_SelectionChanged"/>
            </GroupBox>
            <GroupBox Header="生产统计">
            <GroupBox Header="{DynamicResource Tr.Status}">
                <StackPanel>
                    <Label HorizontalContentAlignment="Center" HorizontalAlignment="Stretch">
                        <Label.Style>
@@ -54,12 +56,12 @@
                                <Style.Triggers>
                                    <DataTrigger Binding="{Binding mesStatus}" Value="true">
                                        <Setter Property="Background" Value="Green"/>
                                        <Setter Property="Content" Value="MES开"/>
                                        <Setter Property="Content" Value="{DynamicResource Tr.MES_OPEN}"/>
                                        <Setter Property="Foreground" Value="White"/>
                                    </DataTrigger>
                                    <DataTrigger Binding="{Binding mesStatus}" Value="false">
                                        <Setter Property="Background" Value="Red"/>
                                        <Setter Property="Content" Value="MES关"/>
                                        <Setter Property="Content" Value="{DynamicResource Tr.MES_CLOSE}"/>
                                        <Setter Property="Foreground" Value="White"/>
                                    </DataTrigger>
                                </Style.Triggers>
@@ -94,27 +96,25 @@
            </GroupBox>
            <GroupBox Header="操作">
                <StackPanel dp:StackPanelHelper.ChildSpace="20">
                    <Button x:Name="btnStart" Click="Start_Click" Style="{StaticResource SuccessButton}">
                        <Button.Content>启动</Button.Content>
                    </Button>
                    <Button x:Name="btnStart" Click="Start_Click" Style="{StaticResource SuccessButton}"
                            Content="{DynamicResource App.Start}"/>

                    <Button x:Name="btnStop" Click="Stop_Click" Style="{StaticResource DangerButton}">
                        <Button.Content>停止</Button.Content>
                    </Button>
                    <Button x:Name="btnStop" Click="Stop_Click" Style="{StaticResource DangerButton}"
                            Content="{DynamicResource App.Stop}"/>

                    <Button x:Name="btnScan1" Click="Scan_Click_1" Style="{StaticResource PrimaryButton}">
                        <Button.Content>一区扫码</Button.Content>
                    </Button>
                    <Button x:Name="btnClear" Click="BtnClear_Click" Style="{StaticResource PrimaryButton}"
                            Content="{DynamicResource Ts.BtnClearNum}"/>

                    <Button x:Name="btnScan2" Click="Scan_Click_2" Style="{StaticResource PrimaryButton}">
                        <Button.Content>二区扫码</Button.Content>
                    </Button>
                    <!-- <Button Content="计数清零"/>
                    <Button Content="扫码"/>
                    <Button Content="一区手动"/>
                    <Button Content="二区手动"/>-->
                    <Button x:Name="scannerSetting" Click="ScannerSetting_Click" Style="{StaticResource PrimaryButton}"
        Content="扫码枪设置"/>

                    <!--<Button x:Name="btnScan1" Click="Scan_Click_1" Style="{StaticResource PrimaryButton}"
                            Content="{DynamicResource Tr.Zone1Scan}"/>

                    <Button x:Name="btnScan2" Click="Scan_Click_2" Style="{StaticResource PrimaryButton}"
                            Content="{DynamicResource Tr.Zone2Scan}"/>-->
                </StackPanel>
            </GroupBox>
        </StackPanel>
    </Grid>
</hb:PluginControl>
</hb:PluginMaskControl>