Selaa lähdekoodia

update compareRecipeView

git-svn-id: http://10.4.3.168:50001/svn/Furnace@51 dbcde07d-dcf5-c148-8a84-ac3097b7778e
Jiangjinyuan 2 kuukautta sitten
vanhempi
commit
50fbef2643

+ 4 - 4
FrameworkLocal/UIClient/CenterViews/DataLogs/ProcessHistory/ProcessDetailV2View.xaml

@@ -325,12 +325,12 @@
                         <Border Grid.Column="1" Grid.Row="1">
                             <StackPanel Orientation="Horizontal">
                                 <StackPanel Orientation="Vertical">
-                                    <Button Content="VP" Width="200" Height="80"></Button>
-                                    <Button Content="PMC Trace Logging"   Width="200" Height="80"></Button>
+                                    <Button Content="VP" Width="200" Height="80"  Command="{Binding VPCommand}"></Button>
+                                    <Button Content="PMC Trace Logging"   Width="200" Height="80"  Command="{Binding PMCTraceLoggingCommand}"></Button>
                                 </StackPanel>
                                 <StackPanel Orientation="Vertical">
-                                    <Button Content="Event Logging"    Width="200" Height="80"></Button>
-                                    <Button Content="Alarm Information" Width="200" Height="80"></Button>
+                                    <Button Content="Event Logging"    Width="200" Height="80"  Command="{Binding EventLoggingCommand}"></Button>
+                                    <Button Content="Alarm Information" Width="200" Height="80"    Command="{Binding AlarmInformationCommand}"></Button>
                                 </StackPanel>
                             </StackPanel>
                         </Border>

+ 17 - 0
FrameworkLocal/UIClient/CenterViews/DataLogs/ProcessHistory/ProcessDetailV2ViewModel.cs

@@ -5,9 +5,11 @@ using DocumentFormat.OpenXml.Drawing;
 using DocumentFormat.OpenXml.Drawing.Diagrams;
 using MECF.Framework.Common.DataCenter;
 using MECF.Framework.Common.Equipment;
+using MECF.Framework.Common.Jobs;
 using MECF.Framework.Common.Utilities;
 using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
 using MECF.Framework.UI.Client.ClientBase;
+using OpenSEMI.ClientBase.Command;
 using SciChart.Core.Extensions;
 using System;
 using System.Collections.Generic;
@@ -17,6 +19,7 @@ using System.Diagnostics.Eventing.Reader;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
 {
@@ -156,10 +159,24 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
         private RecipeFormatBuilder _columnBuilder = new RecipeFormatBuilder();
         private string _processPrefix = "Furnace\\Process";
         private string _layoutPrefix = "Furnace\\Layout";
+        public ICommand AlarmInformationCommand { get; set; }
+        public ICommand EventLoggingCommand { get; set; }
+        public ICommand PMCTraceLoggingCommand { get; set; }
+        public ICommand VPCommand { get; set; }
         #endregion
         public ProcessDetailV2ViewModel()
         {
+            AlarmInformationCommand = new BaseCommand<object>(AlarmInformationMethod);
+            EventLoggingCommand = new BaseCommand<object>(EventLoggingMethod);
+            PMCTraceLoggingCommand = new BaseCommand<object>(PMCTraceLoggingMethod);
+            VPCommand = new BaseCommand<object>(VPMethod);
         }
+        private void AlarmInformationMethod(object e) {
+            //
+        }
+        private void EventLoggingMethod(object e) { }
+        private void PMCTraceLoggingMethod(object e) { }
+        private void VPMethod(object e) { }
         protected override void OnViewLoaded(object _view)
         {
             base.OnViewLoaded(_view);

+ 2 - 2
FrameworkLocal/UIClient/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTwoView.xaml

@@ -328,11 +328,11 @@
                 Content="Process Table"/>
 
 
-            <Button
+            <!--<Button
                 Width="140"
                 Height="40"
                 Command="{Binding ProcessJobInfoCommand}"
-                Content="Process Job"/>
+                Content="Process Job"/>-->
         </StackPanel>
         <!--<StackPanel Grid.Row="2" Grid.Column="5" Grid.RowSpan="4" Orientation="Horizontal">
                 <Button Content="Display Graph" Width="140" Height="40" Margin="4,2,4,2" Command="{Binding DisplayGraphCommand}"/>

+ 2 - 0
Furnace/FurnaceUI/Views/Recipes/RecipesCompareTwoView.xaml

@@ -445,6 +445,7 @@
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
                                         <TextBlock
+                                            Height="40"
                                             Margin="5,0"
                                             HorizontalAlignment="Left"
                                             VerticalAlignment="Center"
@@ -647,6 +648,7 @@
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
                                         <TextBlock
+                                            Height="40"
                                             Margin="5,0"
                                             HorizontalAlignment="Left"
                                             VerticalAlignment="Center"