diff --git a/InSituLaboratory.Assets/Images/6604cd8ecc29d.ico b/InSituLaboratory.Assets/Images/6604cd8ecc29d.ico new file mode 100644 index 0000000..1c47b3b Binary files /dev/null and b/InSituLaboratory.Assets/Images/6604cd8ecc29d.ico differ diff --git a/InSituLaboratory.Assets/InSituLaboratory.Assets.csproj b/InSituLaboratory.Assets/InSituLaboratory.Assets.csproj index 6b16f99..b7bb907 100644 --- a/InSituLaboratory.Assets/InSituLaboratory.Assets.csproj +++ b/InSituLaboratory.Assets/InSituLaboratory.Assets.csproj @@ -10,6 +10,7 @@ + @@ -25,6 +26,9 @@ + + Always + Always diff --git a/InSituLaboratory.Models/MEMSChromatogramModel.cs b/InSituLaboratory.Models/MEMSChromatogramModel.cs new file mode 100644 index 0000000..637d197 --- /dev/null +++ b/InSituLaboratory.Models/MEMSChromatogramModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InSituLaboratory.Models +{ + public class MEMSChromatogramModel + { + public DateTime SamplingTime { get; set; } + public string FaultCodes { get; set; } + public string C2Concentration { get; set; } + public string C3Concentration { get; set; } + public string C4Concentration { get; set; } + } +} diff --git a/InSituLaboratory.Models/MEMSMassModel.cs b/InSituLaboratory.Models/MEMSMassModel.cs new file mode 100644 index 0000000..2b358bb --- /dev/null +++ b/InSituLaboratory.Models/MEMSMassModel.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InSituLaboratory.Models +{ + public class MEMSMassModel + { + public DateTime SamplingTime { get; set; } + public string FaultCodes { get; set; } + + public string CH4Concentration { get; set; } + public string H2OConcentration { get; set; } + public string N2Concentration { get; set; } + public string O2Concentration { get; set; } + public string ARConcentration { get; set; } + public string CO2Concentration { get; set; } + + + } +} diff --git a/InSituLaboratory.Models/RecordModel.cs b/InSituLaboratory.Models/RecordModel.cs new file mode 100644 index 0000000..30f3891 --- /dev/null +++ b/InSituLaboratory.Models/RecordModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace InSituLaboratory.Models +{ + public class RecordModel + { + public int Number { get; set; } + + public string SensorID { get; set; } + public string DurationTime { get; set; } + } +} diff --git a/InSituLaboratory/6604.ico b/InSituLaboratory/6604.ico new file mode 100644 index 0000000..7ff2e56 Binary files /dev/null and b/InSituLaboratory/6604.ico differ diff --git a/InSituLaboratory/App.xaml b/InSituLaboratory/App.xaml index 440b235..a121290 100644 --- a/InSituLaboratory/App.xaml +++ b/InSituLaboratory/App.xaml @@ -16,6 +16,9 @@ + + /InSituLaboratory.Assets;component/Fonts/iconfont.ttf#zx_icons diff --git a/InSituLaboratory/InSituLaboratory.csproj b/InSituLaboratory/InSituLaboratory.csproj index b3ecc35..07cb791 100644 --- a/InSituLaboratory/InSituLaboratory.csproj +++ b/InSituLaboratory/InSituLaboratory.csproj @@ -6,11 +6,11 @@ enable enable true - bitbug_favicon.ico + 6604.ico - + @@ -23,6 +23,7 @@ + diff --git a/InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs b/InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs index 7bcaa1c..a26d97d 100644 --- a/InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs @@ -7,15 +7,30 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using InSituLaboratory.Models; namespace InSituLaboratory.ViewModels.Pages { public class DashboardViewModel : ViewModelBase { + public ObservableCollection MEMSList { get; set; } = new ObservableCollection(); + public ObservableCollection MEMSMassList { get; set; } = new ObservableCollection(); public DashboardViewModel() : base(null) { PageTitle = "数据中心"; IsCanClose = false; + + MEMSList.Add(new MEMSChromatogramModel { SamplingTime = DateTime.Now, FaultCodes = "设备温度：正常；湿度：正常", C2Concentration = "30" , C3Concentration="40" , C4Concentration ="50"}); + MEMSList.Add(new MEMSChromatogramModel { SamplingTime = DateTime.Now, FaultCodes = "压力:警报、绝缘：未监控", C2Concentration = "10" , C3Concentration="20" , C4Concentration ="30"}); + + MEMSList.Add(new MEMSChromatogramModel { SamplingTime = DateTime.Now, FaultCodes = "设备温度：正常；湿度：正常", C2Concentration = "20" , C3Concentration="30" , C4Concentration ="70"}); + MEMSList.Add(new MEMSChromatogramModel { SamplingTime = DateTime.Now, FaultCodes = "湿度：正常", C2Concentration = "15" , C3Concentration="20" , C4Concentration ="30"}); + MEMSList.Add(new MEMSChromatogramModel { SamplingTime = DateTime.Now, FaultCodes = "压力：正常", C2Concentration = "15" , C3Concentration="20" , C4Concentration ="30"}); + + + + MEMSMassList.Add(new MEMSMassModel { SamplingTime = DateTime.Now, FaultCodes = "压力：正常", CH4Concentration = "10", H2OConcentration="20" , N2Concentration ="30", O2Concentration ="40", ARConcentration ="50", CO2Concentration ="60"}); + } } } diff --git a/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs b/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs index cc2b445..857cce4 100644 --- a/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs @@ -4,6 +4,7 @@ using Prism.Regions; using Prism.Services.Dialogs; using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -13,6 +14,8 @@ namespace InSituLaboratory.ViewModels.Pages { public class SequentialDistributionViewModel : ViewModelBase { + public ObservableCollection RecordList { get; set; } = + new ObservableCollection(); IDialogService _dialogService; public SequentialDistributionViewModel(IRegionManager regionManager, IDialogService dialogService) : base(regionManager) @@ -20,6 +23,11 @@ namespace InSituLaboratory.ViewModels.Pages this.PageTitle = "时序下发"; _dialogService = dialogService; + + RecordList.Add(new RecordModel { Number = 1, SensorID = "色谱、质谱", DurationTime = "30"}); + RecordList.Add(new RecordModel { Number = 2, SensorID = "二氧化碳", DurationTime = "50"}); + RecordList.Add(new RecordModel { Number = 3, SensorID = "摄像1、摄像2", DurationTime = "100"}); + Refresh(); } diff --git a/InSituLaboratory/Views/MainView.xaml b/InSituLaboratory/Views/MainView.xaml index 9e7c16c..b0b92ed 100644 --- a/InSituLaboratory/Views/MainView.xaml +++ b/InSituLaboratory/Views/MainView.xaml @@ -124,7 +124,7 @@ - + diff --git a/InSituLaboratory/Views/Pages/DashboardView.xaml b/InSituLaboratory/Views/Pages/DashboardView.xaml index edb0063..9deb217 100644 --- a/InSituLaboratory/Views/Pages/DashboardView.xaml +++ b/InSituLaboratory/Views/Pages/DashboardView.xaml @@ -15,86 +15,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -111,49 +32,167 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/InSituLaboratory/Views/Pages/Dialogs/ModifySequentialView.xaml b/InSituLaboratory/Views/Pages/Dialogs/ModifySequentialView.xaml index df70220..d6d1cbe 100644 --- a/InSituLaboratory/Views/Pages/Dialogs/ModifySequentialView.xaml +++ b/InSituLaboratory/Views/Pages/Dialogs/ModifySequentialView.xaml @@ -16,7 +16,7 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - 编辑 - - - 删除 - - - - - - - + + + + + + + + + + + + + + + + + + + + + + 编辑 + + + 删除 + + + + + + + + + + + + @@ -179,7 +200,7 @@