diff --git a/InSituLaboratory.Assets/Fonts/iconfont1.ttf b/InSituLaboratory.Assets/Fonts/iconfont1.ttf index 491f1c4..88663ce 100644 Binary files a/InSituLaboratory.Assets/Fonts/iconfont1.ttf and b/InSituLaboratory.Assets/Fonts/iconfont1.ttf differ diff --git a/InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs b/InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs index d8f63a3..ee30b30 100644 --- a/InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs @@ -12,6 +12,8 @@ using InSituLaboratory.Entities.ExperimentalStationEntities; using Prism.Regions; using InSituLaboratory.IService; using Prism.Commands; +using System.Windows; +using System.Windows.Forms; namespace InSituLaboratory.ViewModels.Pages { @@ -23,7 +25,7 @@ namespace InSituLaboratory.ViewModels.Pages public CurrentEquipmentModel CurrentWorkEquipment { get; set; } = new CurrentEquipmentModel();//当前工作设备 public CurrentEquipmentModel currentFaultyEquipment { get; set; } = new CurrentEquipmentModel();//当前故障设备 - + public DelegateCommand ReadCommand { get; set; } #endregion ISysStatusService _sysStatusService; @@ -33,6 +35,8 @@ namespace InSituLaboratory.ViewModels.Pages IsCanClose = false; _sysStatusService = isysStatusService; + ReadCommand = new DelegateCommand(DoRead); + this.Refresh(); } @@ -60,6 +64,8 @@ namespace InSituLaboratory.ViewModels.Pages SysStatusModel.LeakageStaus2 = data.LeakageStaus2; SysStatusModel.InternalPressure1 = data.InternalPressure1; SysStatusModel.InternalPressure2 = data.InternalPressure2; + SysStatusModel.TimeSeriesGroupNumber = data.TimeSeriesGroupNumber; + SysStatusModel.GroupNumberStatus = data.GroupNumberStatus; } if (CurrentWorklist.Count() != 0) @@ -86,5 +92,28 @@ namespace InSituLaboratory.ViewModels.Pages currentFaultyEquipment.Sequencer = data.Sequencer; } } + + + /// + /// 读取文本文档 + /// + /// + public void DoRead(object o) + { + System.Windows.Forms.MessageBox.Show("暂无此项功能!", "警告", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + + OpenFileDialog openFileDialog = new OpenFileDialog(); + + openFileDialog.Title = "选择文件"; + + openFileDialog.Multiselect = false;//选择多个文件 + + openFileDialog.RestoreDirectory = true;//跟踪上次打开的文件的目录 + + openFileDialog.Filter = "Text files(*.txt) | *.txt"; + + + + } } } diff --git a/InSituLaboratory/Views/Pages/DashboardView.xaml b/InSituLaboratory/Views/Pages/DashboardView.xaml index b507c07..dcab5bb 100644 --- a/InSituLaboratory/Views/Pages/DashboardView.xaml +++ b/InSituLaboratory/Views/Pages/DashboardView.xaml @@ -50,105 +50,120 @@ - - + + - - - - - + + + - - - + + + + + + + + + + + + - + - + - - - - - + - + + - + - - - - - - + + + + - + - - - - - - - + + + + - + - - - - - - + - -