添加资源

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();
+        }
+
+    }
+}

Properties/Resources.Designer.cs

@@ -2472,6 +2472,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Subroutine 的本地化字符串。
+        /// </summary>
+        public static string Subroutine {
+            get {
+                return ResourceManager.GetString("Subroutine", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 SystemDataLoss 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -1071,4 +1071,7 @@
   <data name="Pequest" xml:space="preserve">
     <value>Pequest</value>
   </data>
+  <data name="Subroutine" xml:space="preserve">
+    <value>Subroutine</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -1071,4 +1071,7 @@
   <data name="Pequest" xml:space="preserve">
     <value>Pequest</value>
   </data>
+  <data name="Subroutine" xml:space="preserve">
+    <value>Subroutine</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -1071,4 +1071,7 @@
   <data name="Pequest" xml:space="preserve">
     <value>请求</value>
   </data>
+  <data name="Subroutine" xml:space="preserve">
+    <value>副功能</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -1071,4 +1071,7 @@
   <data name="Pequest" xml:space="preserve">
     <value />
   </data>
+  <data name="Subroutine" xml:space="preserve">
+    <value />
+  </data>
 </root>

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -104,6 +104,7 @@
     <Compile Include="ConvertMoels\BoolRBConvert.cs" />
     <Compile Include="ConvertMoels\StatenClassConvert.cs" />
     <Compile Include="ConvertMoels\BoolToVisidilityConvert.cs" />
+    <Compile Include="ConvertMoels\StatenToImageConvert.cs" />
     <Compile Include="ConvertMoels\StatexmlConvert.cs" />
     <Compile Include="EX\DispenseState.xaml.cs">
       <DependentUpon>DispenseState.xaml</DependentUpon>
@@ -507,6 +508,88 @@
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
     <Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
+    <Resource Include="lmage\00.png" />
+    <Resource Include="lmage\1000-1.png" />
+    <Resource Include="lmage\1000-2.png" />
+    <Resource Include="lmage\1000-3.png" />
+    <Resource Include="lmage\10000.png" />
+    <Resource Include="lmage\10001.gif" />
+    <Resource Include="lmage\2000.png" />
+    <Resource Include="lmage\2001.png" />
+    <Resource Include="lmage\ADD.jpg" />
+    <Resource Include="lmage\ADD.png" />
+    <Resource Include="lmage\beng_err.png" />
+    <Resource Include="lmage\beng_run.png" />
+    <Resource Include="lmage\beng_stop.png" />
+    <Resource Include="lmage\ERR.png" />
+    <Resource Include="lmage\fa_bili.png" />
+    <Resource Include="lmage\FlatColorIconsCancel.png" />
+    <Resource Include="lmage\FxemojiBellcancellation.png" />
+    <Resource Include="lmage\FxemojiRingingbell.png" />
+    <Resource Include="lmage\guamaoqi.png" />
+    <Resource Include="lmage\guandao %281%29.png" />
+    <Resource Include="lmage\guandao %2810%29.png" />
+    <Resource Include="lmage\guandao %2811%29.png" />
+    <Resource Include="lmage\guandao %2812%29.png" />
+    <Resource Include="lmage\guandao %2813%29.png" />
+    <Resource Include="lmage\guandao %2814%29.png" />
+    <Resource Include="lmage\guandao %2815%29.png" />
+    <Resource Include="lmage\guandao %2816%29.png" />
+    <Resource Include="lmage\guandao %282%29.png" />
+    <Resource Include="lmage\guandao %283%29.png" />
+    <Resource Include="lmage\guandao %284%29.png" />
+    <Resource Include="lmage\guandao %285%29.png" />
+    <Resource Include="lmage\guandao %286%29.png" />
+    <Resource Include="lmage\guandao %287%29.png" />
+    <Resource Include="lmage\guandao %288%29.png" />
+    <Resource Include="lmage\guandao %289%29.png" />
+    <Resource Include="lmage\Hand.png" />
+    <Resource Include="lmage\IconParkAutoFocus.png" />
+    <Resource Include="lmage\IconParkLock.png" />
+    <Resource Include="lmage\IconParkMessages.png" />
+    <Resource Include="lmage\IconParkPauseOne.png" />
+    <Resource Include="lmage\IconParkPlay.png" />
+    <Resource Include="lmage\IconParkPlayTwo.png" />
+    <Resource Include="lmage\IconParkStopwatch.png" />
+    <Resource Include="lmage\ID001.png" />
+    <Resource Include="lmage\ID007.png" />
+    <Resource Include="lmage\ID008.png" />
+    <Resource Include="lmage\ID013.png" />
+    <Resource Include="lmage\ID015.png" />
+    <Resource Include="lmage\ID017.png" />
+    <Resource Include="lmage\ID020.png" />
+    <Resource Include="lmage\ID022.png" />
+    <Resource Include="lmage\ID031.png" />
+    <Resource Include="lmage\ID035.png" />
+    <Resource Include="lmage\ID036.png" />
+    <Resource Include="lmage\ID039.png" />
+    <Resource Include="lmage\ID040.png" />
+    <Resource Include="lmage\ID041.png" />
+    <Resource Include="lmage\ID049.png" />
+    <Resource Include="lmage\ID050.png" />
+    <Resource Include="lmage\ID051.png" />
+    <Resource Include="lmage\ID054.png" />
+    <Resource Include="lmage\ID055.png" />
+    <Resource Include="lmage\ID056.png" />
+    <Resource Include="lmage\ID064.png" />
+    <Resource Include="lmage\ID065.png" />
+    <Resource Include="lmage\ID066.png" />
+    <Resource Include="lmage\ID067.png" />
+    <Resource Include="lmage\ID090.png" />
+    <Resource Include="lmage\ID091.png" />
+    <Resource Include="lmage\ID093.png" />
+    <Resource Include="lmage\ID094.png" />
+    <Resource Include="lmage\inf.png" />
+    <Resource Include="lmage\link.png" />
+    <Resource Include="lmage\LOCK.png" />
+    <Resource Include="lmage\Manual.png" />
+    <Resource Include="lmage\start.png" />
+    <Resource Include="lmage\start2.png" />
+    <Resource Include="lmage\start3.png" />
+    <Resource Include="lmage\StreamlinePlayList4Solid.png" />
+    <Resource Include="lmage\StreamlinePlayList8.png" />
+    <Resource Include="lmage\StreamlineUltimateColorColorPaletteSample1.png" />
+    <Resource Include="lmage\tong.png" />
     <Resource Include="LOGO\sunlight_logo.jpg" />
     <Resource Include="LOGO\303pdw.png" />
     <Resource Include="LOGO\303.png" />

View/MonitorView.xaml

@@ -16,6 +16,7 @@
         <ConvertMoels:StatexmlConvert x:Key="StatexmlConvert"/>
         <ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/>
         <ConvertMoels:BoolToVisidilityConvert x:Key="BoolToVisidilityConvert"/>
+        <ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/>
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -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" >
                 <DataGrid.RowStyle >
                     <Style TargetType="{x:Type DataGridRow}">
                         <Setter Property="IsHitTestVisible" Value="{Binding DataContext.IsInteractive,
                             RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-                        <Setter Property="Height" Value="30" />
+                        <Setter Property="Height" Value="100" />
                         <Setter Property="FontSize" Value="25" />
                         <Style.Triggers>
                             <Trigger Property="ItemsControl.AlternationIndex" Value="0">
@@ -177,16 +179,87 @@
                     <!--列信息绑定-->
                     <DataGridTextColumn Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
                     <DataGridTextColumn Binding="{Binding Program}" Width="0" MinWidth="0" MaxWidth="0"/>
-                    <DataGridTextColumn Binding="{Binding Step}" Width="70" Header="{x:Static lang:Resources.Step}" IsReadOnly="True"/>
+                    <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" 
-                    <DataGridTextColumn Binding="{Binding StepID}" Width="0" MinWidth="0" MaxWidth="0" IsReadOnly="True"/>
+                     Width="80" IsReadOnly="True">
-                    <DataGridTextColumn Binding="{Binding StepName}" Header="{x:Static lang:Resources.Directives}" Width="300" IsReadOnly="True"/>
+                        <DataGridTextColumn.ElementStyle>
-                    <DataGridTextColumn Binding="{Binding ParameterName}" Header="{x:Static lang:Resources.ParameterSet}" Width="*" IsReadOnly="True"/>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="VerticalAlignment" Value="Center"/>
+                                <Setter Property="HorizontalAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.ElementStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" 
+                     MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
+                    <DataGridTextColumn Header="{x:Static lang:Resources.Directives}"  Width="0" MinWidth="0"
+                     MaxWidth="0" Binding="{Binding StepName}" IsReadOnly="True"/>
+                    <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}"  Width="0" MinWidth="0" 
+                     MaxWidth="0" Binding="{Binding ParameterName}" IsReadOnly="True"/>
                     <DataGridTextColumn Binding="{Binding Parameter1}" Width="0" MinWidth="0" MaxWidth="0"/>
                     <DataGridTextColumn Binding="{Binding Parameter2}" Width="0" MinWidth="0" MaxWidth="0"/>
                     <DataGridTextColumn Binding="{Binding Parameter3}" Width="0" MinWidth="0" MaxWidth="0"/>
                     <DataGridTextColumn Binding="{Binding Parameter4}" Width="0" MinWidth="0" MaxWidth="0"/>
                     <DataGridTextColumn Binding="{Binding Parameter5}" Width="0" MinWidth="0" MaxWidth="0"/>
-                    <DataGridTextColumn Binding="{Binding DYELOT}" Width="0" MinWidth="0" MaxWidth="0"/>
+                    <DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="100" IsReadOnly="True">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Image Source="{Binding Path=StepID,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="600"  IsReadOnly="True">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <StackPanel>
+                                    <Border BorderBrush="#FFC9C9C9" BorderThickness="0,0,0,0.5">
+                                        <TextBlock Height="50" >                         
+                         <Run Text="{x:Static lang:Resources.Function}"/>        
+                         <Run Text=":"/>                       
+                         <Run Text="{Binding StepName}"/>
+                                        </TextBlock>
+                                    </Border>
+                                    <Border BorderBrush="#FFC9C9C9" BorderThickness="0,0.5,0,0">
+                                        <TextBlock Height="50" >                         
+                         <Run Text="{x:Static lang:Resources.ParameterSet}"/>                           
+                         <Run Text=":"/>                      
+                         <Run Text="{Binding ParameterName}"/>
+                                        </TextBlock>
+                                    </Border>
+                                </StackPanel>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Image Source="{Binding Path=StepID_S1,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Image Source="{Binding Path=StepID_S2,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Image Source="{Binding Path=StepID_S3  ,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Binding="{Binding Remark}" 
+                     Width="*" IsReadOnly="True">
+                        <DataGridTextColumn.ElementStyle>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="VerticalAlignment" Value="Center"/>
+                                <Setter Property="HorizontalAlignment" Value="Center"/>
+                                <Setter Property="TextWrapping" Value="Wrap"/>
+                                <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+                            </Style>
+                        </DataGridTextColumn.ElementStyle>
+                    </DataGridTextColumn>
                 </DataGrid.Columns>
             </DataGrid>
             <TextBlock Grid.Column="0" x:Name="machin_LOG" TextWrapping="Wrap" FontSize="27" VerticalAlignment="Top" Height="40" Background="#FF2793FF" Foreground="White" FontWeight="Bold"/>

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<T> ToObservableCollection<T>(DataTable dt) where T : class, new()