From c6bda71c8b8373821e878f135032c602d29b9d3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E9=BE=99=20=E6=9B=B9?= <1805857645@QQ.com>
Date: Wed, 18 Dec 2024 11:36:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?change=20-=E6=B0=94=E5=8E=8B=E6=95=B0?=
=?UTF-8?q?=E5=80=BC=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F=E6=95=B0?=
=?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=8D=95=E4=BD=8DMPa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 9491a2f..3bfd74f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -360,4 +360,5 @@ MigrationBackup/
.ionide/
# Fody - auto-generated XML schema
-FodyWeavers.xsd
\ No newline at end of file
+FodyWeavers.xsd
+/SlnMesnac.zip
From 78cf04bdc2fa1a11fb3a3b20c9d7482601ab20aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E9=BE=99=20=E6=9B=B9?= <1805857645@QQ.com>
Date: Wed, 18 Dec 2024 11:37:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?change=20-=E6=B0=94=E5=8E=8B=E5=80=BC?=
=?UTF-8?q?=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=8C?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SlnMesnac.WPF/Page/DevMonitorPage.xaml | 6 +++---
SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs | 4 ++--
SlnMesnac.WPF/SlnMesnac.WPF.csproj | 2 +-
SlnMesnac.WPF/ViewModel/MachineStopHistoryViewModel.cs | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml b/SlnMesnac.WPF/Page/DevMonitorPage.xaml
index 4ff3417..788aa82 100644
--- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml
+++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml
@@ -24,9 +24,9 @@
-
+
-
+
@@ -35,7 +35,7 @@
-
+
diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
index 46c56d3..88924d7 100644
--- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
+++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
@@ -248,8 +248,8 @@ namespace SlnMesnac.WPF.Page
// string Bags_Amount = _configInfoBusiness.GetConfigInfos().FirstOrDefault(x => x.ConfigKey == "包装袋余量").ConfigValue;
App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
- // BagsAmountTxt.Text = Bags_Amount;
- PressureTxt.Text = pressure.ToString();
+ // BagsAmountTxt.Text = Bags_Amount; pressure.ToString();
+ PressureTxt.Text = Math.Round(pressure, 2).ToString() + "MPa";//保留两位小数
BufferWeightTxt.Text = recipeManageCache.BufferWeight.ToString("F2");
}));
diff --git a/SlnMesnac.WPF/SlnMesnac.WPF.csproj b/SlnMesnac.WPF/SlnMesnac.WPF.csproj
index 57dd2f1..6755a33 100644
--- a/SlnMesnac.WPF/SlnMesnac.WPF.csproj
+++ b/SlnMesnac.WPF/SlnMesnac.WPF.csproj
@@ -36,7 +36,7 @@
-
+
diff --git a/SlnMesnac.WPF/ViewModel/MachineStopHistoryViewModel.cs b/SlnMesnac.WPF/ViewModel/MachineStopHistoryViewModel.cs
index 228841b..eb4a347 100644
--- a/SlnMesnac.WPF/ViewModel/MachineStopHistoryViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/MachineStopHistoryViewModel.cs
@@ -18,7 +18,7 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using static DevExpress.Drawing.Printing.Internal.DXPageSizeInfo;
+//using static DevExpress.Drawing.Printing.Internal.DXPageSizeInfo;
#region << 版 本 注 释 >>