Browse Source

监控EAP端下的Job list

jiangjy 1 month ago
parent
commit
7fd9aa18bb

+ 3 - 3
FrameworkLocal/UIClient/CenterViews/Operations/MonitorJob/MonitorJobView.xaml

@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              mc:Ignorable="d" 
              d:DesignHeight="900" d:DesignWidth="1920"  >
-    <Grid>
+    <Grid >
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
@@ -80,7 +80,7 @@
                         </DataGrid.Columns>
                     </DataGrid>
 
-                    <StackPanel Grid.Row="1" VerticalAlignment="Top" Orientation="Horizontal"  Height="55">
+                    <StackPanel Visibility="Hidden" Grid.Row="1" VerticalAlignment="Top" Orientation="Horizontal"  Height="55">
                         <!--<Button Content="Resume" Height="30"    VerticalAlignment="Center" Width="119"  Command="{Binding ControlJobsCommand}"  CommandParameter="Resume"       IsDefault="True" Canvas.Left="382" Margin="20,0,0,0" Canvas.Top="15" IsEnabled="{Binding IsPermission}"/>
                         <Button Content="Pause" Height="30"    VerticalAlignment="Center" Width="119"  Command="{Binding ControlJobsCommand}"   CommandParameter="Pause"        IsDefault="True" Canvas.Left="382" Margin="20,0,0,0" Canvas.Top="15" IsEnabled="{Binding IsPermission}"/>
                         <Button Content="Start" Height="30"    VerticalAlignment="Center" Width="119"  Command="{Binding ControlJobsCommand}"   CommandParameter="Start"        IsDefault="True" Canvas.Left="382" Margin="20,0,0,0" Canvas.Top="15" IsEnabled="{Binding IsPermission}"/>
@@ -165,7 +165,7 @@
                         </DataGrid.Columns>
                     </DataGrid>
 
-                    <StackPanel Grid.Row="1" VerticalAlignment="Top" Orientation="Horizontal"  Height="55">
+                    <StackPanel Visibility="Hidden" Grid.Row="1" VerticalAlignment="Top" Orientation="Horizontal"  Height="55">
 
                         <!--<Button Content="Resume" Height="30" VerticalAlignment="Center" Width="119" Command="{Binding ProcessJobsCommand}"  CommandParameter="Resume" IsDefault="True" Canvas.Left="382" Margin="20,0,0,0" Canvas.Top="15" IsEnabled="{Binding IsPermission}"/>
                         <Button Content="Pause"  Height="30" VerticalAlignment="Center" Width="119"   Command="{Binding ProcessJobsCommand}"   CommandParameter="Pause" IsDefault="True" Canvas.Left="382" Margin="20,0,0,0" Canvas.Top="15" IsEnabled="{Binding IsPermission}"/>

+ 1 - 1
Furnace/FurnaceUI/Config/Menu.xml

@@ -5,7 +5,7 @@
 		<menuItem  id="main"			resKey="Main"				viewmodel="FurnaceUI.Views.Operations.StatusViewModel,FurnaceUI" />
 		<menuItem  id="job"				resKey="Job"				viewmodel="FurnaceUI.Views.Status.ControlJobStatusViewModel,FurnaceUI" />
 
-		<menuItem id="FAJob"		resKey="FAJob"		viewmodel="MECF.Framework.UI.Client.CenterViews.Operations.MonitorJobViewModel,MECF.Framework.UI.Client" />
+		<menuItem id="FAJob"		resKey="FAJob"		viewmodel="MECF.Framework.UI.Client.CenterViews.Operations.MonitorJob.MonitorJobViewModel,MECF.Framework.UI.Client" />
 		<menuItem  id="temp"			resKey="Temp"				viewmodel="FurnaceUI.Views.Operations.TemperatureViewModel,FurnaceUI" />
 		<menuItem  id="Pressure"		resKey="Pressure"			viewmodel="FurnaceUI.Views.Operations.PressureDetailViewModel,FurnaceUI" />
 		<menuItem  id="TransferMain"	resKey="Transfer Main"		viewmodel="FurnaceUI.Views.Operations.SelfCheckViewModel,FurnaceUI" />