From 92c803fbbeb230f3646b310c327209cbdef0ce74 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Mon, 2 Dec 2024 18:27:27 +0800
Subject: [PATCH] =?UTF-8?q?change-=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=8E=E6=98=BE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.WPF/Page/DevMonitorPage.xaml        | 130 ++++++++++++------
 SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs     |  17 ++-
 .../ViewModel/ProdStatisticsViewModel.cs      |   4 +-
 3 files changed, 104 insertions(+), 47 deletions(-)

diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml b/SlnMesnac.WPF/Page/DevMonitorPage.xaml
index ba36208..d14211e 100644
--- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml
+++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml
@@ -7,8 +7,8 @@
                  mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent">
 
-  
-    
+
+
     <Grid >
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
@@ -16,13 +16,13 @@
         </Grid.RowDefinitions>
         <Border Grid.Row="0"  BorderBrush="White" BorderThickness="0.4" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
             <Grid >
-              
+
                 <StackPanel  VerticalAlignment="Center" Orientation="Horizontal" >
                     <Ellipse x:Name="SystemStatusColor"  VerticalAlignment="Center" Width="50" Height="50" Fill="Red"/>
                     <TextBlock x:Name="SystemStatusTxt" Text="系统停机中" FontSize="35" VerticalAlignment="Center" Width="180"  Foreground="White" />
                     <Button  x:Name="StartButton"  Style="{StaticResource  BUTTON_AGREE}" Content="一键启动"  FontSize="30" Background="LimeGreen" Width="180"  Height="45"  Margin="0 0 20 0" Click="StartButton_Click"/>
                     <Button  x:Name="StopButton"   Style="{StaticResource  BUTTON_AGREE}" Content="一键停止"  FontSize="30" Background="OrangeRed" Width="180" Height="45"  Margin="0,0,20,0" Click="StopButton_Click"/>
-                   
+
                     <TextBlock Text="缓存区重量:" FontSize="25" VerticalAlignment="Center" Width="140"  Foreground="White" HorizontalAlignment="Left" Margin="150 0 10 0" />
                     <TextBlock  x:Name="BufferWeightTxt" Text="0" Width="80" FontSize="25" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
                     <Button  x:Name="SetStopWeightButton"   Content="设置重量阈值"  FontSize="25" Foreground="White" Background="CadetBlue" Width="200"  Height="60"  Margin="0 0 20 0" HorizontalAlignment="Left" Click="SetStopWeightButton_Click" />
@@ -33,7 +33,7 @@
                     <Button   Visibility="Collapsed" x:Name="AmountChangeButton" Style="{StaticResource  BUTTON_AGREE}"  Content="数量调整"  FontSize="30" Background="CadetBlue" Width="180"  Height="60"  Margin="0 0 20 0" HorizontalAlignment="Left" Click="AmountChangeButton_Click"/>
 
                     <Button   x:Name="MachineStopHistoryButton"   Content="停机记录"  FontSize="25" Foreground="White" Background="CadetBlue" Width="200"  Height="60"   Margin="300 0 20 0" HorizontalAlignment="Left" Click="MachineStopHistoryButton_Click"/>
-   
+
                 </StackPanel>
             </Grid>
         </Border>
@@ -70,18 +70,19 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="0.3*"/>
                         </Grid.ColumnDefinitions>
 
-                        
-                            <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
-                                <Ellipse x:Name="UnpackStatus0" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
-                                <TextBlock Text="拆包机MES允许远程" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
-                            </StackPanel>
-                            <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
-                                <Ellipse x:Name="UnpackStatus1" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
-                                <TextBlock Text="拆包机系统运行状态" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
-                            </StackPanel>
-                        
+
+                        <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
+                            <Ellipse x:Name="UnpackStatus0" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
+                            <TextBlock Text="拆包机MES允许远程" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
+                        </StackPanel>
+                        <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
+                            <Ellipse x:Name="UnpackStatus1" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
+                            <TextBlock Text="拆包机系统运行状态" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
+                        </StackPanel>
+
                         <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
                             <Ellipse x:Name="UnpackStatus7" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
                             <TextBlock Text="连接状态" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
@@ -116,7 +117,7 @@
                             <TextBlock  x:Name="UnpackStatus13" Text="" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
                         </StackPanel>
 
-                        
+
                         <StackPanel Grid.Row="5" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
                             <Ellipse  Width="30" Height="30" Visibility="Hidden"/>
                             <TextBlock Text="设备请求叫料信号:" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Width="200" Foreground="White"/>
@@ -138,7 +139,11 @@
                             <TextBlock  x:Name="UnpackStatus5" Text="False" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
                         </StackPanel>
 
-                      
+                        <StackPanel x:Name="UnpackBackColor" Grid.Row="0" Grid.Column="2" Orientation="Horizontal"   Background="Green" Height="50">
+                            <TextBlock Text="拆包机状态" VerticalAlignment="Center" FontSize="24" Foreground="White"/>
+                        </StackPanel>
+
+
                     </Grid>
                     <!--<DataGrid ItemsSource="{Binding UnPackDataGrid}" Background="Transparent" 
           FontSize="15" ColumnHeaderHeight="35" 
@@ -146,7 +151,9 @@
           GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
           ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Left"
           Foreground="#FFFFFF" Margin="150,41,0,0" Grid.RowSpan="2" >
-                        --><!--resourceStyle 399行修改选中字体颜色--><!--
+                        -->
+                    <!--resourceStyle 399行修改选中字体颜色-->
+                    <!--
                         <DataGrid.Columns>
                             <DataGridTextColumn Binding="{Binding Name}" Header="监听点位" Width="3*" IsReadOnly="True"/>
                             <DataGridTextColumn Binding="{Binding Value}" Header="监听值" Width="2*" IsReadOnly="True"/>
@@ -166,14 +173,16 @@
                             <TextBox x:Name="UnpackSet3Txt"  Text="0.00"  Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="0,0,10,0" Foreground="White"/>
                             <TextBlock    Text="螺旋2:" FontSize="20" VerticalAlignment="Center" Margin="5,0,5,0" Foreground="White"/>
                             <TextBox x:Name="UnpackSet4Txt"  Text="0.00"  Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="0,0,10,0" Foreground="White"/>
-                            --><!--<TextBlock    Text="滚筒筛:" FontSize="20" VerticalAlignment="Center" Margin="5,0,5,0" Foreground="White"/>
-                            <TextBox x:Name="UnpackSet5Txt"  Text="0.00"  Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="0,0,10,0" Foreground="White"/>--><!--
+                            -->
+                            <!--<TextBlock    Text="滚筒筛:" FontSize="20" VerticalAlignment="Center" Margin="5,0,5,0" Foreground="White"/>
+                            <TextBox x:Name="UnpackSet5Txt"  Text="0.00"  Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="0,0,10,0" Foreground="White"/>-->
+                            <!--
                             <Button x:Name="UnpackSetButton" Content="频率设定(0-50HZ)" FontSize="20" Width="170"  Height="40" VerticalAlignment="Center" Margin="0,0,0,0" Background="Blue" Click="UnpackSetButton_Click"  />-->
-   
+
                         </StackPanel>
                         <StackPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Top" Orientation="Horizontal" >
-                         
-                            <Button   x:Name="StartUnPackButton"  Content="拆包机启动"  FontSize="20" Background="LimeGreen" Width="120"  Height="40"  Margin="0 0 20 0" Click="StartUnPackButton_Click" />
+
+                            <Button   x:Name="StartUnPackButton"  Content="拆包机启动"  FontSize="20" Background="LimeGreen" Width="125"  Height="40"  Margin="0 0 20 0" Click="StartUnPackButton_Click" />
                             <Button   x:Name="StopUnPackButton" Content="拆包机停止"  FontSize="20" Background="OrangeRed" Width="120" Height="40"  Margin="0,0,20,0" Click="StopUnPackButton_Click"/>
                             <Button  x:Name="StopUrgentButton"  Style="{StaticResource  BUTTON_AGREE}" Content="急停"  FontSize="20" Background="#E4B74C" Width="120"  Height="40"  Margin="0,0,0,0" Click="StopUrgentButton_Click"/>
 
@@ -190,7 +199,7 @@
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <TextBlock Text="烘干机设备监控"  FontSize="22" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                   
+
                     <Grid Grid.Row="1">
 
                         <Grid.RowDefinitions>
@@ -206,14 +215,15 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="0.3*"/>
                         </Grid.ColumnDefinitions>
-                       
-                            <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
-                                <Ellipse x:Name="HotSignal1_1"  VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
-                                <TextBlock Text="烘干机螺旋状态:" FontSize="20" VerticalAlignment="Center"  Width="170" Margin="0,0,20,0" Foreground="White"/>
-                                <TextBlock  x:Name="HotSignal1_1_Value" Text="停止" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
-                            </StackPanel>
-                       
+
+                        <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
+                            <Ellipse x:Name="HotSignal1_1"  VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
+                            <TextBlock Text="烘干机螺旋状态:" FontSize="20" VerticalAlignment="Center"  Width="170" Margin="0,0,20,0" Foreground="White"/>
+                            <TextBlock  x:Name="HotSignal1_1_Value" Text="停止" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
+                        </StackPanel>
+
 
                         <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
                             <Ellipse x:Name="HotSignal1_2" VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
@@ -242,7 +252,7 @@
                             <Ellipse x:Name="HotSignal4_1"  VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
                             <TextBlock Text="烘干机燃烧机运行" FontSize="20" VerticalAlignment="Center" Width="170" Margin="0,0,20,0" Foreground="White"/>
                         </StackPanel>
-                        <StackPanel Grid.Row="3" Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
+                        <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
                             <Ellipse x:Name="HotSignal4_2"  VerticalAlignment="Center" Width="30" Height="30" Fill="Green"/>
                             <TextBlock Text="烘干机存在报警" FontSize="20" VerticalAlignment="Center" Width="170" Margin="0,0,20,0" Foreground="White"/>
                         </StackPanel>
@@ -285,8 +295,17 @@
                             <TextBox x:Name="HotTempTxt"    Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="30,0,10,0" Foreground="White"/>
                             <Button x:Name="HotTempSet" Content="烘干机温度设定" FontSize="20" Width="150"  Height="40" VerticalAlignment="Center" Margin="0,0,20,0" Background="Blue" Click="HotTempSet_Click"  />
                         </StackPanel>-->
+                        <StackPanel x:Name="HotSpiralBackColor" Grid.Row="0" Grid.Column="2" Orientation="Horizontal"   Background="Green" Margin="0,3" Height="50">
+                            <TextBlock Text="螺旋状态" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
+                        </StackPanel>
+                        <StackPanel x:Name="HotFansBackColor" Grid.Row="1" Grid.Column="2" Orientation="Horizontal"   Background="Green" Margin="0,3" Height="50">
+                            <TextBlock Text="风机状态" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
+                        </StackPanel>
+                        <StackPanel x:Name="HotBurnBackColor" Grid.Row="2" Grid.Column="2" Orientation="Horizontal"   Background="Green" Margin="0,3" Height="50">
+                            <TextBlock Text="燃烧状态" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
+                        </StackPanel>
                     </Grid>
-    
+
                     <StackPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Top" Orientation="Horizontal" >
                         <!--<TextBox x:Name="HotSpiralSpeedTxt"   Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="30,0,10,0" Foreground="White"/>
                         <Button x:Name="HotSpiralSpeedSet" Content="螺旋频率设定" FontSize="20" Width="150"  Height="40" VerticalAlignment="Center" Margin="0,0,20,0" Background="Blue" Click="HotSpiralSpeedSet_Click"  />-->
@@ -297,7 +316,7 @@
                         <Button  x:Name="StopDryerHotButton"  Style="{StaticResource  BUTTON_AGREE}" Content="燃烧停止"  FontSize="20" Background="OrangeRed" Width="90" Height="40"  Margin="0,0,20,0" Click="StopDryerHotButton_Click"/>
                         <Button  x:Name="StopDryerFanButton" Style="{StaticResource  BUTTON_AGREE}"  Content="风机停止"  FontSize="20" Background="OrangeRed" Width="90" Height="40"  Margin="0,0,0,0" Click="StopDryerFanButton_Click"/>
                     </StackPanel>
-                   
+
                 </Grid>
 
             </Border>
@@ -320,6 +339,7 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="0.3*"/>
                         </Grid.ColumnDefinitions>
                         <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
                             <Ellipse x:Name="MagNetStatus1"  VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
@@ -337,6 +357,13 @@
                             <Ellipse x:Name="MagNetStatus4" VerticalAlignment="Center" Width="30" Height="30" Fill="Green"/>
                             <TextBlock Text="磁选机设备报警" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
                         </StackPanel>
+
+                        <StackPanel x:Name="MagNetShakeBackColor" Grid.Row="0" Grid.Column="2" Orientation="Horizontal"   Background="Green" Margin="0,3" Height="50">
+                            <TextBlock Text="磁选机震动" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
+                        </StackPanel>
+                        <StackPanel x:Name="MagNetBackColor" Grid.Row="1" Grid.Column="2" Orientation="Horizontal"   Background="Green" Margin="0,3" Height="50">
+                            <TextBlock Text="磁选机磁选" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
+                        </StackPanel>
                     </Grid>
                     <StackPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Top" Orientation="Horizontal" >
                         <Button    x:Name="StartMagNetButton" Style="{StaticResource  BUTTON_AGREE}" Content="磁选启动"  FontSize="20" Background="LimeGreen" Width="150"  Height="40"  Margin="0 0 20 0" Click="StartMagNetButton_Click"/>
@@ -344,7 +371,7 @@
                     </StackPanel>
 
 
-                    
+
                     <TextBlock Grid.Row="3" Text="除尘机设备监控"  FontSize="22" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                     <Grid Grid.Row="4">
                         <Grid.RowDefinitions>
@@ -354,7 +381,12 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="0.3*"/>
                         </Grid.ColumnDefinitions>
+
+                        <StackPanel x:Name="DustBackColor" Grid.Row="0" Grid.Column="2" Orientation="Horizontal"   Background="Green" Margin="0,3" Height="50">
+                            <TextBlock Text="除尘状态" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
+                        </StackPanel>
                         <!--<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
                             <Ellipse x:Name="MagNetStatus11"  VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
                             <TextBlock Text="磁选机震动启动" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
@@ -379,8 +411,8 @@
 
 
 
-                
-                
+
+
                 </Grid>
             </Border>
             <Border Grid.Row="1" Grid.Column="1" BorderBrush="LimeGreen" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
@@ -394,15 +426,16 @@
                     <Grid Grid.Row="1">
 
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="82.238"/>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                            <RowDefinition/>
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="0.3*"/>
                         </Grid.ColumnDefinitions>
                         <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="50 0 0 0">
                             <Ellipse x:Name="SpiralSignal0"  VerticalAlignment="Center" Width="30" Height="30" Fill="Red"/>
@@ -438,14 +471,23 @@
                             <Ellipse x:Name="SpiralSignal5" VerticalAlignment="Center" Width="30" Height="30" Fill="Green"/>
                             <TextBlock Text="螺旋2变频器报警" FontSize="20" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
                         </StackPanel>
+
+
+                        <StackPanel x:Name="Spiral1BackColor" Grid.Row="0" Grid.Column="2" Orientation="Horizontal"   Background="Green" Margin="0,3" Height="50">
+                            <TextBlock Text="螺旋1" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
+                        </StackPanel>
+                        <StackPanel x:Name="Spiral2BackColor" Grid.Row="1" Grid.Column="2" Orientation="Horizontal"   Background="Green" Margin="0,3" Height="50">
+                            <TextBlock Text="螺旋2" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Foreground="White"/>
+                        </StackPanel>
+                        
                     </Grid>
-                   
+
                     <StackPanel Grid.Row="2"  VerticalAlignment="Top" Orientation="Horizontal" HorizontalAlignment="Center">
                         <!--<TextBox x:Name="Speed1Txt"  Text="0.00" Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="10,0,0,0" Foreground="White"/>
                         <TextBlock    Text="/" FontSize="20" VerticalAlignment="Center" Margin="5,0,5,0" Foreground="White"/>
                         <TextBox x:Name="Speed2Txt"  Text="0.00"  Width="70" Height="35" FontSize="20" VerticalAlignment="Center" Margin="0,0,10,0" Foreground="White"/>
                         <Button x:Name="SpiralSpeed" Content="螺旋1/2频率设定(0-50HZ)" FontSize="20" Width="250"  Height="40" VerticalAlignment="Center" Margin="0,0,20,0" Background="Blue" Click="SpiralSpeed_Click" />-->
-                       
+
                         <Button  x:Name="StartSpiral1Button"  Content="螺旋1启动"  FontSize="20" Background="LimeGreen" Width="100"  Height="40"  Margin="30 0 10 0" Click="StartSpiral1Button_Click"/>
                         <Button  x:Name="StartSpiral2Button"  Content="螺旋2启动"  FontSize="20" Background="LimeGreen" Width="100"  Height="40"  Margin="0 0 10 0" Click="StartSpiral2Button_Click"/>
                         <Button  x:Name="StopSpiral1Button"   Content="螺旋1停止"  FontSize="20" Background="OrangeRed" Width="100" Height="40"  Margin="0,0,10,0" Click="StopSpiral1Button_Click"/>
diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
index 8b98029..197aa0d 100644
--- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
+++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
@@ -1965,6 +1965,8 @@ namespace SlnMesnac.WPF.Page
 
                 App.Current.Dispatcher.BeginInvoke((Action)(() =>
                {
+                  
+                   UnpackBackColor.Background = UnPack_Status? Brushes.Green : Brushes.Red;
                    UnpackStatus0.Fill = UnPack_MesUse_Flag ? Brushes.Green : Brushes.Red;
                    UnpackStatus1.Fill = UnPack_Status ? Brushes.Green : Brushes.Red;
 
@@ -2029,7 +2031,7 @@ namespace SlnMesnac.WPF.Page
 
 
         /// <summary>
-        /// 磁选机参数监控
+        /// 磁选机参数监控  / 除尘
         /// </summary>
         private void RefreshMagNet(List<MachineStatusDto> machineStatusDtos, List<DmsRealtimeStatus> realtimeStatusList)
         {
@@ -2039,9 +2041,15 @@ namespace SlnMesnac.WPF.Page
                 bool MagNet_Status = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("磁选机磁选启动"));
                 bool MagNet_MesUse_Flag = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("磁选机MES允许远程"));
                 bool signal3 = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("磁选机设备故障反馈"));
+                //除尘变频器状态
+                bool DustStatus = plc.readBoolByAddress("DB4.DBX148.0");
 
                 App.Current.Dispatcher.BeginInvoke((Action)(() =>
                {
+                   DustBackColor.Background = DustStatus ? Brushes.Green : Brushes.Red;
+                   MagNetShakeBackColor.Background = MagNet_Shake_Status? Brushes.Green : Brushes.Red;
+                   MagNetBackColor.Background = MagNet_Status ? Brushes.Green : Brushes.Red;
+
                    MagNetStatus1.Fill = MagNet_Shake_Status ? Brushes.Green : Brushes.Red;
                    MagNetStatus2.Fill = MagNet_Status ? Brushes.Green : Brushes.Red;
                    MagNetStatus3.Fill = MagNet_MesUse_Flag ? Brushes.Green : Brushes.Red;
@@ -2096,6 +2104,9 @@ namespace SlnMesnac.WPF.Page
 
                 App.Current.Dispatcher.BeginInvoke((Action)(() =>
                {
+                   Spiral1BackColor.Background = Spiral1_Status ? Brushes.Green : Brushes.Red;
+                   Spiral2BackColor.Background = Spiral2_Status ? Brushes.Green : Brushes.Red;
+
                    SpiralSignal0.Fill = Spiral1_MesUse_Flag ? Brushes.Green : Brushes.Red;
                    SpiralSignal1.Fill = Spiral2_MesUse_Flag ? Brushes.Green : Brushes.Red;
                    SpiralSignal2.Fill = Spiral1_Status ? Brushes.Green : Brushes.Red;
@@ -2179,6 +2190,10 @@ namespace SlnMesnac.WPF.Page
 
                 App.Current.Dispatcher.BeginInvoke((Action)(() =>
                {
+                   HotSpiralBackColor.Background = Hot_Spiral_Status == 1 ? Brushes.Green : Brushes.Red;
+                   HotFansBackColor.Background = Hot_Fan_Status == 1 ? Brushes.Green : Brushes.Red;
+                   HotBurnBackColor.Background = Hot_Burn_Status == 1 ? Brushes.Green : Brushes.Red;
+
                    HotSignal1_1.Fill = Hot_Spiral_Status == 1 ? Brushes.Green : Brushes.Red;
                    HotSignal1_1_Value.Text = ChangeHotStatus(Hot_Spiral_Status);
                    HotSignal2_1.Fill = Hot_Fan_Status == 1 ? Brushes.Green : Brushes.Red;
diff --git a/SlnMesnac.WPF/ViewModel/ProdStatisticsViewModel.cs b/SlnMesnac.WPF/ViewModel/ProdStatisticsViewModel.cs
index ebcebf4..5ab18df 100644
--- a/SlnMesnac.WPF/ViewModel/ProdStatisticsViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/ProdStatisticsViewModel.cs
@@ -298,8 +298,8 @@ namespace SlnMesnac.WPF.ViewModel
         private async Task RefreshProductDataGrid(DateTime beginDate, DateTime endDate)
         {
             List<WmsProductInstock> list;
-
-            list = await sqlClient.AsTenant().GetConnection("mes").Queryable<WmsProductInstock>().Where(x => x.warehouseId == 231 && x.updateDate >= beginDate && x.updateDate <= endDate).OrderByDescending(t => t.updateDate).ToListAsync();
+            
+            list = await sqlClient.AsTenant().GetConnection("mes").Queryable<WmsProductInstock>().Where(x => x.warehouseId == 231 && x.beginTime >= beginDate && x.beginTime <= endDate).OrderByDescending(t => t.beginTime).ToListAsync();
 
             if (list != null && list.Count > 0)
             {