diff --git a/ConvertMoels/StatenToImageConvert.cs b/ConvertMoels/StatenToImageConvert.cs new file mode 100644 index 0000000..19d9723 --- /dev/null +++ b/ConvertMoels/StatenToImageConvert.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using System.Windows.Media.Imaging; + +namespace SunlightCentralizedControlManagement_SCCM_.ConvertMoels +{ + internal class StatenToImageConvert : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + { + switch (value) + { + case "001": + return new BitmapImage(new Uri("/Lmage/ID001.png", UriKind.Relative));//功能模块001温度控制 + case "007": + return new BitmapImage(new Uri("/Lmage/ID007.png", UriKind.Relative));//液位入水 + case "008": + return new BitmapImage(new Uri("/Lmage/ID008.png", UriKind.Relative));//流量入水 + case "013": + return new BitmapImage(new Uri("/Lmage/ID013.png", UriKind.Relative));//批次水位水洗 + case "015": + return new BitmapImage(new Uri("/Lmage/ID015.png", UriKind.Relative));//溢流水洗 + case "017": + return new BitmapImage(new Uri("/Lmage/ID017.png", UriKind.Relative));//降温水洗 + case "020": + return new BitmapImage(new Uri("/Lmage/ID020.png", UriKind.Relative));//排水 + case "022": + return new BitmapImage(new Uri("/Lmage/ID022.png", UriKind.Relative));//动力排水 + case "031": + return new BitmapImage(new Uri("/Lmage/ID031.png", UriKind.Relative));//运转时间 + case "035": + return new BitmapImage(new Uri("/Lmage/ID035.png", UriKind.Relative));//准备入布 + case "036": + return new BitmapImage(new Uri("/Lmage/ID036.png", UriKind.Relative));//准备出布 + case "039": + return new BitmapImage(new Uri("/Lmage/ID039.png", UriKind.Relative));//呼叫人工 + case "040": + return new BitmapImage(new Uri("/Lmage/ID040.png", UriKind.Relative));//取样 + case "041": + return new BitmapImage(new Uri("/Lmage/ID041.png", UriKind.Relative));//结束 + case "049": + return new BitmapImage(new Uri("/Lmage/ID049.png", UriKind.Relative));//等待 + case "050": + return new BitmapImage(new Uri("/Lmage/ID050.png", UriKind.Relative));//主缸加压 + case "051": + return new BitmapImage(new Uri("/Lmage/ID051.png", UriKind.Relative));//主缸减压 + case "054": + return new BitmapImage(new Uri("/Lmage/ID054.png", UriKind.Relative));//主泵/风机速度 + case "055": + return new BitmapImage(new Uri("/Lmage/ID055.png", UriKind.Relative));//主泵启动 + case "056": + return new BitmapImage(new Uri("/Lmage/ID056.png", UriKind.Relative));// + case "064": + return new BitmapImage(new Uri("/Lmage/ID064.png", UriKind.Relative));// + case "065": + return new BitmapImage(new Uri("/Lmage/ID065.png", UriKind.Relative));// + case "066": + return new BitmapImage(new Uri("/Lmage/ID066.png", UriKind.Relative));// + case "067": + return new BitmapImage(new Uri("/Lmage/ID067.png", UriKind.Relative));// + case "090": + return new BitmapImage(new Uri("/Lmage/ID090.png", UriKind.Relative));// + case "091": + return new BitmapImage(new Uri("/Lmage/ID091.png", UriKind.Relative));// + case "093": + return new BitmapImage(new Uri("/Lmage/ID093.png", UriKind.Relative));// + case "094": + return new BitmapImage(new Uri("/Lmage/ID094.png", UriKind.Relative));// + default: + return new BitmapImage(new Uri("", UriKind.Relative)); + } + } + + public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + { + throw new NotImplementedException(); + } + + } +} diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 26bff3c..14f35ce 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -2472,6 +2472,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } + /// + /// 查找类似 Subroutine 的本地化字符串。 + /// + public static string Subroutine { + get { + return ResourceManager.GetString("Subroutine", resourceCulture); + } + } + /// /// 查找类似 SystemDataLoss 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index 265f841..d35b39a 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -1071,4 +1071,7 @@ Pequest + + Subroutine + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 6131d5b..910d697 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -1071,4 +1071,7 @@ Pequest + + Subroutine + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index 04c5222..bd2225e 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -1071,4 +1071,7 @@ 请求 + + 副功能 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index 0380229..09c24df 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -1071,4 +1071,7 @@ + + + \ No newline at end of file diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj index 0e83eae..a542ba4 100644 --- a/SunlightCentralizedControlManagement_SCCM_.csproj +++ b/SunlightCentralizedControlManagement_SCCM_.csproj @@ -104,6 +104,7 @@ + DispenseState.xaml @@ -507,6 +508,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/View/MonitorView.xaml b/View/MonitorView.xaml index b9937e7..684d80c 100644 --- a/View/MonitorView.xaml +++ b/View/MonitorView.xaml @@ -16,6 +16,7 @@ + @@ -127,12 +128,13 @@ HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" Background="White" GridLinesVisibility="All" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" BorderBrush="{x:Null}" CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False" - CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" > + CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" AllowDrop="False" + HeadersVisibility ="Column" > + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs index 6aad1c2..37c7bce 100644 --- a/View/MonitorView.xaml.cs +++ b/View/MonitorView.xaml.cs @@ -664,6 +664,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.View public double Step { get; set; } public string StepID { get; set; } public string StepName { get; set; } + public string StepID_S1 { get; set; } + public string StepName_S1 { get; set; } + public string StepID_S2 { get; set; } + public string StepName_S2 { get; set; } + public string StepID_S3 { get; set; } + public string StepName_S3 { get; set; } public string ParameterName { get; set; } public string Parameter1 { get; set; } public string Parameter2 { get; set; } @@ -671,6 +677,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View public string Parameter4 { get; set; } public string Parameter5 { get; set; } public string DYELOT { get; set; } + public string Remark { get; set; } } public ObservableCollection ToObservableCollection(DataTable dt) where T : class, new() diff --git a/lmage/00.png b/lmage/00.png new file mode 100644 index 0000000..d0d2f33 Binary files /dev/null and b/lmage/00.png differ diff --git a/lmage/1000-1.png b/lmage/1000-1.png new file mode 100644 index 0000000..612beaa Binary files /dev/null and b/lmage/1000-1.png differ diff --git a/lmage/1000-2.png b/lmage/1000-2.png new file mode 100644 index 0000000..9c21211 Binary files /dev/null and b/lmage/1000-2.png differ diff --git a/lmage/1000-3.png b/lmage/1000-3.png new file mode 100644 index 0000000..5dbae05 Binary files /dev/null and b/lmage/1000-3.png differ diff --git a/lmage/10000.png b/lmage/10000.png new file mode 100644 index 0000000..3449e15 Binary files /dev/null and b/lmage/10000.png differ diff --git a/lmage/10001.gif b/lmage/10001.gif new file mode 100644 index 0000000..28a8d29 Binary files /dev/null and b/lmage/10001.gif differ diff --git a/lmage/2000.png b/lmage/2000.png new file mode 100644 index 0000000..fdc911a Binary files /dev/null and b/lmage/2000.png differ diff --git a/lmage/2001.png b/lmage/2001.png new file mode 100644 index 0000000..dc98b45 Binary files /dev/null and b/lmage/2001.png differ diff --git a/lmage/ADD.jpg b/lmage/ADD.jpg new file mode 100644 index 0000000..56a8b9e Binary files /dev/null and b/lmage/ADD.jpg differ diff --git a/lmage/ADD.png b/lmage/ADD.png new file mode 100644 index 0000000..9da70ec Binary files /dev/null and b/lmage/ADD.png differ diff --git a/lmage/ERR.png b/lmage/ERR.png new file mode 100644 index 0000000..45fa8ec Binary files /dev/null and b/lmage/ERR.png differ diff --git a/lmage/FlatColorIconsCancel.png b/lmage/FlatColorIconsCancel.png new file mode 100644 index 0000000..02ff9d8 Binary files /dev/null and b/lmage/FlatColorIconsCancel.png differ diff --git a/lmage/FxemojiBellcancellation.png b/lmage/FxemojiBellcancellation.png new file mode 100644 index 0000000..db67c1e Binary files /dev/null and b/lmage/FxemojiBellcancellation.png differ diff --git a/lmage/FxemojiRingingbell.png b/lmage/FxemojiRingingbell.png new file mode 100644 index 0000000..75e3f31 Binary files /dev/null and b/lmage/FxemojiRingingbell.png differ diff --git a/lmage/Hand.png b/lmage/Hand.png new file mode 100644 index 0000000..22e70b6 Binary files /dev/null and b/lmage/Hand.png differ diff --git a/lmage/ID001.png b/lmage/ID001.png new file mode 100644 index 0000000..8064d9b Binary files /dev/null and b/lmage/ID001.png differ diff --git a/lmage/ID007.png b/lmage/ID007.png new file mode 100644 index 0000000..3daaa58 Binary files /dev/null and b/lmage/ID007.png differ diff --git a/lmage/ID008.png b/lmage/ID008.png new file mode 100644 index 0000000..3c137f8 Binary files /dev/null and b/lmage/ID008.png differ diff --git a/lmage/ID013.png b/lmage/ID013.png new file mode 100644 index 0000000..615a8ff Binary files /dev/null and b/lmage/ID013.png differ diff --git a/lmage/ID015.png b/lmage/ID015.png new file mode 100644 index 0000000..a8734b8 Binary files /dev/null and b/lmage/ID015.png differ diff --git a/lmage/ID017.png b/lmage/ID017.png new file mode 100644 index 0000000..322063f Binary files /dev/null and b/lmage/ID017.png differ diff --git a/lmage/ID020.png b/lmage/ID020.png new file mode 100644 index 0000000..464be3c Binary files /dev/null and b/lmage/ID020.png differ diff --git a/lmage/ID022.png b/lmage/ID022.png new file mode 100644 index 0000000..4b2d312 Binary files /dev/null and b/lmage/ID022.png differ diff --git a/lmage/ID031.png b/lmage/ID031.png new file mode 100644 index 0000000..c7acdd2 Binary files /dev/null and b/lmage/ID031.png differ diff --git a/lmage/ID035.png b/lmage/ID035.png new file mode 100644 index 0000000..7b4f82e Binary files /dev/null and b/lmage/ID035.png differ diff --git a/lmage/ID036.png b/lmage/ID036.png new file mode 100644 index 0000000..48f366c Binary files /dev/null and b/lmage/ID036.png differ diff --git a/lmage/ID039.png b/lmage/ID039.png new file mode 100644 index 0000000..7f71b0b Binary files /dev/null and b/lmage/ID039.png differ diff --git a/lmage/ID040.png b/lmage/ID040.png new file mode 100644 index 0000000..5ca541f Binary files /dev/null and b/lmage/ID040.png differ diff --git a/lmage/ID041.png b/lmage/ID041.png new file mode 100644 index 0000000..247bf78 Binary files /dev/null and b/lmage/ID041.png differ diff --git a/lmage/ID049.png b/lmage/ID049.png new file mode 100644 index 0000000..3eddb3e Binary files /dev/null and b/lmage/ID049.png differ diff --git a/lmage/ID050.png b/lmage/ID050.png new file mode 100644 index 0000000..b5cdc92 Binary files /dev/null and b/lmage/ID050.png differ diff --git a/lmage/ID051.png b/lmage/ID051.png new file mode 100644 index 0000000..24a3339 Binary files /dev/null and b/lmage/ID051.png differ diff --git a/lmage/ID054.png b/lmage/ID054.png new file mode 100644 index 0000000..0afd5c9 Binary files /dev/null and b/lmage/ID054.png differ diff --git a/lmage/ID055.png b/lmage/ID055.png new file mode 100644 index 0000000..0afd5c9 Binary files /dev/null and b/lmage/ID055.png differ diff --git a/lmage/ID056.png b/lmage/ID056.png new file mode 100644 index 0000000..062034b Binary files /dev/null and b/lmage/ID056.png differ diff --git a/lmage/ID064.png b/lmage/ID064.png new file mode 100644 index 0000000..eaa5ab3 Binary files /dev/null and b/lmage/ID064.png differ diff --git a/lmage/ID065.png b/lmage/ID065.png new file mode 100644 index 0000000..ed4b788 Binary files /dev/null and b/lmage/ID065.png differ diff --git a/lmage/ID066.png b/lmage/ID066.png new file mode 100644 index 0000000..1d4e348 Binary files /dev/null and b/lmage/ID066.png differ diff --git a/lmage/ID067.png b/lmage/ID067.png new file mode 100644 index 0000000..e08b584 Binary files /dev/null and b/lmage/ID067.png differ diff --git a/lmage/ID090.png b/lmage/ID090.png new file mode 100644 index 0000000..5d156b1 Binary files /dev/null and b/lmage/ID090.png differ diff --git a/lmage/ID091.png b/lmage/ID091.png new file mode 100644 index 0000000..43ddc0a Binary files /dev/null and b/lmage/ID091.png differ diff --git a/lmage/ID093.png b/lmage/ID093.png new file mode 100644 index 0000000..c026f27 Binary files /dev/null and b/lmage/ID093.png differ diff --git a/lmage/ID094.png b/lmage/ID094.png new file mode 100644 index 0000000..e422e25 Binary files /dev/null and b/lmage/ID094.png differ diff --git a/lmage/IconParkAutoFocus.png b/lmage/IconParkAutoFocus.png new file mode 100644 index 0000000..48e22a4 Binary files /dev/null and b/lmage/IconParkAutoFocus.png differ diff --git a/lmage/IconParkLock.png b/lmage/IconParkLock.png new file mode 100644 index 0000000..54c5369 Binary files /dev/null and b/lmage/IconParkLock.png differ diff --git a/lmage/IconParkMessages.png b/lmage/IconParkMessages.png new file mode 100644 index 0000000..e17d77b Binary files /dev/null and b/lmage/IconParkMessages.png differ diff --git a/lmage/IconParkPauseOne.png b/lmage/IconParkPauseOne.png new file mode 100644 index 0000000..0c73ec7 Binary files /dev/null and b/lmage/IconParkPauseOne.png differ diff --git a/lmage/IconParkPlay.png b/lmage/IconParkPlay.png new file mode 100644 index 0000000..f309edc Binary files /dev/null and b/lmage/IconParkPlay.png differ diff --git a/lmage/IconParkPlayTwo.png b/lmage/IconParkPlayTwo.png new file mode 100644 index 0000000..b81a1eb Binary files /dev/null and b/lmage/IconParkPlayTwo.png differ diff --git a/lmage/IconParkStopwatch.png b/lmage/IconParkStopwatch.png new file mode 100644 index 0000000..0841b12 Binary files /dev/null and b/lmage/IconParkStopwatch.png differ diff --git a/lmage/LOCK.png b/lmage/LOCK.png new file mode 100644 index 0000000..4dd7144 Binary files /dev/null and b/lmage/LOCK.png differ diff --git a/lmage/Manual.png b/lmage/Manual.png new file mode 100644 index 0000000..2dced26 Binary files /dev/null and b/lmage/Manual.png differ diff --git a/lmage/StreamlinePlayList4Solid.png b/lmage/StreamlinePlayList4Solid.png new file mode 100644 index 0000000..0ce5da4 Binary files /dev/null and b/lmage/StreamlinePlayList4Solid.png differ diff --git a/lmage/StreamlinePlayList8.png b/lmage/StreamlinePlayList8.png new file mode 100644 index 0000000..b802e5e Binary files /dev/null and b/lmage/StreamlinePlayList8.png differ diff --git a/lmage/StreamlineUltimateColorColorPaletteSample1.png b/lmage/StreamlineUltimateColorColorPaletteSample1.png new file mode 100644 index 0000000..c6a28c5 Binary files /dev/null and b/lmage/StreamlineUltimateColorColorPaletteSample1.png differ diff --git a/lmage/beng_err.png b/lmage/beng_err.png new file mode 100644 index 0000000..5d6f106 Binary files /dev/null and b/lmage/beng_err.png differ diff --git a/lmage/beng_run.png b/lmage/beng_run.png new file mode 100644 index 0000000..922ad5e Binary files /dev/null and b/lmage/beng_run.png differ diff --git a/lmage/beng_stop.png b/lmage/beng_stop.png new file mode 100644 index 0000000..325cae4 Binary files /dev/null and b/lmage/beng_stop.png differ diff --git a/lmage/fa_bili.png b/lmage/fa_bili.png new file mode 100644 index 0000000..01df3b9 Binary files /dev/null and b/lmage/fa_bili.png differ diff --git a/lmage/guamaoqi.png b/lmage/guamaoqi.png new file mode 100644 index 0000000..9db0f23 Binary files /dev/null and b/lmage/guamaoqi.png differ diff --git a/lmage/guandao (1).png b/lmage/guandao (1).png new file mode 100644 index 0000000..44e6914 Binary files /dev/null and b/lmage/guandao (1).png differ diff --git a/lmage/guandao (10).png b/lmage/guandao (10).png new file mode 100644 index 0000000..185f01b Binary files /dev/null and b/lmage/guandao (10).png differ diff --git a/lmage/guandao (11).png b/lmage/guandao (11).png new file mode 100644 index 0000000..019ca09 Binary files /dev/null and b/lmage/guandao (11).png differ diff --git a/lmage/guandao (12).png b/lmage/guandao (12).png new file mode 100644 index 0000000..04f572e Binary files /dev/null and b/lmage/guandao (12).png differ diff --git a/lmage/guandao (13).png b/lmage/guandao (13).png new file mode 100644 index 0000000..e0f9c77 Binary files /dev/null and b/lmage/guandao (13).png differ diff --git a/lmage/guandao (14).png b/lmage/guandao (14).png new file mode 100644 index 0000000..eedfb95 Binary files /dev/null and b/lmage/guandao (14).png differ diff --git a/lmage/guandao (15).png b/lmage/guandao (15).png new file mode 100644 index 0000000..a599efa Binary files /dev/null and b/lmage/guandao (15).png differ diff --git a/lmage/guandao (16).png b/lmage/guandao (16).png new file mode 100644 index 0000000..c3edf32 Binary files /dev/null and b/lmage/guandao (16).png differ diff --git a/lmage/guandao (2).png b/lmage/guandao (2).png new file mode 100644 index 0000000..35cb4c9 Binary files /dev/null and b/lmage/guandao (2).png differ diff --git a/lmage/guandao (3).png b/lmage/guandao (3).png new file mode 100644 index 0000000..6082c37 Binary files /dev/null and b/lmage/guandao (3).png differ diff --git a/lmage/guandao (4).png b/lmage/guandao (4).png new file mode 100644 index 0000000..69099c0 Binary files /dev/null and b/lmage/guandao (4).png differ diff --git a/lmage/guandao (5).png b/lmage/guandao (5).png new file mode 100644 index 0000000..f61a737 Binary files /dev/null and b/lmage/guandao (5).png differ diff --git a/lmage/guandao (6).png b/lmage/guandao (6).png new file mode 100644 index 0000000..de46794 Binary files /dev/null and b/lmage/guandao (6).png differ diff --git a/lmage/guandao (7).png b/lmage/guandao (7).png new file mode 100644 index 0000000..be327d8 Binary files /dev/null and b/lmage/guandao (7).png differ diff --git a/lmage/guandao (8).png b/lmage/guandao (8).png new file mode 100644 index 0000000..58479a3 Binary files /dev/null and b/lmage/guandao (8).png differ diff --git a/lmage/guandao (9).png b/lmage/guandao (9).png new file mode 100644 index 0000000..df8e279 Binary files /dev/null and b/lmage/guandao (9).png differ diff --git a/lmage/inf.png b/lmage/inf.png new file mode 100644 index 0000000..166d910 Binary files /dev/null and b/lmage/inf.png differ diff --git a/lmage/link.png b/lmage/link.png new file mode 100644 index 0000000..34ecb8d Binary files /dev/null and b/lmage/link.png differ diff --git a/lmage/start.png b/lmage/start.png new file mode 100644 index 0000000..889ed92 Binary files /dev/null and b/lmage/start.png differ diff --git a/lmage/start2.png b/lmage/start2.png new file mode 100644 index 0000000..00749ac Binary files /dev/null and b/lmage/start2.png differ diff --git a/lmage/start3.png b/lmage/start3.png new file mode 100644 index 0000000..68b2ede Binary files /dev/null and b/lmage/start3.png differ diff --git a/lmage/tong.png b/lmage/tong.png new file mode 100644 index 0000000..9af3ef3 Binary files /dev/null and b/lmage/tong.png differ