新的数据页面布局开发完成

InSituLaboratory.Assets/InSituLaboratory.Assets.csproj

@@ -15,6 +15,16 @@
     <None Remove="Fonts\方正楷体简体.ttf" />
     <None Remove="Images\20240201.jpg" />
     <None Remove="Images\6604cd8ecc29d.ico" />
+    <None Remove="Images\aLarm\img_baojing.png" />
+    <None Remove="Images\aLarm\img_baojing1.png" />
+    <None Remove="Images\aLarm\img_daiji.png" />
+    <None Remove="Images\aLarm\img_erji.png" />
+    <None Remove="Images\aLarm\img_erji1.png" />
+    <None Remove="Images\aLarm\img_gognzuo.png" />
+    <None Remove="Images\aLarm\img_yiji.png" />
+    <None Remove="Images\aLarm\img_yiji1.png" />
+    <None Remove="Images\aLarm\img_zhengchang.png" />
+    <None Remove="Images\aLarm\img_zhengchang1.png" />
     <None Remove="Images\Avatar\002m.jpg" />
     <None Remove="Images\background1.jpg" />
     <None Remove="Images\bitbug_favicon.ico" />
@@ -43,6 +53,20 @@
     <None Remove="Images\组6.jpg" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Resource Include="Images\aLarm\img_daiji.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\aLarm\img_gognzuo.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\aLarm\img_yiji1.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="Images\aLarm\img_erji1.png" />
+  </ItemGroup>
+
   <ItemGroup>
     <Resource Include="Fonts\iconfont1.ttf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -60,6 +84,20 @@
     <Resource Include="Images\6604cd8ecc29d.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Images\aLarm\img_baojing.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\aLarm\img_baojing1.png" />
+    <Resource Include="Images\aLarm\img_erji.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\aLarm\img_yiji.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\aLarm\img_zhengchang.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\aLarm\img_zhengchang1.png" />
     <Resource Include="Images\bitbug_favicon.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>

InSituLaboratory/ViewModels/Pages/DashboardNewViewModel.cs

@@ -45,44 +45,437 @@ namespace InSituLaboratory.ViewModels.Pages
                 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;
                 SysStatusModel.TimeSeriesGroupNumber = data.TimeSeriesGroupNumber;
                 SysStatusModel.GroupNumberStatus = data.GroupNumberStatus;
+
+                #region 主腔体状态
+        
+                //基站48V漏电流状态
+                switch (data.BaseStation48VLeakageCS)
+                {
+                    case "正常":
+                        SysStatusModel.BaseStation48VLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    case "一级报警":
+                        SysStatusModel.BaseStation48VLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_yiji1.png";
+                        break;
+                    case "二级报警":
+                        SysStatusModel.BaseStation48VLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_erji1.png";
+                        break;
+                    case "故障":
+                        SysStatusModel.BaseStation48VLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                //电池48V漏电流状态
+                switch (data.Batterz48VLeakageCS)
+                {
+                    case "正常":
+                        SysStatusModel.Batterz48VLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    case "一级报警":
+                        SysStatusModel.Batterz48VLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_yiji1.png";
+                        break;
+                    case "二级报警":
+                        SysStatusModel.Batterz48VLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_erji1.png";
+                        break;
+                    case "故障":
+                        SysStatusModel.Batterz48VLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                //ICL漏电流状态
+                switch (data.ICLLeakageCS)
+                {
+                    case "正常":
+                        SysStatusModel.ICLLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    case "一级报警":
+                        SysStatusModel.ICLLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_yiji1.png";
+                        break;
+                    case "二级报警":
+                        SysStatusModel.ICLLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_erji1.png";
+                        break;
+                    case "故障":
+                        SysStatusModel.ICLLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                //工控机漏电流状态
+                switch (data.IComputerLeakageCS)
+                {
+                    case "正常":
+                        SysStatusModel.IComputerLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    case "一级报警":
+                        SysStatusModel.IComputerLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_yiji1.png";
+                        break;
+                    case "二级报警":
+                        SysStatusModel.IComputerLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_erji1.png";
+                        break;
+                    case "故障":
+                        SysStatusModel.IComputerLeakageCS = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 温度1状态
+                switch (data.TemperatureStaus1)
+                {
+                    case "正常":
+                        SysStatusModel.TemperatureStaus1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    case "一级报警":
+                        SysStatusModel.TemperatureStaus1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_yiji1.png";
+                        break;
+                    case "二级报警":
+                        SysStatusModel.TemperatureStaus1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_erji1.png";
+                        break;
+                    case "故障":
+                        SysStatusModel.TemperatureStaus1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 温度2状态
+                switch (data.TemperatureStaus2)
+                {
+                    case "正常":
+                        SysStatusModel.TemperatureStaus2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    case "一级报警":
+                        SysStatusModel.TemperatureStaus2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_yiji1.png";
+                        break;
+                    case "二级报警":
+                        SysStatusModel.TemperatureStaus2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_erji1.png";
+                        break;
+                    case "故障":
+                        SysStatusModel.TemperatureStaus2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 湿度1状态
+                switch (data.HumidityStaus1)
+                {
+                    case "正常":
+                        SysStatusModel.HumidityStaus1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    case "一级报警":
+                        SysStatusModel.HumidityStaus1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_yiji1.png";
+                        break;
+                    case "二级报警":
+                        SysStatusModel.HumidityStaus1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_erji1.png";
+                        break;
+                    case "故障":
+                        SysStatusModel.HumidityStaus1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 湿度2状态
+                switch (data.HumidityStaus2)
+                {
+                    case "正常":
+                        SysStatusModel.HumidityStaus2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    case "一级报警":
+                        SysStatusModel.HumidityStaus2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_yiji1.png";
+                        break;
+                    case "二级报警":
+                        SysStatusModel.HumidityStaus2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_erji1.png";
+                        break;
+                    case "故障":
+                        SysStatusModel.HumidityStaus2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 漏水1状态
+                switch (data.LeakageStaus1)
+                {
+                    case "正常":
+                        SysStatusModel.LeakageStaus1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    case "一级报警":
+                        SysStatusModel.LeakageStaus1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_yiji1.png";
+                        break;
+                    case "二级报警":
+                        SysStatusModel.LeakageStaus1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_erji1.png";
+                        break;
+                    case "故障":
+                        SysStatusModel.LeakageStaus1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 漏水2状态
+                switch (data.LeakageStaus2)
+                {
+                    case "正常":
+                        SysStatusModel.LeakageStaus2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    case "一级报警":
+                        SysStatusModel.LeakageStaus2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_yiji1.png";
+                        break;
+                    case "二级报警":
+                        SysStatusModel.LeakageStaus2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_erji1.png";
+                        break;
+                    case "故障":
+                        SysStatusModel.LeakageStaus2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 内部压力1状态
+                switch (data.InternalPressure1)
+                {
+                    case "正常":
+                        SysStatusModel.InternalPressure1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    case "一级报警":
+                        SysStatusModel.InternalPressure1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_yiji1.png";
+                        break;
+                    case "二级报警":
+                        SysStatusModel.InternalPressure1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_erji1.png";
+                        break;
+                    case "故障":
+                        SysStatusModel.InternalPressure1 = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 内部压力2状态
+                switch (data.InternalPressure2)
+                {
+                    case "正常":
+                        SysStatusModel.InternalPressure2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    case "一级报警":
+                        SysStatusModel.InternalPressure2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_yiji1.png";
+                        break;
+                    case "二级报警":
+                        SysStatusModel.InternalPressure2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_erji1.png";
+                        break;
+                    case "故障":
+                        SysStatusModel.InternalPressure2 = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                #endregion
             }
 
             if (CurrentWorklist.Count() != 0)
             {
                 var data = _sysStatusService.GetCurrentWorkEquipment().First();
-                CurrentWorkEquipment.Chromatograph_MEMS = data.Chromatograph_MEMS;
+
-                CurrentWorkEquipment.MassSpectrometer_MEMS = data.MassSpectrometer_MEMS;
+                #region 当前工作设备
-                CurrentWorkEquipment.ColorMassSpectrometer = data.ColorMassSpectrometer;
+
-                CurrentWorkEquipment.CH4Analyzer = data.CH4Analyzer;
+                // MEMS色谱仪
-                CurrentWorkEquipment.CO2Analyzer = data.CO2Analyzer;
+                switch (data.Chromatograph_MEMS)
-                CurrentWorkEquipment.ParticleAnalyzer = data.ParticleAnalyzer;
+                {
-                CurrentWorkEquipment.Sequencer = data.Sequencer;
+                    case "待机":
+                        CurrentWorkEquipment.Chromatograph_MEMS = "/InSituLaboratory.Assets;component/Images/aLarm/img_daiji.png";
+                        break;
+                    case "工作":
+                        CurrentWorkEquipment.Chromatograph_MEMS = "/InSituLaboratory.Assets;component/Images/aLarm/img_gognzuo.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // MEMS质谱仪
+                switch (data.MassSpectrometer_MEMS)
+                {
+                    case "待机":
+                        CurrentWorkEquipment.MassSpectrometer_MEMS = "/InSituLaboratory.Assets;component/Images/aLarm/img_daiji.png";
+                        break;
+                    case "工作":
+                        CurrentWorkEquipment.MassSpectrometer_MEMS = "/InSituLaboratory.Assets;component/Images/aLarm/img_gognzuo.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 色质联用仪
+                switch (data.ColorMassSpectrometer)
+                {
+                    case "待机":
+                        CurrentWorkEquipment.ColorMassSpectrometer = "/InSituLaboratory.Assets;component/Images/aLarm/img_daiji.png";
+                        break;
+                    case "工作":
+                        CurrentWorkEquipment.ColorMassSpectrometer = "/InSituLaboratory.Assets;component/Images/aLarm/img_gognzuo.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 甲烷同位素分析仪
+                switch (data.CH4Analyzer)
+                {
+                    case "待机":
+                        CurrentWorkEquipment.CH4Analyzer = "/InSituLaboratory.Assets;component/Images/aLarm/img_daiji.png";
+                        break;
+                    case "工作":
+                        CurrentWorkEquipment.CH4Analyzer = "/InSituLaboratory.Assets;component/Images/aLarm/img_gognzuo.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 二氧化碳同位素分析仪
+                switch (data.CO2Analyzer)
+                {
+                    case "待机":
+                        CurrentWorkEquipment.CO2Analyzer = "/InSituLaboratory.Assets;component/Images/aLarm/img_daiji.png";
+                        break;
+                    case "工作":
+                        CurrentWorkEquipment.CO2Analyzer = "/InSituLaboratory.Assets;component/Images/aLarm/img_gognzuo.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 颗粒物分析仪
+                switch (data.ParticleAnalyzer)
+                {
+                    case "待机":
+                        CurrentWorkEquipment.ParticleAnalyzer = "/InSituLaboratory.Assets;component/Images/aLarm/img_daiji.png";
+                        break;
+                    case "工作":
+                        CurrentWorkEquipment.ParticleAnalyzer = "/InSituLaboratory.Assets;component/Images/aLarm/img_gognzuo.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 测序仪
+                switch (data.Sequencer)
+                {
+                    case "待机":
+                        CurrentWorkEquipment.Sequencer = "/InSituLaboratory.Assets;component/Images/aLarm/img_daiji.png";
+                        break;
+                    case "工作":
+                        CurrentWorkEquipment.Sequencer = "/InSituLaboratory.Assets;component/Images/aLarm/img_gognzuo.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                #endregion
+
             }
 
             if (currentFaultylist.Count() != 0)
             {
                 var data = _sysStatusService.GetCurrentFaultyEquipment().First();
-                currentFaultyEquipment.Chromatograph_MEMS = data.Chromatograph_MEMS;
+
-                currentFaultyEquipment.MassSpectrometer_MEMS = data.MassSpectrometer_MEMS;
+                // MEMS色谱仪
-                currentFaultyEquipment.ColorMassSpectrometer = data.ColorMassSpectrometer;
+                switch (data.Chromatograph_MEMS)
-                currentFaultyEquipment.CH4Analyzer = data.CH4Analyzer;
+                {
-                currentFaultyEquipment.CO2Analyzer = data.CO2Analyzer;
+                    case "故障":
-                currentFaultyEquipment.ParticleAnalyzer = data.ParticleAnalyzer;
+                        currentFaultyEquipment.Chromatograph_MEMS = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
-                currentFaultyEquipment.Sequencer = data.Sequencer;
+                        break;
+                    case "正常":
+                        currentFaultyEquipment.Chromatograph_MEMS = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // MEMS质谱仪
+                switch (data.MassSpectrometer_MEMS)
+                {
+                    case "故障":
+                        currentFaultyEquipment.MassSpectrometer_MEMS = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    case "正常":
+                        currentFaultyEquipment.MassSpectrometer_MEMS = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 色质联用仪
+                switch (data.ColorMassSpectrometer)
+                {
+                    case "故障":
+                        currentFaultyEquipment.ColorMassSpectrometer = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    case "正常":
+                        currentFaultyEquipment.ColorMassSpectrometer = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 甲烷同位素分析仪
+                switch (data.CH4Analyzer)
+                {
+                    case "故障":
+                        currentFaultyEquipment.CH4Analyzer = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    case "正常":
+                        currentFaultyEquipment.CH4Analyzer = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 二氧化碳同位素分析仪
+                switch (data.CO2Analyzer)
+                {
+                    case "故障":
+                        currentFaultyEquipment.CO2Analyzer = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    case "正常":
+                        currentFaultyEquipment.CO2Analyzer = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 颗粒物分析仪
+                switch (data.ParticleAnalyzer)
+                {
+                    case "故障":
+                        currentFaultyEquipment.ParticleAnalyzer = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    case "正常":
+                        currentFaultyEquipment.ParticleAnalyzer = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    default:
+                        break;
+                }
+
+                // 测序仪
+                switch (data.Sequencer)
+                {
+                    case "故障":
+                        currentFaultyEquipment.Sequencer = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+                        break;
+                    case "正常":
+                        currentFaultyEquipment.Sequencer = "/InSituLaboratory.Assets;component/Images/aLarm/img_zhengchang1.png";
+                        break;
+                    default:
+                        break;
+                }
             }
         }
 

InSituLaboratory/Views/MainView.xaml

@@ -117,7 +117,7 @@
 
     <DockPanel>
         <!--左侧菜单-->
-        <Border BorderBrush="Gray" BorderThickness="0,0,1,0" >
+        <Border BorderBrush="Gray" BorderThickness="0,0,0,0" >
             <Grid Width="200" DockPanel.Dock="Left">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="auto"/>
@@ -262,10 +262,11 @@
 
             <Border Grid.Row="1" Background="#F0F6FB" />
 
-            <Grid Background="#011D32">
+            <Grid Background="#002945">
                 <TextBlock VerticalAlignment="Center" HorizontalAlignment="Left"   Margin="15,0">
                       <Run Text="原位实验室主控系统" FontSize="15" FontWeight="ExtraBold" Foreground="#00a7f5" />
                       <Run Text="v1.0" FontSize="14" Foreground="#00a7f5"/>
+                    
                 </TextBlock>
 
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Right" Margin="0,0,10,0">
@@ -320,9 +321,9 @@
                             Foreground="White" Click="Button_MinClick"/>
 
                     <!--最大化按钮-->
-                    <Button Content="&#xe694;" FontFamily="{StaticResource Icons}"
+                    <!--<Button Content="&#xe694;" FontFamily="{StaticResource Icons}"
                             Style="{StaticResource ControlButtonStyle}" FontSize="15"
-                            Foreground="White" Click="Button_MaxClick"/>
+                            Foreground="White" Click="Button_MaxClick"/>-->
 
                     <!--关闭按钮-->
                     <Button Content="&#xe625;" FontFamily="{StaticResource Icons}"
@@ -461,7 +462,7 @@
                                             <RowDefinition Height="auto"/>
                                             <RowDefinition/>
                                         </Grid.RowDefinitions>
-                                        <Border Background="#14273a" BorderBrush="Gray" BorderThickness="0,1,0,0"/>
+                                        <Border Background="#14273a" BorderBrush="Gray" BorderThickness="0,0,0,0"/>
                                         <TabPanel x:Name="HeaderPanel"
                                             Panel.ZIndex="1"
                                             Margin="0,3"

InSituLaboratory/Views/Pages/DashboardNewView.xaml

@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:InSituLaboratory.Views.Pages"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"   FontFamily="{StaticResource SourceHanSansCN-Regular}"
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <Grid.Background>
@@ -13,7 +13,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="60"/>
             <RowDefinition Height="110"/>
-            <RowDefinition/>
+            <RowDefinition Height="300"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
         <Grid >
@@ -124,18 +124,231 @@
         <!--主腔体状态-->
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>
-                <RowDefinition/>
+                <RowDefinition Height="35"/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
+            <Grid>
                 <Image  Source="/InSituLaboratory.Assets;component/Images/chang.png" Width="1340" HorizontalAlignment="Left" Margin="30,0,0,0" />
                 <Image  Source="/InSituLaboratory.Assets;component/Images/主腔体状态字.png" Width="80" HorizontalAlignment="Left" Margin="60,-15,0,0" />
+            </Grid>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="30"/>
+                    </Grid.RowDefinitions>
+                    <Image  Source="{Binding SysStatusModel.BaseStation48VLeakageCS}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <TextBlock Grid.Row="1" Text="基站48V漏电流状态" VerticalAlignment="Center" HorizontalAlignment="Left"  FontSize="14" Foreground="White" Margin="40,0,0,0" />
+                    <Image  Grid.Row="2" Source="{Binding SysStatusModel.TemperatureStaus1}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <TextBlock Grid.Row="3" Text="温度1状态" VerticalAlignment="Center" HorizontalAlignment="Left"  Foreground="White"  FontSize="14"  Margin="60,0,0,0"/>
+                </Grid>
+
+                <Grid Grid.Column="1">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="30"/>
+                    </Grid.RowDefinitions>
+                    <Image  Source="{Binding SysStatusModel.Batterz48VLeakageCS}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <TextBlock Grid.Row="1" Text="电池48V漏电流状态" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="14"  Foreground="White" Margin="40,0,0,0" />
+                    <Image  Grid.Row="2" Source="{Binding SysStatusModel.TemperatureStaus2}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <TextBlock Grid.Row="3" Text="温度2状态" VerticalAlignment="Center" HorizontalAlignment="Left"  Foreground="White"  FontSize="14"  Margin="60,0,0,0"/>
+                </Grid>
+
+                <Grid Grid.Column="2">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="30"/>
+                    </Grid.RowDefinitions>
+                    <Image  Source="{Binding SysStatusModel.ICLLeakageCS}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <TextBlock Grid.Row="1" Text="ICL漏电流状态" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="14"  Foreground="White" Margin="50,0,0,0" />
+                    <Image  Grid.Row="2" Source="{Binding SysStatusModel.HumidityStaus1}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <TextBlock Grid.Row="3" Text="湿度1状态" VerticalAlignment="Center" HorizontalAlignment="Left"  Foreground="White"  FontSize="14"  Margin="60,0,0,0"/>
+                </Grid>
+
+                <Grid Grid.Column="3">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="30"/>
+                    </Grid.RowDefinitions>
+                    <Image  Source="{Binding SysStatusModel.IComputerLeakageCS}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <TextBlock Grid.Row="1" Text="工控机漏电流状态" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="14"  Foreground="White" Margin="40,0,0,0" />
+                    <Image  Grid.Row="2" Source="{Binding SysStatusModel.HumidityStaus2}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <TextBlock Grid.Row="3" Text="湿度2状态" VerticalAlignment="Center" HorizontalAlignment="Left"  Foreground="White"  FontSize="14"  Margin="60,0,0,0"/>
+                </Grid>
+
+                <Grid Grid.Column="4">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="30"/>
+                    </Grid.RowDefinitions>
+                    <Image  Source="{Binding SysStatusModel.InternalPressure1}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <TextBlock Grid.Row="1" Text="内部压力1状态" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="14"  Foreground="White" Margin="50,0,0,0" />
+                    <Image  Grid.Row="2" Source="{Binding SysStatusModel.LeakageStaus1}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <TextBlock Grid.Row="3" Text="漏水1状态" VerticalAlignment="Center" HorizontalAlignment="Left"  Foreground="White"  FontSize="14"  Margin="60,0,0,0"/>
+                </Grid>
+
+                <Grid Grid.Column="5">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition Height="30"/>
+                    </Grid.RowDefinitions>
+                    <Image  Source="{Binding SysStatusModel.InternalPressure2}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <TextBlock Grid.Row="1" Text="内部压力2状态" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="14"  Foreground="White" Margin="50,0,0,0" />
+                    <Image  Grid.Row="2" Source="{Binding SysStatusModel.LeakageStaus2}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <TextBlock Grid.Row="3" Text="漏水2状态" VerticalAlignment="Center" HorizontalAlignment="Left"  Foreground="White"  FontSize="14"  Margin="60,0,0,0"/>
+                </Grid>
 
             </Grid>
 
+
+        </Grid>
+
+        <Grid Grid.Row="3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <!--主腔体当前工作设备-->
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="30"/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <Grid>
+                    <Image  Source="/InSituLaboratory.Assets;component/Images/横线2.png" Width="660" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <Image  Source="/InSituLaboratory.Assets;component/Images/主腔体当前工作设备.png" Width="180" HorizontalAlignment="Left" Margin="30,-35,0,0" />
+                </Grid>
+                <Grid Grid.Row="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="50"/>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="70"/>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="70"/>
+                            <RowDefinition Height="30"/>
+                        </Grid.RowDefinitions>
+                        <Image  Source="{Binding CurrentWorkEquipment.Chromatograph_MEMS}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="1" Text="MEMS色谱仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="50,0,0,0" />
+                        <Image Grid.Row="2"  Source="{Binding CurrentWorkEquipment.CH4Analyzer}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="3" Text="甲烷同位素分析仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="50,0,0,0" />
+                        <Image Grid.Row="4"  Source="{Binding CurrentWorkEquipment.CH4Analyzer}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="5" Text="测序仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="70,0,0,0" />
+                    </Grid>
+
+                    <Grid Grid.Column="1">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="50"/>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="70"/>
+                            <RowDefinition Height="30"/>
+                        </Grid.RowDefinitions>
+                        <Image  Source="{Binding CurrentWorkEquipment.CO2Analyzer}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="1" Text="CO2同位素分析仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="50,0,0,0" />
+                        <Image Grid.Row="2"  Source="{Binding CurrentWorkEquipment.ColorMassSpectrometer}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="3" Text="色质联用仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="60,0,0,0" />
+                    </Grid>
+
+                    <Grid Grid.Column="2">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="50"/>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="70"/>
+                            <RowDefinition Height="30"/>
+                        </Grid.RowDefinitions>
+                        <Image  Source="{Binding CurrentWorkEquipment.ParticleAnalyzer}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="1" Text="颗粒物分析仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="50,0,0,0" />
+                        <Image Grid.Row="2"  Source="{Binding CurrentWorkEquipment.MassSpectrometer_MEMS}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="3" Text="MEMS质谱仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="60,0,0,0" />
+                    </Grid>
+                </Grid>
+            </Grid>
+
+            <!--主腔体当前故障设备-->
+            <Grid Grid.Column="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="30"/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <Grid>
+                    <Image  Source="/InSituLaboratory.Assets;component/Images/横线2.png" Width="640" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                    <Image  Source="/InSituLaboratory.Assets;component/Images/主腔体当前故障设备.png" Width="180" HorizontalAlignment="Left" Margin="30,-35,0,0" />
+                </Grid>
+                <Grid Grid.Row="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="50"/>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="70"/>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="70"/>
+                            <RowDefinition Height="30"/>
+                        </Grid.RowDefinitions>
+                        <Image  Source="{Binding currentFaultyEquipment.Chromatograph_MEMS}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="1" Text="MEMS色谱仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="50,0,0,0" />
+                        <Image Grid.Row="2"  Source="{Binding currentFaultyEquipment.CH4Analyzer}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="3" Text="甲烷同位素分析仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="50,0,0,0" />
+                        <Image Grid.Row="4"  Source="{Binding currentFaultyEquipment.CH4Analyzer}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="5" Text="测序仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="70,0,0,0" />
+                    </Grid>
+
+                    <Grid Grid.Column="1">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="50"/>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="70"/>
+                            <RowDefinition Height="30"/>
+                        </Grid.RowDefinitions>
+                        <Image  Source="{Binding currentFaultyEquipment.CO2Analyzer}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="1" Text="CO2同位素分析仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="50,0,0,0" />
+                        <Image Grid.Row="2"  Source="{Binding currentFaultyEquipment.ColorMassSpectrometer}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="3" Text="色质联用仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="60,0,0,0" />
+                    </Grid>
+
+                    <Grid Grid.Column="2">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="50"/>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="70"/>
+                            <RowDefinition Height="30"/>
+                        </Grid.RowDefinitions>
+                        <Image  Source="{Binding currentFaultyEquipment.ParticleAnalyzer}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="1" Text="颗粒物分析仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="50,0,0,0" />
+                        <Image Grid.Row="2"  Source="{Binding currentFaultyEquipment.MassSpectrometer_MEMS}" Width="130" HorizontalAlignment="Left" Margin="30,0,0,0" />
+                        <TextBlock Grid.Row="3" Text="MEMS质谱仪" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" FontSize="14" Margin="60,0,0,0" />
+                    </Grid>
+                </Grid>
+            </Grid>
+        </Grid>
     </Grid>
 </UserControl>

InSituLaboratory/Views/Pages/RelayView.xaml

@@ -160,7 +160,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock FontSize="17"  Text="工控机:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock FontSize="15"  Text="工控机:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border  Grid.Column="1"   Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center"  CornerRadius="10"  Background="{Binding sysSensorModels.InComputer, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
                             <Button Grid.Column="2" Name="InComputer" Content="打开"   Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}" >
                                 <Button.CommandParameter>
@@ -190,7 +190,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="色质联用:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="色质联用:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border  Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"  Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.CMSpectrometry, Converter={StaticResource ResourceKey=RelayStateConvert}}"  />
                             <Button Grid.Column="2"  x:Name="CMSpectrometry" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}"  >
                                 <Button.CommandParameter>
@@ -220,7 +220,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="备用串口1:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" />
+                            <TextBlock  FontSize="15"  Text="备用串口1:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" />
                             <Border  Grid.Column="1" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center"  CornerRadius="10"  Background="{Binding sysSensorModels.Light1, Converter={StaticResource ResourceKey=RelayStateConvert}}"  />
                             <Button  Grid.Column="2" x:Name="Light1" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}" >
                                 <Button.CommandParameter>
@@ -258,7 +258,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="备用串口2:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" />
+                            <TextBlock  FontSize="15"  Text="备用串口2:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" />
                             <Border  Grid.Column="1" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center"  CornerRadius="10"  Background="{Binding sysSensorModels.Light2, Converter={StaticResource ResourceKey=RelayStateConvert}}"  />
                             <Button  Grid.Column="2" x:Name="Light2" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}" >
                                 <Button.CommandParameter>
@@ -289,7 +289,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="光通讯机:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="光通讯机:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border  Grid.Column="1" Width="20" Height="20"   CornerRadius="10" HorizontalAlignment="Center" VerticalAlignment="Center"  Background="{Binding sysSensorModels.LightMachine, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
                             <Button  Grid.Column="2"  x:Name="LightMachine" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}">
                                 <Button.CommandParameter>
@@ -320,7 +320,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="ADCP:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="ADCP:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border  Grid.Column="1" Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.ADCP, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
                             <Button  Grid.Column="2" x:Name="ADCP" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}" >
                                 <Button.CommandParameter>
@@ -359,7 +359,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="CTD:" HorizontalAlignment="Center" VerticalAlignment="Center"  Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="CTD:" HorizontalAlignment="Center" VerticalAlignment="Center"  Foreground="White"/>
                             <Border Grid.Column="1"  Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.CTD, Converter={StaticResource ResourceKey=RelayStateConvert}}"  />
                             <Button Grid.Column="2" x:Name="CTD" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}" >
                                 <Button.CommandParameter>
@@ -389,7 +389,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="气相色谱仪:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="气相色谱仪:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border  Grid.Column="1" Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.SP, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
                             <Button Grid.Column="2" x:Name="SP" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}" >
                                 <Button.CommandParameter>
@@ -419,7 +419,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="声学定位:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="声学定位:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border  Grid.Column="1" Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.AcousticPositioning, Converter={StaticResource ResourceKey=RelayStateConvert}}"  />
                             <Button Grid.Column="2" x:Name="AcousticPositioning" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}"  >
                                 <Button.CommandParameter>
@@ -458,7 +458,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="CO2:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="CO2:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border  Grid.Column="1" Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.CO2, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
                             <Button Grid.Column="2" x:Name="CO2" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand }">
                                 <Button.CommandParameter>
@@ -489,7 +489,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="质谱仪:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="质谱仪:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border  Grid.Column="1" Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.ZP , Converter={StaticResource ResourceKey=RelayStateConvert}}" />
                             <Button Grid.Column="2" x:Name="ZP" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}"  >
                                 <Button.CommandParameter>
@@ -521,7 +521,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="CH4:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="CH4:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border  Grid.Column="1" Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.CH4, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
                             <Button Grid.Column="2" x:Name="CH4" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}"  >
                                 <Button.CommandParameter>
@@ -559,7 +559,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="显微拉曼:" HorizontalAlignment="Center" VerticalAlignment="Center"  Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="显微拉曼:" HorizontalAlignment="Center" VerticalAlignment="Center"  Foreground="White"/>
                             <Border Grid.Column="1"  Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.RamanAnalyzer, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
                             <Button Grid.Column="2" x:Name="RamanAnalyzer" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}"  >
                                 <Button.CommandParameter>
@@ -590,7 +590,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="备用网口:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="备用网口:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border  Grid.Column="1" Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.NetEquipment, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
                             <Button Grid.Column="2" x:Name="NetEquipment" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}">
                                 <Button.CommandParameter>
@@ -621,7 +621,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="ICL:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="ICL:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border Grid.Column="1" Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.SerialPortServer, Converter={StaticResource ResourceKey=RelayStateConvert}}"  />
                             <Button Grid.Column="2" x:Name="SerialPortServer" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}"  >
                                 <Button.CommandParameter>
@@ -660,7 +660,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="摄像1:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="摄像1:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border   Grid.Column="1" Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.Camera1, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
                             <Button Grid.Column="2" x:Name="Camera1" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}"  >
                                 <Button.CommandParameter>
@@ -691,7 +691,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="摄像2:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="摄像2:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border  Grid.Column="1" Width="20" Height="20"   CornerRadius="10"  Background="{Binding sysSensorModels.Camera2, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
                             <Button Grid.Column="2" x:Name="Camera2" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand}"  >
                                 <Button.CommandParameter>
@@ -722,7 +722,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock  FontSize="17"  Text="电交换机2:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
+                            <TextBlock  FontSize="15"  Text="电交换机2:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
                             <Border  Grid.Column="1" Width="20" Height="20"   CornerRadius="10" Background="{Binding sysSensorModels.ElectricSwitch2, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
                             <Button Grid.Column="2" x:Name="ElectricSwitch2" Content="打开"  Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}"  Command="{Binding RelayCommand }">
                                 <Button.CommandParameter>