diff --git a/InSituLaboratory.Assets/Images/aLarm/img_baojing.png b/InSituLaboratory.Assets/Images/aLarm/img_baojing.png
new file mode 100644
index 0000000..cfd14a7
Binary files /dev/null and b/InSituLaboratory.Assets/Images/aLarm/img_baojing.png differ
diff --git a/InSituLaboratory.Assets/Images/aLarm/img_baojing1.png b/InSituLaboratory.Assets/Images/aLarm/img_baojing1.png
new file mode 100644
index 0000000..dddce10
Binary files /dev/null and b/InSituLaboratory.Assets/Images/aLarm/img_baojing1.png differ
diff --git a/InSituLaboratory.Assets/Images/aLarm/img_daiji.png b/InSituLaboratory.Assets/Images/aLarm/img_daiji.png
new file mode 100644
index 0000000..8958026
Binary files /dev/null and b/InSituLaboratory.Assets/Images/aLarm/img_daiji.png differ
diff --git a/InSituLaboratory.Assets/Images/aLarm/img_erji.png b/InSituLaboratory.Assets/Images/aLarm/img_erji.png
new file mode 100644
index 0000000..51e9bcc
Binary files /dev/null and b/InSituLaboratory.Assets/Images/aLarm/img_erji.png differ
diff --git a/InSituLaboratory.Assets/Images/aLarm/img_erji1.png b/InSituLaboratory.Assets/Images/aLarm/img_erji1.png
new file mode 100644
index 0000000..65b5e84
Binary files /dev/null and b/InSituLaboratory.Assets/Images/aLarm/img_erji1.png differ
diff --git a/InSituLaboratory.Assets/Images/aLarm/img_gognzuo.png b/InSituLaboratory.Assets/Images/aLarm/img_gognzuo.png
new file mode 100644
index 0000000..4518590
Binary files /dev/null and b/InSituLaboratory.Assets/Images/aLarm/img_gognzuo.png differ
diff --git a/InSituLaboratory.Assets/Images/aLarm/img_yiji.png b/InSituLaboratory.Assets/Images/aLarm/img_yiji.png
new file mode 100644
index 0000000..2dbdeae
Binary files /dev/null and b/InSituLaboratory.Assets/Images/aLarm/img_yiji.png differ
diff --git a/InSituLaboratory.Assets/Images/aLarm/img_yiji1.png b/InSituLaboratory.Assets/Images/aLarm/img_yiji1.png
new file mode 100644
index 0000000..ed9c795
Binary files /dev/null and b/InSituLaboratory.Assets/Images/aLarm/img_yiji1.png differ
diff --git a/InSituLaboratory.Assets/Images/aLarm/img_zhengchang.png b/InSituLaboratory.Assets/Images/aLarm/img_zhengchang.png
new file mode 100644
index 0000000..2b6f19e
Binary files /dev/null and b/InSituLaboratory.Assets/Images/aLarm/img_zhengchang.png differ
diff --git a/InSituLaboratory.Assets/Images/aLarm/img_zhengchang1.png b/InSituLaboratory.Assets/Images/aLarm/img_zhengchang1.png
new file mode 100644
index 0000000..66cc81f
Binary files /dev/null and b/InSituLaboratory.Assets/Images/aLarm/img_zhengchang1.png differ
diff --git a/InSituLaboratory.Assets/InSituLaboratory.Assets.csproj b/InSituLaboratory.Assets/InSituLaboratory.Assets.csproj
index 27a6da6..e939ba9 100644
--- a/InSituLaboratory.Assets/InSituLaboratory.Assets.csproj
+++ b/InSituLaboratory.Assets/InSituLaboratory.Assets.csproj
@@ -15,6 +15,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -43,6 +53,20 @@
+
+
+ Always
+
+
+ Always
+
+
+
+
+
+
+
+
Always
@@ -60,6 +84,20 @@
Always
+
+ Always
+
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
Always
diff --git a/InSituLaboratory/ViewModels/Pages/DashboardNewViewModel.cs b/InSituLaboratory/ViewModels/Pages/DashboardNewViewModel.cs
index 9ef9673..dd0fbe1 100644
--- a/InSituLaboratory/ViewModels/Pages/DashboardNewViewModel.cs
+++ b/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;
- CurrentWorkEquipment.ColorMassSpectrometer = data.ColorMassSpectrometer;
- CurrentWorkEquipment.CH4Analyzer = data.CH4Analyzer;
- CurrentWorkEquipment.CO2Analyzer = data.CO2Analyzer;
- CurrentWorkEquipment.ParticleAnalyzer = data.ParticleAnalyzer;
- CurrentWorkEquipment.Sequencer = data.Sequencer;
+
+ #region 当前工作设备
+
+ // MEMS色谱仪
+ switch (data.Chromatograph_MEMS)
+ {
+ 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;
- currentFaultyEquipment.ColorMassSpectrometer = data.ColorMassSpectrometer;
- currentFaultyEquipment.CH4Analyzer = data.CH4Analyzer;
- currentFaultyEquipment.CO2Analyzer = data.CO2Analyzer;
- currentFaultyEquipment.ParticleAnalyzer = data.ParticleAnalyzer;
- currentFaultyEquipment.Sequencer = data.Sequencer;
+
+ // MEMS色谱仪
+ switch (data.Chromatograph_MEMS)
+ {
+ case "故障":
+ currentFaultyEquipment.Chromatograph_MEMS = "/InSituLaboratory.Assets;component/Images/aLarm/img_baojing1.png";
+ 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;
+ }
}
}
diff --git a/InSituLaboratory/Views/MainView.xaml b/InSituLaboratory/Views/MainView.xaml
index d23bd59..52e146b 100644
--- a/InSituLaboratory/Views/MainView.xaml
+++ b/InSituLaboratory/Views/MainView.xaml
@@ -117,7 +117,7 @@
-
+
@@ -262,10 +262,11 @@
-
+
+
@@ -320,9 +321,9 @@
Foreground="White" Click="Button_MinClick"/>
-
+ Foreground="White" Click="Button_MaxClick"/>-->
-
+
@@ -13,7 +13,7 @@
-
+
@@ -124,18 +124,231 @@
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/InSituLaboratory/Views/Pages/RelayView.xaml b/InSituLaboratory/Views/Pages/RelayView.xaml
index 30a3300..12611ed 100644
--- a/InSituLaboratory/Views/Pages/RelayView.xaml
+++ b/InSituLaboratory/Views/Pages/RelayView.xaml
@@ -160,7 +160,7 @@
-
+