From 3eeeed32d34002f902f96610634cf1c440395eb2 Mon Sep 17 00:00:00 2001 From: MoYue Date: Thu, 23 May 2024 18:10:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BD=93=E5=89=8D=E4=B8=8B=E5=8F=91=E6=97=B6=E5=BA=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AF=BB=E5=8F=96?= =?UTF-8?q?TXT=E6=96=87=E6=A1=A3=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InSituLaboratory.Assets/Fonts/iconfont1.ttf | Bin 13688 -> 14604 bytes .../ViewModels/Pages/DashboardViewModel.cs | 31 +++++- .../Views/Pages/DashboardView.xaml | 105 ++++++++++-------- .../Views/Pages/Sensor/CH4IsotopeView.xaml | 2 +- .../Views/Pages/Sensor/CO2IsotopeView.xaml | 2 +- .../Views/Pages/Sensor/ColorMSView.xaml | 2 +- .../Views/Pages/Sensor/MEMSSpView.xaml | 2 +- .../Views/Pages/Sensor/MEMSZpView.xaml | 2 +- .../Views/Pages/Sensor/SequencerView.xaml | 2 +- 9 files changed, 96 insertions(+), 52 deletions(-) diff --git a/InSituLaboratory.Assets/Fonts/iconfont1.ttf b/InSituLaboratory.Assets/Fonts/iconfont1.ttf index 491f1c4f952cc1cad41eceb54223b2e2d071ee75..88663ce3d589c2eb1502c72478bce37e9a2b1fc6 100644 GIT binary patch delta 1929 zcmbu9ZERCj7{~wT-rL))8@+AU-o9*fw=J}c(n_}5mPFV}oUP245HV={pcLqs$k@g< z=%(Q!LE{GugBpWIAV6YbVj^M27$k-de)NN1Oia+k7jjtQq6uhXjC4M?heb?`eDIw9 z&OOg_-k$UPPx|}b;|JyvRxiMg1K6=^v@$+%{o5x2>2*LkxM$zY@al(W&j8M?KxW5C zwX(bCn?2(+_d6m#LXOsX^&RS8C031$PSwtRwA7&e7Ri2h-`K9o_j5nfUQRNxb+l3& zXGf$@X*@)>vA;4}^<0c>yabqpv}b&5a_ZG{yFLI4G=bedc{MSR0;9Ra^$*=YKCf;3 z4Q-0O8-AENm0A8SEj3O%zLH-dy9JW%rDCs3)uU{Jh3a#x!iMW^DOhLHsnpr#7}#mZ z&E7itx+s9NP}n|NHHab{Q0iBt47*Y1QbC*LNBJ>+o?qry_*H(RzE*zPvQHR9iRvR5 z`bT{X%k>G|uTtJ9JvtJIp%ooii8hMGj{u@jD2i^Zz-kzDRu_B-p&dzdLW2}S1VMP= zrr=e&b{KJZC?<8@t4PeEiFOXYwp%JmfVT+fK=4+9tqiA`HWUQ7TR`D}YXS-kyi-6S zf_DihSa5qUg2D#x5zqy|txePrc3$~_fNll8O+fbpuL$U-;8g+L8GKkkw+9~;P#(ai z1e6i*g96G8cuhcA0-qIFwy^vq0i_Q7sDP3PeoR2=1V1mZ^TjU*xJeJihJ?bxb^%F-h4%#{9u__kkc{~0Spf-( zMUugWq{ZTpz!te#zGUx7hICdA$uBDr<*=jOG32T8 zk7$QI8@z|TpZlKac(dcV2Y{9XP7{%e6jUD7w|mu$_JEcsV?Gl>*OF9zsAZ^usT z$1GmMDSAm+mWVsu%o&R(H!(Bc7wgpn4mIG{gUcQ-xmGg2njnW|&tdT_Gy7R@l=vd*oH%Ro5V@DC4ZC!`}!p_%bbZUv&?*?+w%aiW?EN3Ru?C$PX zQ*&v3)iAreO`~e$qS2gD^@c*;sxK7sRgFR{Rxqjr^{T#b*e9BQ_cw0op0QxMQx2qp z9yKS+In}e~p;UTHdd#Cs8(Lh7sVJuEiT13IPk40QV@=RlYLNclWBGx6Op=hvdqln08HWwp_a5xcRYdyN+OJ;jQfflD)P+UquRa@JYbg73n z52o5xry{)0mVlD&j<45^V0z0_rFEnT<_+hWbu3l?tZyj9Qfv*{Cr4hWO;3(Y@11^e N+R-%TTg@@X@E2B#cAfwL delta 1004 zcma))Pe@cz6vn^%-puIybH;JZNzJBI#IS`J3St;i5)v*dT11eOI!ZWcHi#)SB`$?* zUX%+HBscBC2@D$|Y8$l4GH?+=MQ`3!c=j`C9%R6sam{g^ zB{hSItF!*a;3HI?>(2>n{%$2cepQv zVMjUa_iC*wbzPNNvnpntGJ=-dNY|zFPwbk_{HlR>57VdNP(6I711I2wVZAnvT0f0u z|D;UGv@FW9tV-7UVMMHMvpuDF?j&a?PX9Bz@V^r{%sgQn!a)?E7!`0+eF!C}WDO<` zz>8{Bp&UW%qrw{OhaVA?A^@L{(j9Q23{eziq7J`Gy`pw|)BsYbVFrj>!(0%bhFKv+ z8s>)tG*kkq&`=YkQbTnR`@4iXA@v$6h8)+VC?3+TVHuEf8WseJX;>PhUt>2);u@9< zNoZI&B&neVkTDI-fQ)Ns3uID5gCJ8#*%#0&$h3y8K^8T3hhTsn!v)-&P?pyM`_OBPE1M9)6;BxWzP%zXP kIv*MfdEb_lmn?)Yg&&l9GV`8C4XV~^ZRt|T%(o1yKWUiS`2YX_ 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 @@ - - + + - - - - - + + + - - - + + + + + + + + + + + + - + - + - - - - - + - + + - + - - - - - - + + + + - + - - - - - - - + + + + - + - - - - - - + - -