From d4d39038eb967719c127e26d29b068223a80c334 Mon Sep 17 00:00:00 2001 From: liuwf Date: Wed, 13 Nov 2024 17:52:37 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SlnMesnac.WPF/Model/DmsShutDownModel.cs | 40 ++++++ SlnMesnac.WPF/Page/DevMonitorPage.xaml | 2 +- SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs | 8 ++ .../BagsAmountSetWindow.xaml | 0 .../BagsAmountSetWindow.xaml.cs | 0 .../InputDialogWindow.xaml | 0 .../InputDialogWindow.xaml.cs | 0 .../WindowPage/MachineStopHistoryWindow.xaml | 76 +++++++++++ .../MachineStopHistoryWindow.xaml.cs | 39 ++++++ .../RecipeManageSetWindow.xaml | 0 .../RecipeManageSetWindow.xaml.cs | 0 .../RecipeModeSetWindow.xaml | 0 .../RecipeModeSetWindow.xaml.cs | 0 SlnMesnac.WPF/SlnMesnac.WPF.csproj | 8 +- .../ViewModel/MachineStopHistoryViewModel.cs | 128 ++++++++++++++++++ 15 files changed, 296 insertions(+), 5 deletions(-) create mode 100644 SlnMesnac.WPF/Model/DmsShutDownModel.cs rename SlnMesnac.WPF/Page/{Window => WindowPage}/BagsAmountSetWindow.xaml (100%) rename SlnMesnac.WPF/Page/{Window => WindowPage}/BagsAmountSetWindow.xaml.cs (100%) rename SlnMesnac.WPF/Page/{Window => WindowPage}/InputDialogWindow.xaml (100%) rename SlnMesnac.WPF/Page/{Window => WindowPage}/InputDialogWindow.xaml.cs (100%) create mode 100644 SlnMesnac.WPF/Page/WindowPage/MachineStopHistoryWindow.xaml create mode 100644 SlnMesnac.WPF/Page/WindowPage/MachineStopHistoryWindow.xaml.cs rename SlnMesnac.WPF/Page/{Window => WindowPage}/RecipeManageSetWindow.xaml (100%) rename SlnMesnac.WPF/Page/{Window => WindowPage}/RecipeManageSetWindow.xaml.cs (100%) rename SlnMesnac.WPF/Page/{Window => WindowPage}/RecipeModeSetWindow.xaml (100%) rename SlnMesnac.WPF/Page/{Window => WindowPage}/RecipeModeSetWindow.xaml.cs (100%) create mode 100644 SlnMesnac.WPF/ViewModel/MachineStopHistoryViewModel.cs diff --git a/SlnMesnac.WPF/Model/DmsShutDownModel.cs b/SlnMesnac.WPF/Model/DmsShutDownModel.cs new file mode 100644 index 0000000..a1937f6 --- /dev/null +++ b/SlnMesnac.WPF/Model/DmsShutDownModel.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SlnMesnac.WPF.Model +{ + public class DmsShutDownModel + { + + /// + /// 序号 + /// + public int id { get; set; } + + /// + /// 设备名 + /// + public string deviceName { get; set; } + + /// + /// 停机类型 + /// + public string shutReason { get; set; } + + /// + /// 停机开始时间 + /// + public string shutBeginTime { get; set; } = ""; + /// + /// 停机结束时间 + /// + public string shutEndTime { get; set; } = ""; + /// + /// 停机总时长,单位:min + /// + public string totalTime { get; set; } = ""; + } +} diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml b/SlnMesnac.WPF/Page/DevMonitorPage.xaml index ef0aa95..8537c84 100644 --- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml +++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml @@ -32,7 +32,7 @@