From 1bbfd5e5a9d619277d2b477e8d4078deff96972b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com> Date: Mon, 15 Aug 2022 11:29:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E7=8A=B6=E6=80=81=E7=9B=91?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BPASmartClient.CustomResource.csproj | 2 + .../Image/弹窗2.png | Bin 0 -> 8230 bytes .../UserControls/BatchingMachine.xaml | 47 ++++ .../UserControls/BatchingMachine.xaml.cs | 28 ++ .../UserControls/Cylinder.xaml | 249 ++++++++++++++++++ .../UserControls/Cylinder.xaml.cs | 31 +++ DosingSystem/View/HardwareStatusView.xaml | 4 + DosingSystem/View/NewMaterialView.xaml | 141 +++++----- DosingSystem/View/NewRecipeView.xaml | 20 +- SmartClient.sln | 7 +- 10 files changed, 461 insertions(+), 68 deletions(-) create mode 100644 BPASmartClient.CustomResource/Image/弹窗2.png create mode 100644 BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml create mode 100644 BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml.cs create mode 100644 BPASmartClient.CustomResource/UserControls/Cylinder.xaml create mode 100644 BPASmartClient.CustomResource/UserControls/Cylinder.xaml.cs diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj index b5146049..566cd517 100644 --- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj +++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj @@ -114,6 +114,7 @@ + @@ -277,6 +278,7 @@ + diff --git a/BPASmartClient.CustomResource/Image/弹窗2.png b/BPASmartClient.CustomResource/Image/弹窗2.png new file mode 100644 index 0000000000000000000000000000000000000000..6f69f62a74e46ad3e2424cb6e984c2ca89fbf34c GIT binary patch literal 8230 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 J{F%%D{C~)*_VfS% literal 0 HcmV?d00001 diff --git a/BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml b/BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml new file mode 100644 index 00000000..994077f8 --- /dev/null +++ b/BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml.cs b/BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml.cs new file mode 100644 index 00000000..f4651dac --- /dev/null +++ b/BPASmartClient.CustomResource/UserControls/BatchingMachine.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.CustomResource.UserControls +{ + /// + /// BatchingMachine.xaml 的交互逻辑 + /// + public partial class BatchingMachine : UserControl + { + public BatchingMachine() + { + InitializeComponent(); + } + } +} diff --git a/BPASmartClient.CustomResource/UserControls/Cylinder.xaml b/BPASmartClient.CustomResource/UserControls/Cylinder.xaml new file mode 100644 index 00000000..97f5d6f8 --- /dev/null +++ b/BPASmartClient.CustomResource/UserControls/Cylinder.xaml @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BPASmartClient.CustomResource/UserControls/Cylinder.xaml.cs b/BPASmartClient.CustomResource/UserControls/Cylinder.xaml.cs new file mode 100644 index 00000000..b115ba13 --- /dev/null +++ b/BPASmartClient.CustomResource/UserControls/Cylinder.xaml.cs @@ -0,0 +1,31 @@ +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.CustomResource.UserControls +{ + /// + /// Cylinder.xaml 的交互逻辑 + /// + public partial class Cylinder : UserControl + { + public Cylinder() + { + InitializeComponent(); + + } + + + } +} diff --git a/DosingSystem/View/HardwareStatusView.xaml b/DosingSystem/View/HardwareStatusView.xaml index de95a26d..02e3b926 100644 --- a/DosingSystem/View/HardwareStatusView.xaml +++ b/DosingSystem/View/HardwareStatusView.xaml @@ -187,6 +187,10 @@ StrokeDashArray="1.5 1.5" StrokeFillBrush="#00BEFA" StrokeThickness="2" /> + + + + diff --git a/DosingSystem/View/NewMaterialView.xaml b/DosingSystem/View/NewMaterialView.xaml index 1158e4ed..a7b70333 100644 --- a/DosingSystem/View/NewMaterialView.xaml +++ b/DosingSystem/View/NewMaterialView.xaml @@ -1,21 +1,22 @@ - + - + @@ -24,7 +25,7 @@ - +