diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
index deab1808..8d7bc3f5 100644
--- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
+++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
@@ -213,6 +213,14 @@
+
+
+
+
+
+
+
+
@@ -356,6 +364,14 @@
+
+
+
+
+
+
+
+
diff --git a/BPASmartClient.CustomResource/Converters/BoolToVisibilityConvert.cs b/BPASmartClient.CustomResource/Converters/BoolToVisibilityConvert.cs
new file mode 100644
index 00000000..0bc2b122
--- /dev/null
+++ b/BPASmartClient.CustomResource/Converters/BoolToVisibilityConvert.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BPASmartClient.CustomResource.Converters
+{
+ public class BoolToVisibilityConvert : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (value != null && value is bool tempBool)
+ {
+ return tempBool ? Visibility.Visible : Visibility.Hidden;
+ }
+ return default;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/BPASmartClient.CustomResource/Image/荧光/29.png b/BPASmartClient.CustomResource/Image/荧光/29.png
new file mode 100644
index 00000000..3f09aa23
Binary files /dev/null and b/BPASmartClient.CustomResource/Image/荧光/29.png differ
diff --git a/BPASmartClient.CustomResource/Image/荧光/发光.png b/BPASmartClient.CustomResource/Image/荧光/发光.png
new file mode 100644
index 00000000..e6042670
Binary files /dev/null and b/BPASmartClient.CustomResource/Image/荧光/发光.png differ
diff --git a/BPASmartClient.CustomResource/Image/荧光/向下箭头.png b/BPASmartClient.CustomResource/Image/荧光/向下箭头.png
new file mode 100644
index 00000000..0023ce03
Binary files /dev/null and b/BPASmartClient.CustomResource/Image/荧光/向下箭头.png differ
diff --git a/BPASmartClient.CustomResource/Image/荧光/底座.png b/BPASmartClient.CustomResource/Image/荧光/底座.png
new file mode 100644
index 00000000..e9ea97a7
Binary files /dev/null and b/BPASmartClient.CustomResource/Image/荧光/底座.png differ
diff --git a/BPASmartClient.CustomResource/Image/荧光/矩形发光.png b/BPASmartClient.CustomResource/Image/荧光/矩形发光.png
new file mode 100644
index 00000000..ed6aa401
Binary files /dev/null and b/BPASmartClient.CustomResource/Image/荧光/矩形发光.png differ
diff --git a/BPASmartClient.CustomResource/Image/荧光/立体三角.png b/BPASmartClient.CustomResource/Image/荧光/立体三角.png
new file mode 100644
index 00000000..17712bdd
Binary files /dev/null and b/BPASmartClient.CustomResource/Image/荧光/立体三角.png differ
diff --git a/BPASmartClient.CustomResource/Image/荧光/蓝色提示框.png b/BPASmartClient.CustomResource/Image/荧光/蓝色提示框.png
new file mode 100644
index 00000000..a9fb49ed
Binary files /dev/null and b/BPASmartClient.CustomResource/Image/荧光/蓝色提示框.png differ
diff --git a/BPASmartClient.CustomResource/Image/荧光/返回.png b/BPASmartClient.CustomResource/Image/荧光/返回.png
new file mode 100644
index 00000000..47771c51
Binary files /dev/null and b/BPASmartClient.CustomResource/Image/荧光/返回.png differ
diff --git a/DosingSystem/App.xaml b/DosingSystem/App.xaml
index 4fea0d7a..74dd174a 100644
--- a/DosingSystem/App.xaml
+++ b/DosingSystem/App.xaml
@@ -25,6 +25,7 @@
+
diff --git a/DosingSystem/Model/DeviceCurrentStatus.cs b/DosingSystem/Model/DeviceCurrentStatus.cs
index 62b56ca5..37ec350b 100644
--- a/DosingSystem/Model/DeviceCurrentStatus.cs
+++ b/DosingSystem/Model/DeviceCurrentStatus.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using System.Windows;
using Microsoft.Toolkit.Mvvm.ComponentModel;
namespace BPASmartClient.DosingSystem
@@ -42,8 +43,8 @@ namespace BPASmartClient.DosingSystem
///
/// 仓盖是否被打开
///
- public string IsOpen { get { return _mIsOpen; } set { _mIsOpen = value; OnPropertyChanged(); } }
- private string _mIsOpen;
+ public bool IsOpen { get { return _mIsOpen; } set { _mIsOpen = value; OnPropertyChanged(); } }
+ private bool _mIsOpen;
///
/// 料仓时候有报警
@@ -51,5 +52,7 @@ namespace BPASmartClient.DosingSystem
public bool IsFault { get { return _mIsFault; } set { _mIsFault = value; OnPropertyChanged(); } }
private bool _mIsFault;
+
+
}
}
diff --git a/DosingSystem/View/HardwareStatusView.xaml b/DosingSystem/View/HardwareStatusView.xaml
index a5b7b684..3986d2af 100644
--- a/DosingSystem/View/HardwareStatusView.xaml
+++ b/DosingSystem/View/HardwareStatusView.xaml
@@ -18,9 +18,9 @@
-
+
-
+
@@ -50,19 +50,20 @@
+
-
+ Text="{Binding DeviceName}" />-->
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- -->
+
+
+
+
+
+
+
+
-
+ Style="{StaticResource IcoButtonStyle}" />-->
diff --git a/DosingSystem/View/StockControlView.xaml b/DosingSystem/View/StockControlView.xaml
index 46a5e8aa..0c1495ee 100644
--- a/DosingSystem/View/StockControlView.xaml
+++ b/DosingSystem/View/StockControlView.xaml
@@ -47,6 +47,10 @@
+
+
@@ -85,17 +89,37 @@
+
-
+
+
+
+
+
+