From b19124784d8f422309e918b39dbc17a6ab91b068 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Wed, 16 Oct 2024 11:31:41 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E5=8D=A4=E6=B0=B4?=
=?UTF-8?q?=E9=85=8D=E5=88=B6=E7=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BPASmartClient.Academy/App.config | 2 +-
BPASmartClient.Academy/View/BrineTank.xaml | 106 ++++++++
BPASmartClient.Academy/View/BrineTank.xaml.cs | 28 ++
.../View/ReactionKettle50LView.xaml | 242 ++++++++++--------
.../View/ReactionKettle50LView.xaml.cs | 22 +-
5 files changed, 270 insertions(+), 130 deletions(-)
create mode 100644 BPASmartClient.Academy/View/BrineTank.xaml
create mode 100644 BPASmartClient.Academy/View/BrineTank.xaml.cs
diff --git a/BPASmartClient.Academy/App.config b/BPASmartClient.Academy/App.config
index d24a5778..0375766b 100644
--- a/BPASmartClient.Academy/App.config
+++ b/BPASmartClient.Academy/App.config
@@ -12,7 +12,7 @@
-
+
\ No newline at end of file
diff --git a/BPASmartClient.Academy/View/BrineTank.xaml b/BPASmartClient.Academy/View/BrineTank.xaml
new file mode 100644
index 00000000..0e53efd0
--- /dev/null
+++ b/BPASmartClient.Academy/View/BrineTank.xaml
@@ -0,0 +1,106 @@
+
+
+
+ 701418563
+
+
+
+
diff --git a/BPASmartClient.Academy/View/BrineTank.xaml.cs b/BPASmartClient.Academy/View/BrineTank.xaml.cs
new file mode 100644
index 00000000..ae998235
--- /dev/null
+++ b/BPASmartClient.Academy/View/BrineTank.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.Academy.View
+{
+ ///
+ /// BrineTank.xaml 的交互逻辑
+ ///
+ public partial class BrineTank : UserControl
+ {
+ public BrineTank()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/BPASmartClient.Academy/View/ReactionKettle50LView.xaml b/BPASmartClient.Academy/View/ReactionKettle50LView.xaml
index 6023ca00..a04369c4 100644
--- a/BPASmartClient.Academy/View/ReactionKettle50LView.xaml
+++ b/BPASmartClient.Academy/View/ReactionKettle50LView.xaml
@@ -244,8 +244,8 @@
+ Panel.ZIndex="299" d:Visibility="Collapsed" FontSize="100" FontWeight="Black"
+ Foreground="Red" Text="设 备 未 连 接" Visibility="Collapsed" />
+ x:Name="ooo" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" d:Opacity="1.0"
+ IsHitTestVisible="True" Opacity="0.5">
@@ -290,7 +290,26 @@
-
diff --git a/BPASmartClient.Academy/View/ReactionKettle50LView.xaml.cs b/BPASmartClient.Academy/View/ReactionKettle50LView.xaml.cs
index fe06550e..641d26c8 100644
--- a/BPASmartClient.Academy/View/ReactionKettle50LView.xaml.cs
+++ b/BPASmartClient.Academy/View/ReactionKettle50LView.xaml.cs
@@ -114,6 +114,7 @@ namespace BPASmartClient.Academy.View
{
NoticeDemoViewModel.OpenMsg(promptType, App.Current.MainWindow, title, msg);
}));
+ MessageNotify.GetInstance.ShowRunLog($"人工介入:"+msg);
}
private void auto_click(object sender, RoutedEventArgs e)
@@ -288,26 +289,5 @@ namespace BPASmartClient.Academy.View
Notify(EnumPromptType.Error, "校准失败", "设备未连接");
}
}
-
-
- private void Canvas_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
- {
-
- }
-
- private void Canvas_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
- {
-
- }
-
- private void Canvas_MouseMove(object sender, MouseEventArgs e)
- {
-
- }
-
- private void Canvas_MouseWheel(object sender, MouseWheelEventArgs e)
- {
-
- }
}
}