数据中心当前工作传感器及当前故障传感器数据绑定

InSituLaboratory.IService/ISysStatusService.cs

@@ -10,6 +10,22 @@ namespace InSituLaboratory.IService
 {
     public  interface ISysStatusService : IBaseService
     {
+        /// <summary>
+        /// 获取主腔体运行状态数据
+        /// </summary>
+        /// <returns></returns>
         IEnumerable<SysStatus> GetSysStauts();
+
+        /// <summary>
+        /// 获取当前工作设备的状态数据
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<CurrentWorkEquipment> GetCurrentWorkEquipment();
+
+        /// <summary>
+        /// 获取当前故障设备的状态数据
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<CurrentFaultyEquipment> GetCurrentFaultyEquipment();
     }
 }

InSituLaboratory.Models/CurrentEquipmentModel.cs

@@ -0,0 +1,106 @@
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace InSituLaboratory.Models
+{
+    /// <summary>
+    ///  当前设备----工作/故障
+    /// </summary>
+    public class CurrentEquipmentModel : BindableBase
+    {
+        /// <summary>
+        /// 采样时间
+        /// </summary>
+        private DateTime? _samplingTime;
+        public DateTime? SamplingTime
+        {
+            get { return _samplingTime; }
+            set { SetProperty(ref _samplingTime, value); }
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        private DateTime? _createTime;
+        public DateTime? CreateTime
+        {
+            get { return _createTime; }
+            set { SetProperty(ref _createTime, value); }
+        }
+
+        /// <summary>
+        /// MEMS色谱仪
+        /// </summary>
+        private string? _chromatograph_MEMS;
+        public string? Chromatograph_MEMS
+        {
+            get { return _chromatograph_MEMS; }
+            set { SetProperty(ref _chromatograph_MEMS, value); }
+        }
+
+        /// <summary>
+        /// MEMS质谱仪
+        /// </summary>
+        private string? _massSpectrometer_MEMS;
+        public string? MassSpectrometer_MEMS
+        {
+            get { return _massSpectrometer_MEMS; }
+            set { SetProperty(ref _massSpectrometer_MEMS, value); }
+        }
+
+        /// <summary>
+        /// 色质联用仪
+        /// </summary>
+        private string? _colorMassSpectrometer;
+        public string? ColorMassSpectrometer
+        {
+            get { return _colorMassSpectrometer; }
+            set { SetProperty(ref _colorMassSpectrometer, value); }
+        }
+
+        /// <summary>
+        /// 甲烷同位素分析仪
+        /// </summary>
+        private string? _cH4Analyzer;
+        public string? CH4Analyzer
+        {
+            get { return _cH4Analyzer; }
+            set { SetProperty(ref _cH4Analyzer, value); }
+        }
+
+        /// <summary>
+        /// 二氧化碳同位素分析仪
+        /// </summary>
+        private string? _cO2Analyzer;
+        public string? CO2Analyzer
+        {
+            get { return _cO2Analyzer; }
+            set { SetProperty(ref _cO2Analyzer, value); }
+        }
+
+        /// <summary>
+        /// 颗粒物分析仪
+        /// </summary>
+        private string? _particleAnalyzer;
+        public string? ParticleAnalyzer
+        {
+            get { return _particleAnalyzer; }
+            set { SetProperty(ref _particleAnalyzer, value); }
+        }
+
+        /// <summary>
+        /// 测序仪
+        /// </summary>
+        private string? _sequencer;
+        public string? Sequencer
+        {
+            get { return _sequencer; }
+            set { SetProperty(ref _sequencer, value); }
+        }
+
+    }
+}

InSituLaboratory.Service/SysStatusService.cs

@@ -15,13 +15,33 @@ namespace InSituLaboratory.Service
         public SysStatusService(DbContext context) : base(context) { }
 
 
-
+        /// <summary>
+        /// 获取主腔体状态数据
+        /// </summary>
+        /// <returns></returns>
         public IEnumerable<SysStatus> GetSysStauts()
         {
             return this.Set<SysStatus>().OrderByDescending(n => n.CreateTime);
-
         }
 
-      
+        /// <summary>
+        /// 获取当前工作设备数据
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<CurrentWorkEquipment> GetCurrentWorkEquipment()
+        {
+            return this.Set<CurrentWorkEquipment>().OrderByDescending(n => n.CreateTime);
+        }
+
+        /// <summary>
+        /// 获取当前故障设备数据
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<CurrentFaultyEquipment> GetCurrentFaultyEquipment()
+        {
+            return this.Set<CurrentFaultyEquipment>().OrderByDescending(n => n.CreateTime);
+        }
+
+
     }
 }

InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs

@@ -11,6 +11,7 @@ using InSituLaboratory.Models;
 using InSituLaboratory.Entities.ExperimentalStationEntities;
 using Prism.Regions;
 using InSituLaboratory.IService;
+using Prism.Commands;
 
 namespace InSituLaboratory.ViewModels.Pages
 {
@@ -19,6 +20,10 @@ namespace InSituLaboratory.ViewModels.Pages
         #region 实体类
         public SysStatusModel SysStatusModel { get; set; } = new SysStatusModel();
 
+        public CurrentEquipmentModel CurrentWorkEquipment { get; set; } = new CurrentEquipmentModel();//当前工作设备
+        public CurrentEquipmentModel currentFaultyEquipment { get; set; } = new CurrentEquipmentModel();//当前故障设备
+
+
         #endregion
 
         ISysStatusService _sysStatusService;
@@ -34,15 +39,51 @@ namespace InSituLaboratory.ViewModels.Pages
         public override void Refresh()
         {
             var sysStatuslist = _sysStatusService.GetSysStauts().ToList();
+            var CurrentWorklist = _sysStatusService.GetCurrentWorkEquipment().ToList();
+            var currentFaultylist = _sysStatusService.GetCurrentFaultyEquipment().ToList();
             if (sysStatuslist.Count() != 0)
             {
                 var data = _sysStatusService.GetSysStauts().First();
-
                 SysStatusModel.PackagingTime = data.PackagingTime;
                 SysStatusModel.SamplingTime = data.SamplingTime;
                 SysStatusModel.Voltage48 = data.Voltage48;
                 SysStatusModel.Current48 = data.Current48;
                 SysStatusModel.BaseStation48VLeakageCS = data.BaseStation48VLeakageCS;
+                SysStatusModel.Batterz48VLeakageCS = data.Batterz48VLeakageCS;
+                SysStatusModel.ICLLeakageCS = data.ICLLeakageCS;
+                SysStatusModel.IComputerLeakageCS = data.IComputerLeakageCS;
+                SysStatusModel.TemperatureStaus1 = data.TemperatureStaus1;
+                SysStatusModel.TemperatureStaus2 = data.TemperatureStaus2;
+                SysStatusModel.HumidityStaus1 = data.HumidityStaus1;
+                SysStatusModel.HumidityStaus2 = data.HumidityStaus2;
+                SysStatusModel.LeakageStaus1 = data.LeakageStaus1;
+                SysStatusModel.LeakageStaus2 = data.LeakageStaus2;
+                SysStatusModel.InternalPressure1 = data.InternalPressure1;
+                SysStatusModel.InternalPressure2 = data.InternalPressure2;
+            }
+
+            if (CurrentWorklist.Count() != 0)
+            {
+                var data = _sysStatusService.GetCurrentWorkEquipment().First();
+                CurrentWorkEquipment.Chromatograph_MEMS = data.Chromatograph_MEMS;
+                CurrentWorkEquipment.MassSpectrometer_MEMS = data.MassSpectrometer_MEMS;
+                CurrentWorkEquipment.ColorMassSpectrometer = data.ColorMassSpectrometer;
+                CurrentWorkEquipment.CH4Analyzer = data.CH4Analyzer;
+                CurrentWorkEquipment.CO2Analyzer = data.CO2Analyzer;
+                CurrentWorkEquipment.ParticleAnalyzer = data.ParticleAnalyzer;
+                CurrentWorkEquipment.Sequencer = data.Sequencer;
+            }
+
+            if (currentFaultylist.Count() != 0)
+            {
+                var data = _sysStatusService.GetCurrentFaultyEquipment().First();
+                currentFaultyEquipment.Chromatograph_MEMS = data.Chromatograph_MEMS;
+                currentFaultyEquipment.MassSpectrometer_MEMS = data.MassSpectrometer_MEMS;
+                currentFaultyEquipment.ColorMassSpectrometer = data.ColorMassSpectrometer;
+                currentFaultyEquipment.CH4Analyzer = data.CH4Analyzer;
+                currentFaultyEquipment.CO2Analyzer = data.CO2Analyzer;
+                currentFaultyEquipment.ParticleAnalyzer = data.ParticleAnalyzer;
+                currentFaultyEquipment.Sequencer = data.Sequencer;
             }
         }
     }

InSituLaboratory/Views/Pages/DashboardView.xaml

@@ -141,6 +141,9 @@
                             </Grid>
                         </StackPanel>
                     </Border>
+
+                    <!--刷新-->
+                    <Button  Content="刷新" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshCommand}" Width="60" Margin="5,0" Background="#88409EFE"/>
                 </UniformGrid>
             </Grid>
 
@@ -176,7 +179,7 @@
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Text="电池48V漏电流状态" FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding SysStatusModel.Batterz48VLeakageCS, Converter={StaticResource ResourceKey=StateBackConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Grid>
                             <Grid Grid.Row="3">
                                 <Grid.ColumnDefinitions>
@@ -184,7 +187,7 @@
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Text="ICL漏电流状态" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
-                                <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding SysStatusModel.ICLLeakageCS, Converter={StaticResource ResourceKey=StateBackConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Grid>
                             <Grid Grid.Row="4">
                                 <Grid.ColumnDefinitions>
@@ -192,7 +195,7 @@
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Text="工控机漏电流状态" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
-                                <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"   HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding SysStatusModel.IComputerLeakageCS, Converter={StaticResource ResourceKey=StateBackConvert}}" CornerRadius="10"   HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Grid>
                         </Grid>
 
@@ -210,7 +213,7 @@
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Text="温度1状态"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding SysStatusModel.TemperatureStaus1, Converter={StaticResource ResourceKey=StateBackConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Grid>
                             <Grid Grid.Row="2">
                                 <Grid.ColumnDefinitions>
@@ -218,7 +221,7 @@
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Text="温度2状态" FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding SysStatusModel.TemperatureStaus2, Converter={StaticResource ResourceKey=StateBackConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Grid>
                             <Grid Grid.Row="3">
                                 <Grid.ColumnDefinitions>
@@ -226,7 +229,7 @@
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Text="湿度1状态" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
-                                <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding SysStatusModel.HumidityStaus1, Converter={StaticResource ResourceKey=StateBackConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Grid>
                             <Grid Grid.Row="4">
                                 <Grid.ColumnDefinitions>
@@ -234,7 +237,7 @@
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Text="湿度2状态" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
-                                <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"   HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding SysStatusModel.HumidityStaus2, Converter={StaticResource ResourceKey=StateBackConvert}}" CornerRadius="10"   HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Grid>
                         </Grid>
 
@@ -249,13 +252,13 @@
                             <Grid Grid.Row="0">
                                 <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal">
                                     <TextBlock Text="正常" Margin="10,5"/>
-                                    <Border Width="20"  Height="20" Background="Green" CornerRadius="10" />
+                                    <Border Width="10"  Height="10" Background="Green" CornerRadius="10" />
                                     <TextBlock Text="一级报警" Margin="10,5"/>
-                                    <Border Width="20"  Height="20" Background="Yellow" CornerRadius="10" />
+                                    <Border Width="10"  Height="10" Background="Yellow" CornerRadius="10" />
                                     <TextBlock Text="二级报警" Margin="10,5"/>
-                                    <Border Width="20"  Height="20" Background="Orange" CornerRadius="10" />
+                                    <Border Width="10"  Height="10" Background="Orange" CornerRadius="10" />
                                     <TextBlock Text="故障" Margin="10,5"/>
-                                    <Border Width="20"  Height="20" Background="red" CornerRadius="10" />
+                                    <Border Width="10"  Height="10" Background="red" CornerRadius="10" />
                                 </StackPanel>
                             </Grid>
                             <Grid Grid.Row="1">
@@ -264,7 +267,7 @@
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Text="漏水1状态"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding SysStatusModel.LeakageStaus1, Converter={StaticResource ResourceKey=StateBackConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Grid>
                             <Grid Grid.Row="2">
                                 <Grid.ColumnDefinitions>
@@ -272,7 +275,7 @@
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Text="漏水2状态" FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding SysStatusModel.LeakageStaus2, Converter={StaticResource ResourceKey=StateBackConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Grid>
                             <Grid Grid.Row="3">
                                 <Grid.ColumnDefinitions>
@@ -280,7 +283,7 @@
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Text="内部压力1状态" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
-                                <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding SysStatusModel.InternalPressure1, Converter={StaticResource ResourceKey=StateBackConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Grid>
                             <Grid Grid.Row="4">
                                 <Grid.ColumnDefinitions>
@@ -288,7 +291,7 @@
                                     <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Text="内部压力2状态" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
-                                <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"   HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding SysStatusModel.InternalPressure2, Converter={StaticResource ResourceKey=StateBackConvert}}" CornerRadius="10"   HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Grid>
                         </Grid>
                     </Grid>
@@ -297,6 +300,7 @@
 
             <!--当前工作状态/当前故障设备-->
             <Grid Grid.Row="2" Margin="0,-40,0,0">
+                
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
                     <ColumnDefinition/>
@@ -322,7 +326,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="MEMS色谱仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding CurrentWorkEquipment.Chromatograph_MEMS, Converter={StaticResource ResourceKey=WorkStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                                 <Grid Grid.Row="2">
                                     <Grid.ColumnDefinitions>
@@ -330,7 +334,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="MEMS质谱仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding CurrentWorkEquipment.MassSpectrometer_MEMS, Converter={StaticResource ResourceKey=WorkStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                                 <Grid Grid.Row="3">
                                     <Grid.ColumnDefinitions>
@@ -338,7 +342,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="色质联用仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding CurrentWorkEquipment.ColorMassSpectrometer, Converter={StaticResource ResourceKey=WorkStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                                 <Grid Grid.Row="4">
                                     <Grid.ColumnDefinitions>
@@ -346,7 +350,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="甲烷同位素分析仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding CurrentWorkEquipment.CH4Analyzer, Converter={StaticResource ResourceKey=WorkStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                             </Grid>
 
@@ -361,9 +365,9 @@
                                 <Grid Grid.Row="0">
                                     <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal" Margin="15,0">
                                         <TextBlock Text="待机" Margin="10,5"/>
-                                        <Border Width="20"  Height="20" Background="Orange" CornerRadius="10" />
+                                        <Border Width="10"  Height="10" Background="Orange" CornerRadius="10" />
                                         <TextBlock Text="工作" Margin="10,5"/>
-                                        <Border Width="20"  Height="20" Background="Green" CornerRadius="10" />
+                                        <Border Width="10"  Height="10" Background="Green" CornerRadius="10" />
                                     </StackPanel>
                                 </Grid>
                                 <Grid Grid.Row="1">
@@ -372,7 +376,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="CO2同位素分析仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding CurrentWorkEquipment.CO2Analyzer, Converter={StaticResource ResourceKey=WorkStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                                 <Grid Grid.Row="2">
                                     <Grid.ColumnDefinitions>
@@ -380,7 +384,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="颗粒物分析仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding CurrentWorkEquipment.ParticleAnalyzer, Converter={StaticResource ResourceKey=WorkStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                                 <Grid Grid.Row="3">
                                     <Grid.ColumnDefinitions>
@@ -388,7 +392,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="测序仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding CurrentWorkEquipment.Sequencer, Converter={StaticResource ResourceKey=WorkStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                             </Grid>
                         </Grid>
@@ -416,7 +420,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="MEMS色谱仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding currentFaultyEquipment.Chromatograph_MEMS, Converter={StaticResource ResourceKey=FaultStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                                 <Grid Grid.Row="2">
                                     <Grid.ColumnDefinitions>
@@ -424,7 +428,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="MEMS质谱仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding currentFaultyEquipment.MassSpectrometer_MEMS, Converter={StaticResource ResourceKey=FaultStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                                 <Grid Grid.Row="3">
                                     <Grid.ColumnDefinitions>
@@ -432,7 +436,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="色质联用仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding currentFaultyEquipment.ColorMassSpectrometer, Converter={StaticResource ResourceKey=FaultStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                                 <Grid Grid.Row="4">
                                     <Grid.ColumnDefinitions>
@@ -440,7 +444,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="甲烷同位素分析仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding currentFaultyEquipment.CH4Analyzer, Converter={StaticResource ResourceKey=FaultStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                             </Grid>
 
@@ -455,9 +459,9 @@
                                 <Grid Grid.Row="0">
                                     <StackPanel HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal" Margin="15,0">
                                         <TextBlock Text="故障" Margin="10,5"/>
-                                        <Border Width="20"  Height="20" Background="Red" CornerRadius="10" />
+                                        <Border Width="10"  Height="10" Background="Red" CornerRadius="10" />
                                         <TextBlock Text="正常" Margin="10,5"/>
-                                        <Border Width="20"  Height="20" Background="Green" CornerRadius="10" />
+                                        <Border Width="10"  Height="10" Background="Green" CornerRadius="10" />
                                     </StackPanel>
                                 </Grid>
                                 <Grid Grid.Row="1">
@@ -466,7 +470,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="CO2同位素分析仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding currentFaultyEquipment.CO2Analyzer, Converter={StaticResource ResourceKey=FaultStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                                 <Grid Grid.Row="2">
                                     <Grid.ColumnDefinitions>
@@ -474,7 +478,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="颗粒物分析仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding currentFaultyEquipment.ParticleAnalyzer, Converter={StaticResource ResourceKey=FaultStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                                 <Grid Grid.Row="3">
                                     <Grid.ColumnDefinitions>
@@ -482,7 +486,7 @@
                                         <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0" Text="测序仪"  FontSize="16"  HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                    <Border Grid.Column="1" Width="20"  Height="20" Background="Green" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                    <Border Grid.Column="1" Width="20"  Height="20" Background="{Binding currentFaultyEquipment.Sequencer, Converter={StaticResource ResourceKey=FaultStateConvert}}" CornerRadius="10"  HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </Grid>
                             </Grid>
                         </Grid>