diff --git a/InSituLaboratory.Base/SensorStateConvert.cs b/InSituLaboratory.Base/SensorStateConvert.cs new file mode 100644 index 0000000..c80bfd1 --- /dev/null +++ b/InSituLaboratory.Base/SensorStateConvert.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using System.Windows.Media; + +namespace InSituLaboratory.Base +{ + /// + /// 传感器故障状态监控 + /// + public class SensorStateConvert : IValueConverter + { + public static object ConvertObject; + + object IValueConverter.Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + Brush background = null; + if ((string)value == "正常") + { + //绿色 + background = new SolidColorBrush(Color.FromRgb(0, 255, 0)); + } + else if ((string)value == "警报") + { + //黄色 + background = new SolidColorBrush(Color.FromRgb(255, 255, 0)); + } + else if ((string)value == "未开启") + { + //灰色 + background = new SolidColorBrush(Color.FromRgb(128, 128, 128)); + } + else if ((string)value == "未监控") + { + //灰色 + background = new SolidColorBrush(Color.FromRgb(128, 128, 128)); + } + else if ((string)value == "未开启/未监控") + { + //灰色 + background = new SolidColorBrush(Color.FromRgb(128, 128, 128)); + } + else if ((string)value == "故障") + { + //红色 + background = new SolidColorBrush(Color.FromRgb(255, 0, 0)); + } + + return background; + } + + object IValueConverter.ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/InSituLaboratory.Entities/Sensor/MEMSSpModel.cs b/InSituLaboratory.Entities/Sensor/MEMSSpModel.cs new file mode 100644 index 0000000..08fad50 --- /dev/null +++ b/InSituLaboratory.Entities/Sensor/MEMSSpModel.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InSituLaboratory.Entities.Sensor +{ + /// + /// MEMS色谱仪 + /// + public class MEMSSpModel + { + /// + /// 主键 + /// + [Key] + public int Id { get; set; } + + /// + /// 采样时间 + /// + public DateTime SamplingTime { get; set; } + + /// + /// 记录时间 + /// + public DateTime CreateTime { get; set; } + + /// + /// 故障代码--设备温度 (未开启/未监控 正常 警报 故障) + /// + public string? Tem { get; set; } + + /// + /// 故障代码--设备湿度 (未开启/未监控 正常 警报 故障) + /// + public string? Hum { get; set; } + + /// + /// 故障代码--压力 (未开启/未监控 正常 警报 故障) + /// + public string? Pressure { get; set; } + + /// + /// 故障代码--绝缘 (未开启/未监控 正常 警报 故障) + /// + public string? Insulation { get; set; } + + /// + /// C2浓度 + /// + public float? C2 { get; set; } + + /// + /// C3浓度 + /// + public float? C3 { get; set; } + + /// + /// C4浓度 + /// + public float? C4 { get; set; } + } +} diff --git a/InSituLaboratory.Entities/BaseCavity.cs b/InSituLaboratory.Entities/SysData/BaseCavity.cs similarity index 85% rename from InSituLaboratory.Entities/BaseCavity.cs rename to InSituLaboratory.Entities/SysData/BaseCavity.cs index f2ec62e..119ad64 100644 --- a/InSituLaboratory.Entities/BaseCavity.cs +++ b/InSituLaboratory.Entities/SysData/BaseCavity.cs @@ -5,9 +5,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace InSituLaboratory.Entities +namespace InSituLaboratory.Entities.SysData { - public class BaseCavity + public class BaseCavity { /// /// 记录时间 diff --git a/InSituLaboratory.Entities/cavitybatterylevel.cs b/InSituLaboratory.Entities/SysData/cavitybatterylevel.cs similarity index 83% rename from InSituLaboratory.Entities/cavitybatterylevel.cs rename to InSituLaboratory.Entities/SysData/cavitybatterylevel.cs index 87be22c..fcb58d9 100644 --- a/InSituLaboratory.Entities/cavitybatterylevel.cs +++ b/InSituLaboratory.Entities/SysData/cavitybatterylevel.cs @@ -5,12 +5,12 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace InSituLaboratory.Entities +namespace InSituLaboratory.Entities.SysData { /// /// 电池电量表 /// - public class cavitybatterylevel: BaseCavity + public class cavitybatterylevel : BaseCavity { /// /// 数据编号 diff --git a/InSituLaboratory.Entities/cavityenergyconversion.cs b/InSituLaboratory.Entities/SysData/cavityenergyconversion.cs similarity index 97% rename from InSituLaboratory.Entities/cavityenergyconversion.cs rename to InSituLaboratory.Entities/SysData/cavityenergyconversion.cs index 3ba21a2..f72c1f9 100644 --- a/InSituLaboratory.Entities/cavityenergyconversion.cs +++ b/InSituLaboratory.Entities/SysData/cavityenergyconversion.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace InSituLaboratory.Entities +namespace InSituLaboratory.Entities.SysData { /// /// 腔体电能转换板使能状态表 diff --git a/InSituLaboratory.Entities/cavityenvironment.cs b/InSituLaboratory.Entities/SysData/cavityenvironment.cs similarity index 96% rename from InSituLaboratory.Entities/cavityenvironment.cs rename to InSituLaboratory.Entities/SysData/cavityenvironment.cs index e9eb3d4..0bf0a50 100644 --- a/InSituLaboratory.Entities/cavityenvironment.cs +++ b/InSituLaboratory.Entities/SysData/cavityenvironment.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace InSituLaboratory.Entities +namespace InSituLaboratory.Entities.SysData { /// /// 腔体内部环境 diff --git a/InSituLaboratory.Entities/cavityoperationstatus.cs b/InSituLaboratory.Entities/SysData/cavityoperationstatus.cs similarity index 97% rename from InSituLaboratory.Entities/cavityoperationstatus.cs rename to InSituLaboratory.Entities/SysData/cavityoperationstatus.cs index f06b654..2a55864 100644 --- a/InSituLaboratory.Entities/cavityoperationstatus.cs +++ b/InSituLaboratory.Entities/SysData/cavityoperationstatus.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace InSituLaboratory.Entities +namespace InSituLaboratory.Entities.SysData { /// /// 腔体运行状态表 diff --git a/InSituLaboratory.Entities/cavityoutputcurrent.cs b/InSituLaboratory.Entities/SysData/cavityoutputcurrent.cs similarity index 96% rename from InSituLaboratory.Entities/cavityoutputcurrent.cs rename to InSituLaboratory.Entities/SysData/cavityoutputcurrent.cs index 43c5faa..626cb66 100644 --- a/InSituLaboratory.Entities/cavityoutputcurrent.cs +++ b/InSituLaboratory.Entities/SysData/cavityoutputcurrent.cs @@ -5,12 +5,12 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace InSituLaboratory.Entities +namespace InSituLaboratory.Entities.SysData { /// /// 腔体输出电流表 /// - public class cavityoutputcurrent: BaseCavity + public class cavityoutputcurrent : BaseCavity { /// /// 数据编号 diff --git a/InSituLaboratory.Entities/cavityoutputfeedback.cs b/InSituLaboratory.Entities/SysData/cavityoutputfeedback.cs similarity index 98% rename from InSituLaboratory.Entities/cavityoutputfeedback.cs rename to InSituLaboratory.Entities/SysData/cavityoutputfeedback.cs index b4cee50..4c4b90f 100644 --- a/InSituLaboratory.Entities/cavityoutputfeedback.cs +++ b/InSituLaboratory.Entities/SysData/cavityoutputfeedback.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace InSituLaboratory.Entities +namespace InSituLaboratory.Entities.SysData { /// /// 腔体输出反馈表 diff --git a/InSituLaboratory.Entities/cavityoutputstatus.cs b/InSituLaboratory.Entities/SysData/cavityoutputstatus.cs similarity index 98% rename from InSituLaboratory.Entities/cavityoutputstatus.cs rename to InSituLaboratory.Entities/SysData/cavityoutputstatus.cs index 4347be5..d625f83 100644 --- a/InSituLaboratory.Entities/cavityoutputstatus.cs +++ b/InSituLaboratory.Entities/SysData/cavityoutputstatus.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace InSituLaboratory.Entities +namespace InSituLaboratory.Entities.SysData { /// /// 腔体输出状态表 diff --git a/InSituLaboratory.IService/History/ICavityBatteryLevelService.cs b/InSituLaboratory.IService/History/ICavityBatteryLevelService.cs index 0f87396..093d71a 100644 --- a/InSituLaboratory.IService/History/ICavityBatteryLevelService.cs +++ b/InSituLaboratory.IService/History/ICavityBatteryLevelService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using System; using System.Collections.Generic; using System.Linq; diff --git a/InSituLaboratory.IService/History/ICavityEnergyConversionService.cs b/InSituLaboratory.IService/History/ICavityEnergyConversionService.cs index 912cd18..8331ad0 100644 --- a/InSituLaboratory.IService/History/ICavityEnergyConversionService.cs +++ b/InSituLaboratory.IService/History/ICavityEnergyConversionService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using System; using System.Collections.Generic; using System.Linq; diff --git a/InSituLaboratory.IService/History/ICavityEnvironmentService.cs b/InSituLaboratory.IService/History/ICavityEnvironmentService.cs index 3885255..bd24991 100644 --- a/InSituLaboratory.IService/History/ICavityEnvironmentService.cs +++ b/InSituLaboratory.IService/History/ICavityEnvironmentService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using System; using System.Collections.Generic; using System.Linq; diff --git a/InSituLaboratory.IService/History/ICavityOperationService.cs b/InSituLaboratory.IService/History/ICavityOperationService.cs index edddfef..9264327 100644 --- a/InSituLaboratory.IService/History/ICavityOperationService.cs +++ b/InSituLaboratory.IService/History/ICavityOperationService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using System; using System.Collections.Generic; using System.Linq; diff --git a/InSituLaboratory.IService/History/ICavityOtputFeedBackService.cs b/InSituLaboratory.IService/History/ICavityOtputFeedBackService.cs index aeb3f51..878460b 100644 --- a/InSituLaboratory.IService/History/ICavityOtputFeedBackService.cs +++ b/InSituLaboratory.IService/History/ICavityOtputFeedBackService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using System; using System.Collections.Generic; using System.Linq; diff --git a/InSituLaboratory.IService/History/ICavityOtputStatusService.cs b/InSituLaboratory.IService/History/ICavityOtputStatusService.cs index c31e578..ba8601b 100644 --- a/InSituLaboratory.IService/History/ICavityOtputStatusService.cs +++ b/InSituLaboratory.IService/History/ICavityOtputStatusService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using System; using System.Collections.Generic; using System.Linq; diff --git a/InSituLaboratory.IService/History/ICavityOutputCurrentService.cs b/InSituLaboratory.IService/History/ICavityOutputCurrentService.cs index 6c96d6d..1a0398e 100644 --- a/InSituLaboratory.IService/History/ICavityOutputCurrentService.cs +++ b/InSituLaboratory.IService/History/ICavityOutputCurrentService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using System; using System.Collections.Generic; using System.Linq; diff --git a/InSituLaboratory.ORM/NoimptyDbContext.cs b/InSituLaboratory.ORM/NoimptyDbContext.cs index 3211586..e496588 100644 --- a/InSituLaboratory.ORM/NoimptyDbContext.cs +++ b/InSituLaboratory.ORM/NoimptyDbContext.cs @@ -1,6 +1,7 @@ using InSituLaboratory.Entities; using InSituLaboratory.Entities.ExperimentalStationEntities; +using InSituLaboratory.Entities.SysData; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using System.Globalization; diff --git a/InSituLaboratory.Service/History/CavityBatteryLevelService.cs b/InSituLaboratory.Service/History/CavityBatteryLevelService.cs index 4730d51..df7531b 100644 --- a/InSituLaboratory.Service/History/CavityBatteryLevelService.cs +++ b/InSituLaboratory.Service/History/CavityBatteryLevelService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using Microsoft.EntityFrameworkCore; using System; diff --git a/InSituLaboratory.Service/History/CavityEnergyConversionService.cs b/InSituLaboratory.Service/History/CavityEnergyConversionService.cs index 79a296f..8eb2f16 100644 --- a/InSituLaboratory.Service/History/CavityEnergyConversionService.cs +++ b/InSituLaboratory.Service/History/CavityEnergyConversionService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using Microsoft.EntityFrameworkCore; using System; diff --git a/InSituLaboratory.Service/History/CavityEnvironmentService.cs b/InSituLaboratory.Service/History/CavityEnvironmentService.cs index a3a5e53..481f7ce 100644 --- a/InSituLaboratory.Service/History/CavityEnvironmentService.cs +++ b/InSituLaboratory.Service/History/CavityEnvironmentService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using Microsoft.EntityFrameworkCore; using System; diff --git a/InSituLaboratory.Service/History/CavityOperationService.cs b/InSituLaboratory.Service/History/CavityOperationService.cs index e46c31a..cfcde0f 100644 --- a/InSituLaboratory.Service/History/CavityOperationService.cs +++ b/InSituLaboratory.Service/History/CavityOperationService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using Microsoft.EntityFrameworkCore; using System; diff --git a/InSituLaboratory.Service/History/CavityOtputFeedBackService.cs b/InSituLaboratory.Service/History/CavityOtputFeedBackService.cs index c26abfd..56501b4 100644 --- a/InSituLaboratory.Service/History/CavityOtputFeedBackService.cs +++ b/InSituLaboratory.Service/History/CavityOtputFeedBackService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using Microsoft.EntityFrameworkCore; using System; diff --git a/InSituLaboratory.Service/History/CavityOtputStatusService.cs b/InSituLaboratory.Service/History/CavityOtputStatusService.cs index 83b83ad..b0d81e9 100644 --- a/InSituLaboratory.Service/History/CavityOtputStatusService.cs +++ b/InSituLaboratory.Service/History/CavityOtputStatusService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using Microsoft.EntityFrameworkCore; using System; diff --git a/InSituLaboratory.Service/History/CavityOutputCurrentService.cs b/InSituLaboratory.Service/History/CavityOutputCurrentService.cs index 277957f..eda4356 100644 --- a/InSituLaboratory.Service/History/CavityOutputCurrentService.cs +++ b/InSituLaboratory.Service/History/CavityOutputCurrentService.cs @@ -1,4 +1,4 @@ -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using Microsoft.EntityFrameworkCore; using System; diff --git a/InSituLaboratory/App.xaml.cs b/InSituLaboratory/App.xaml.cs index dffcf00..84a04f6 100644 --- a/InSituLaboratory/App.xaml.cs +++ b/InSituLaboratory/App.xaml.cs @@ -62,7 +62,6 @@ namespace InSituLaboratory containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); - containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); @@ -72,6 +71,14 @@ namespace InSituLaboratory containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/InSituLaboratory/ViewModels/Pages/History/CavityBatteryLevelViewModel.cs b/InSituLaboratory/ViewModels/Pages/History/CavityBatteryLevelViewModel.cs index 31ec6ef..b8df33d 100644 --- a/InSituLaboratory/ViewModels/Pages/History/CavityBatteryLevelViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/History/CavityBatteryLevelViewModel.cs @@ -1,5 +1,5 @@ using InSituLaboratory.Controls; -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using InSituLaboratory.Service; using Microsoft.EntityFrameworkCore.Metadata.Internal; diff --git a/InSituLaboratory/ViewModels/Pages/History/CavityEnergyConversionViewModel.cs b/InSituLaboratory/ViewModels/Pages/History/CavityEnergyConversionViewModel.cs index 1700048..f17d070 100644 --- a/InSituLaboratory/ViewModels/Pages/History/CavityEnergyConversionViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/History/CavityEnergyConversionViewModel.cs @@ -1,5 +1,5 @@ using InSituLaboratory.Controls; -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using Prism.Commands; using Prism.Regions; diff --git a/InSituLaboratory/ViewModels/Pages/History/CavityEnvironmentViewModel.cs b/InSituLaboratory/ViewModels/Pages/History/CavityEnvironmentViewModel.cs index 8d6f54d..9af2a5b 100644 --- a/InSituLaboratory/ViewModels/Pages/History/CavityEnvironmentViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/History/CavityEnvironmentViewModel.cs @@ -1,6 +1,6 @@  using InSituLaboratory.Controls; -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using InSituLaboratory.Service; using Prism.Commands; diff --git a/InSituLaboratory/ViewModels/Pages/History/CavityOperationViewModel.cs b/InSituLaboratory/ViewModels/Pages/History/CavityOperationViewModel.cs index bae2b3f..d4a7db9 100644 --- a/InSituLaboratory/ViewModels/Pages/History/CavityOperationViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/History/CavityOperationViewModel.cs @@ -1,5 +1,5 @@ using InSituLaboratory.Controls; -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using InSituLaboratory.Models; using InSituLaboratory.Service; diff --git a/InSituLaboratory/ViewModels/Pages/History/CavityOtputFeedBackViewModel.cs b/InSituLaboratory/ViewModels/Pages/History/CavityOtputFeedBackViewModel.cs index 2c3a475..b394e57 100644 --- a/InSituLaboratory/ViewModels/Pages/History/CavityOtputFeedBackViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/History/CavityOtputFeedBackViewModel.cs @@ -1,5 +1,5 @@ using InSituLaboratory.Controls; -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using InSituLaboratory.Service; using Prism.Commands; diff --git a/InSituLaboratory/ViewModels/Pages/History/CavityOutputCurrentViewModel.cs b/InSituLaboratory/ViewModels/Pages/History/CavityOutputCurrentViewModel.cs index e24ea47..9acfffd 100644 --- a/InSituLaboratory/ViewModels/Pages/History/CavityOutputCurrentViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/History/CavityOutputCurrentViewModel.cs @@ -1,5 +1,5 @@ using InSituLaboratory.Controls; -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using Prism.Commands; using Prism.Regions; diff --git a/InSituLaboratory/ViewModels/Pages/History/CavityOutputStatusViewModel.cs b/InSituLaboratory/ViewModels/Pages/History/CavityOutputStatusViewModel.cs index 9e8174c..56e0a81 100644 --- a/InSituLaboratory/ViewModels/Pages/History/CavityOutputStatusViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/History/CavityOutputStatusViewModel.cs @@ -1,5 +1,5 @@ using InSituLaboratory.Controls; -using InSituLaboratory.Entities; +using InSituLaboratory.Entities.SysData; using InSituLaboratory.IService.History; using Prism.Commands; using Prism.Regions; diff --git a/InSituLaboratory/ViewModels/Pages/Sensor/CH4IsotopeViewModel.cs b/InSituLaboratory/ViewModels/Pages/Sensor/CH4IsotopeViewModel.cs new file mode 100644 index 0000000..fb78d75 --- /dev/null +++ b/InSituLaboratory/ViewModels/Pages/Sensor/CH4IsotopeViewModel.cs @@ -0,0 +1,20 @@ +using Prism.Regions; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InSituLaboratory.ViewModels.Pages.Sensor +{ + /// + /// 甲烷同位素分析仪 + /// + public class CH4IsotopeViewModel : ViewModelBase + { + public CH4IsotopeViewModel(IRegionManager regionManager) : base(regionManager) + { + PageTitle = "甲烷同位素分析仪"; + } + } +} diff --git a/InSituLaboratory/ViewModels/Pages/Sensor/CO2IsotopeViewModel.cs b/InSituLaboratory/ViewModels/Pages/Sensor/CO2IsotopeViewModel.cs new file mode 100644 index 0000000..af7d81d --- /dev/null +++ b/InSituLaboratory/ViewModels/Pages/Sensor/CO2IsotopeViewModel.cs @@ -0,0 +1,20 @@ +using Prism.Regions; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InSituLaboratory.ViewModels.Pages.Sensor +{ + /// + /// 二氧化碳同位素分析仪 + /// + public class CO2IsotopeViewModel : ViewModelBase + { + public CO2IsotopeViewModel(IRegionManager regionManager) : base(regionManager) + { + PageTitle = "二氧化碳同位素分析仪"; + } + } +} diff --git a/InSituLaboratory/ViewModels/Pages/Sensor/ColorMSViewModel.cs b/InSituLaboratory/ViewModels/Pages/Sensor/ColorMSViewModel.cs new file mode 100644 index 0000000..7c7e89f --- /dev/null +++ b/InSituLaboratory/ViewModels/Pages/Sensor/ColorMSViewModel.cs @@ -0,0 +1,20 @@ +using Prism.Regions; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InSituLaboratory.ViewModels.Pages.Sensor +{ + /// + /// 色质联用仪 + /// + public class ColorMSViewModel : ViewModelBase + { + public ColorMSViewModel(IRegionManager regionManager) : base(regionManager) + { + PageTitle = "色质联用仪"; + } + } +} diff --git a/InSituLaboratory/ViewModels/Pages/Sensor/MEMSSpViewModel.cs b/InSituLaboratory/ViewModels/Pages/Sensor/MEMSSpViewModel.cs new file mode 100644 index 0000000..c878ee5 --- /dev/null +++ b/InSituLaboratory/ViewModels/Pages/Sensor/MEMSSpViewModel.cs @@ -0,0 +1,24 @@ +using Prism.Regions; +using Prism.Services.Dialogs; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InSituLaboratory.ViewModels.Pages.Sensor +{ + /// + /// MEMS色谱仪 + /// + public class MEMSSpViewModel : ViewModelBase + { + IDialogService _dialogService; + public MEMSSpViewModel(IRegionManager regionManager, IDialogService dialogService) : base(regionManager) + { + PageTitle = "MEMS色谱仪"; + _dialogService = dialogService; + Refresh(); + } + } +} diff --git a/InSituLaboratory/ViewModels/Pages/Sensor/MEMSZpViewModel.cs b/InSituLaboratory/ViewModels/Pages/Sensor/MEMSZpViewModel.cs new file mode 100644 index 0000000..4c140cb --- /dev/null +++ b/InSituLaboratory/ViewModels/Pages/Sensor/MEMSZpViewModel.cs @@ -0,0 +1,20 @@ +using Prism.Regions; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InSituLaboratory.ViewModels.Pages.Sensor +{ + /// + /// 质谱仪 + /// + public class MEMSZpViewModel : ViewModelBase + { + public MEMSZpViewModel(IRegionManager regionManager) : base(regionManager) + { + PageTitle = "MEMS质谱仪"; + } + } +} diff --git a/InSituLaboratory/ViewModels/Pages/Sensor/ParticleAnalyzerViewModel.cs b/InSituLaboratory/ViewModels/Pages/Sensor/ParticleAnalyzerViewModel.cs new file mode 100644 index 0000000..5b9052a --- /dev/null +++ b/InSituLaboratory/ViewModels/Pages/Sensor/ParticleAnalyzerViewModel.cs @@ -0,0 +1,20 @@ +using Prism.Regions; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InSituLaboratory.ViewModels.Pages.Sensor +{ + /// + /// 颗粒物分析仪 + /// + public class ParticleAnalyzerViewModel : ViewModelBase + { + public ParticleAnalyzerViewModel(IRegionManager regionManager) : base(regionManager) + { + PageTitle = "颗粒物分析仪"; + } + } +} diff --git a/InSituLaboratory/ViewModels/Pages/Sensor/SequencerViewModel.cs b/InSituLaboratory/ViewModels/Pages/Sensor/SequencerViewModel.cs new file mode 100644 index 0000000..41451fa --- /dev/null +++ b/InSituLaboratory/ViewModels/Pages/Sensor/SequencerViewModel.cs @@ -0,0 +1,20 @@ +using Prism.Regions; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InSituLaboratory.ViewModels.Pages.Sensor +{ + /// + /// 测序仪 + /// + internal class SequencerViewModel : ViewModelBase + { + public SequencerViewModel(IRegionManager regionManager) : base(regionManager) + { + PageTitle = "测序仪"; + } + } +} diff --git a/InSituLaboratory/Views/MainView.xaml b/InSituLaboratory/Views/MainView.xaml index 0f44f6a..45dae4c 100644 --- a/InSituLaboratory/Views/MainView.xaml +++ b/InSituLaboratory/Views/MainView.xaml @@ -13,7 +13,7 @@ Foreground="#333" FontWeight="ExtraLight" Background="#FAFCFF" - Title="原位实验室主控系统" Height="800" Width="1400"> + Title="原位实验室主控系统" Height="900" Width="1600"> diff --git a/InSituLaboratory/Views/Pages/DashboardView.xaml b/InSituLaboratory/Views/Pages/DashboardView.xaml index a978dfc..b507c07 100644 --- a/InSituLaboratory/Views/Pages/DashboardView.xaml +++ b/InSituLaboratory/Views/Pages/DashboardView.xaml @@ -251,14 +251,14 @@ - - + - + - + + @@ -306,7 +306,7 @@ - + @@ -364,10 +364,10 @@ - - + + @@ -400,7 +400,7 @@ - + @@ -458,10 +458,10 @@ - - + + diff --git a/InSituLaboratory/Views/Pages/Sensor/CH4IsotopeView.xaml b/InSituLaboratory/Views/Pages/Sensor/CH4IsotopeView.xaml new file mode 100644 index 0000000..331ad9d --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/CH4IsotopeView.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/InSituLaboratory/Views/Pages/Sensor/CH4IsotopeView.xaml.cs b/InSituLaboratory/Views/Pages/Sensor/CH4IsotopeView.xaml.cs new file mode 100644 index 0000000..a0ccf2a --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/CH4IsotopeView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace InSituLaboratory.Views.Pages.Sensor +{ + /// + /// CH4IsotopeView.xaml 的交互逻辑 + /// + public partial class CH4IsotopeView : UserControl + { + public CH4IsotopeView() + { + InitializeComponent(); + } + } +} diff --git a/InSituLaboratory/Views/Pages/Sensor/CO2IsotopeView.xaml b/InSituLaboratory/Views/Pages/Sensor/CO2IsotopeView.xaml new file mode 100644 index 0000000..454ccc3 --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/CO2IsotopeView.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/InSituLaboratory/Views/Pages/Sensor/CO2IsotopeView.xaml.cs b/InSituLaboratory/Views/Pages/Sensor/CO2IsotopeView.xaml.cs new file mode 100644 index 0000000..74d7421 --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/CO2IsotopeView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace InSituLaboratory.Views.Pages.Sensor +{ + /// + /// CO2IsotopeView.xaml 的交互逻辑 + /// + public partial class CO2IsotopeView : UserControl + { + public CO2IsotopeView() + { + InitializeComponent(); + } + } +} diff --git a/InSituLaboratory/Views/Pages/Sensor/ColorMSView.xaml b/InSituLaboratory/Views/Pages/Sensor/ColorMSView.xaml new file mode 100644 index 0000000..540e6f2 --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/ColorMSView.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/InSituLaboratory/Views/Pages/Sensor/ColorMSView.xaml.cs b/InSituLaboratory/Views/Pages/Sensor/ColorMSView.xaml.cs new file mode 100644 index 0000000..e42a7f4 --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/ColorMSView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace InSituLaboratory.Views.Pages.Sensor +{ + /// + /// ColorMSView.xaml 的交互逻辑 + /// + public partial class ColorMSView : UserControl + { + public ColorMSView() + { + InitializeComponent(); + } + } +} diff --git a/InSituLaboratory/Views/Pages/Sensor/MEMSSpView.xaml b/InSituLaboratory/Views/Pages/Sensor/MEMSSpView.xaml new file mode 100644 index 0000000..7752866 --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/MEMSSpView.xaml @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/InSituLaboratory/Views/Pages/Sensor/MEMSSpView.xaml.cs b/InSituLaboratory/Views/Pages/Sensor/MEMSSpView.xaml.cs new file mode 100644 index 0000000..3c819c6 --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/MEMSSpView.xaml.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace InSituLaboratory.Views.Pages.Sensor +{ + /// + /// MEMSSpView.xaml 的交互逻辑 + /// + public partial class MEMSSpView : UserControl + { + public MEMSSpView() + { + InitializeComponent(); + } + + /// + /// 支持鼠标滚轮上下滚动 + /// + /// + /// + private void ScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventArgs e) + { + ScrollViewer viewer = sv; //sv 为Scrollview的名字,在Xaml文件中定义。 + if (viewer == null) return; + double num = Math.Abs((int)(e.Delta / 2)); + double offset = 0.0; + if (e.Delta > 0) + { + offset = Math.Max((double)0.0, (double)(viewer.VerticalOffset - num));//viewer.VerticalOffset获取包含滚动内容的垂直偏移量的值。 + } + else + { + offset = Math.Min(viewer.ScrollableHeight, viewer.VerticalOffset + num); + } + if (offset != viewer.VerticalOffset) + { + viewer.ScrollToVerticalOffset(offset);//将 ScrollViewer 内的内容滚动到指定的垂直偏移量位置。 + e.Handled = true; + } + } + } +} diff --git a/InSituLaboratory/Views/Pages/Sensor/MEMSZpView.xaml b/InSituLaboratory/Views/Pages/Sensor/MEMSZpView.xaml new file mode 100644 index 0000000..fa14ed1 --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/MEMSZpView.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/InSituLaboratory/Views/Pages/Sensor/MEMSZpView.xaml.cs b/InSituLaboratory/Views/Pages/Sensor/MEMSZpView.xaml.cs new file mode 100644 index 0000000..a9d30d7 --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/MEMSZpView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace InSituLaboratory.Views.Pages.Sensor +{ + /// + /// MEMSZpView.xaml 的交互逻辑 + /// + public partial class MEMSZpView : UserControl + { + public MEMSZpView() + { + InitializeComponent(); + } + } +} diff --git a/InSituLaboratory/Views/Pages/Sensor/ParticleAnalyzerView.xaml b/InSituLaboratory/Views/Pages/Sensor/ParticleAnalyzerView.xaml new file mode 100644 index 0000000..05f4fdf --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/ParticleAnalyzerView.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/InSituLaboratory/Views/Pages/Sensor/ParticleAnalyzerView.xaml.cs b/InSituLaboratory/Views/Pages/Sensor/ParticleAnalyzerView.xaml.cs new file mode 100644 index 0000000..0059728 --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/ParticleAnalyzerView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace InSituLaboratory.Views.Pages.Sensor +{ + /// + /// ParticleAnalyzerView.xaml 的交互逻辑 + /// + public partial class ParticleAnalyzerView : UserControl + { + public ParticleAnalyzerView() + { + InitializeComponent(); + } + } +} diff --git a/InSituLaboratory/Views/Pages/Sensor/SequencerView.xaml b/InSituLaboratory/Views/Pages/Sensor/SequencerView.xaml new file mode 100644 index 0000000..8832230 --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/SequencerView.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/InSituLaboratory/Views/Pages/Sensor/SequencerView.xaml.cs b/InSituLaboratory/Views/Pages/Sensor/SequencerView.xaml.cs new file mode 100644 index 0000000..f96fe5a --- /dev/null +++ b/InSituLaboratory/Views/Pages/Sensor/SequencerView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace InSituLaboratory.Views.Pages.Sensor +{ + /// + /// SequencerView.xaml 的交互逻辑 + /// + public partial class SequencerView : UserControl + { + public SequencerView() + { + InitializeComponent(); + } + } +}