fix 优化展示效果

FrameworkLocal/UIClient/CenterViews/Configs/SystemConfig/SystemConfigView.xaml

@@ -349,12 +349,12 @@
                         </i:Interaction.Triggers>
                     </Button>
                 </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1"  Grid.Row="4" Grid.Column="0">
+                <Border Visibility="{Binding IsShowRobotControl,Converter={StaticResource bool2VisibilityConverter}}" BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1"  Grid.Row="4" Grid.Column="0">
                     <TextBlock Text="Robot Control" VerticalAlignment="Center" HorizontalAlignment="Center">
 
                     </TextBlock>
                 </Border>
-                <Border  Padding="5"  BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Grid.Row="4" Grid.Column="2">
+                <Border   Visibility="{Binding IsShowRobotControl,Converter={StaticResource bool2VisibilityConverter}}" Padding="5"  BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Grid.Row="4" Grid.Column="2">
                     <StackPanel Orientation="Horizontal">
                         <Button Content="Online"  Width="110"></Button>
                         <Button Content="Offline" Width="110" Margin="20,0,0,0"></Button>

FrameworkLocal/UIClient/CenterViews/Configs/SystemConfig/SystemConfigViewModel.cs

@@ -81,7 +81,17 @@ namespace MECF.Framework.UI.Client.CenterViews.Configs.SystemConfig
             }
         }
 
+        private bool _isShowRobotControl = false;
 
+        public bool IsShowRobotControl
+        {
+            get => _isShowRobotControl;
+            set
+            {
+                _isShowRobotControl = value;
+                NotifyOfPropertyChange(nameof(IsShowRobotControl));
+            }
+        }
         private List<ConfigNode> _ConfigNodes = new List<ConfigNode>();
         public List<ConfigNode> ConfigNodes
         {
@@ -227,6 +237,10 @@ namespace MECF.Framework.UI.Client.CenterViews.Configs.SystemConfig
             if (_CurrentNodeName.EndsWith("ShutDown"))
             {
                 SetShowView("IsShowShutDown");
+
+                IsShowRobotControl = (bool)QueryDataClient.Instance.Service.GetConfig("System.ShutDown.EnableRobotControl");
+
+
             }
             else if (_CurrentNodeName.Contains("WaferCycleTime"))
             {

Furnace/FurnaceRT/Config/FurnaceGemModel.xml

@@ -2461,6 +2461,7 @@
     <ECID id="10110027" valueType="Ascii" logicalName="System.SetUp.ToolType" value="" min="" max="" eventTrigger="" units="" description="Tool Type" isArray="false" />
     <ECID id="10110028" valueType="Ascii" logicalName="System.SetUp.ExportNameConversion" value="" min="" max="" eventTrigger="" units="" description="" isArray="false" />
     <ECID id="10120001" valueType="Ascii" logicalName="System.ShutDown.ShutDown" value="" min="" max="" eventTrigger="" units="" description="ShutDown" isArray="false" />
+    <ECID id="10120002" valueType="Ascii" logicalName="System.ShutDown.EnableRobotControl" value="" min="" max="" eventTrigger="" units="" description="EnableRobotControl" isArray="false" />
     <ECID id="10130001" valueType="Ascii" logicalName="System.SignalTower.Light" value="" min="" max="" eventTrigger="" units="" description="设置灯的种类，顺序" isArray="false" />
     <ECID id="10130002" valueType="Ascii" logicalName="System.SignalTower.Trigger" value="" min="" max="" eventTrigger="" units="" description="设置触发灯塔的项" isArray="false" />
     <ECID id="10130003" valueType="Ascii" logicalName="System.SignalTower.Value" value="" min="" max="" eventTrigger="" units="" description="设置灯塔触发的逻辑关系" isArray="false" />

Furnace/FurnaceRT/Config/IO/ELK/DeviceModelPM.xml

@@ -1050,9 +1050,7 @@
 		<IoAlarmSignal id="AlarmSignalLDS2MinorWarning"		diSignalsplay="LDS2 minor warning"			diSignal="DI_LDS2MinorWarning"		alarmTrigValue="true"/>
 		<IoAlarmSignal id="AlarmSignalLDS2LiquidLowWarning"		diSignalsplay="LDS2 liquid low warning"			diSignal="DI_LDS2LiquidLowWarning"		alarmTrigValue="true"/>
 		<IoAlarmSignal id="AlarmSignalLDS2TankBlankAlarm"		diSignalsplay="LDS2 tank blank alarm"			diSignal="DI_LDS2TankBlankAlarm"		alarmTrigValue="true"/>
-		<IoAlarmSignal id="AlarmSignalPOD1FOUPVacuumSuckingAlarm"		diSignalsplay="POD1 FOUP vacuum sucking alarm"			diSignal="DI_POD1FOUPVacuumSuckingAlarm"		alarmTrigValue="true"/>
-		<IoAlarmSignal id="AlarmSignalPOD2FOUPVacuumSuckingAlarm"		diSignalsplay="POD2 FOUP vacuum sucking alarm"			diSignal="DI_POD2FOUPVacuumSuckingAlarm"		alarmTrigValue="true"/>
-
+	
 		<IoAlarmSignal id="AlarmSignalSL05001LAdoorsw1" diSignalsplay="safe module:SL05001 LA door sw1" diSignal="DI_SL05001LAdoorsw1" alarmTrigValue="false" />
 
 	</IoAlarmSignals>

Furnace/FurnaceRT/Config/System.sccfg

@@ -52,6 +52,7 @@
 		<config default="false" name="IsAutoFillCarrierId" description="Load Is Auto Fill CarrierId" max="0" min="0" paramter="" tag="" unit="" type="Bool"   visible="false" />
 		<config default="process;sub;alarm;abort;idle;reset" name="CompareRecipeType" description="Compare Recipe Type" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
 		<configs name="ShutDown">
+			<config default="false" name="EnableRobotControl"  description="EnableRobotControl" max="0" min="0" paramter="" tag="" unit="" type="Bool" />
 			<config default="Cancel" name="ShutDown" description="ShutDown" max="0" min="0" paramter="ShutDown;Cancel" tag="ReadOnlySelection" unit="" type="String" />
 		</configs>
 		<configs name="Scheduler" visible="false">

Furnace/FurnaceUI/Views/Operations/Maintenances/N2PurgeStatusView.xaml

@@ -67,7 +67,6 @@
                 <ColumnDefinition Width="500"/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition Height="40"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <Border
@@ -1689,7 +1688,7 @@
                                 <TextBox
                                     Grid.Row="2"
                                     Grid.Column="0"   IsReadOnly="True"
-                                    Grid.ColumnSpan="1"     Text="{Binding ConcentrationO2Value, StringFormat={}{0:f2}}" />
+                                    Grid.ColumnSpan="1"     Text="{Binding ConcentrationO2Value, StringFormat={}{0:f3}}" />
                                 <TextBlock
                                     Grid.Row="2"
                                     Grid.Column="1"
@@ -1699,7 +1698,7 @@
                                 <TextBox
                                     Grid.Row="2"
                                     Grid.Column="2"   IsReadOnly="True"
-                                    Grid.ColumnSpan="1"   Text="{Binding N2PurgeLimitData,UpdateSourceTrigger=PropertyChanged}"/>
+                                    Grid.ColumnSpan="1"   Text="{Binding N2PurgeLimitData,StringFormat={}{0:f3},UpdateSourceTrigger=PropertyChanged}"/>
                                 <!--<UniformGrid
                                     Grid.Row="3"
                                     Grid.ColumnSpan="3"
@@ -2809,51 +2808,7 @@
                 Grid.ColumnSpan="2"
                 Margin="5"
                 CornerRadius="4">
-                <StackPanel
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Orientation="Horizontal">
-                    <RadioButton
-                        Width="130"
-                        Margin="5,0,5,0"
-                        Content="OutLine"
-                        GroupName="ModuleSelect">
-                        <i:Interaction.Triggers>
-                            <i:EventTrigger EventName="Click">
-                                <cal:ActionMessage MethodName="SwitchDetail">
-                                    <cal:Parameter Value="OutLine"/>
-                                </cal:ActionMessage>
-                            </i:EventTrigger>
-                        </i:Interaction.Triggers>
-                    </RadioButton>
-                    <RadioButton
-                        Width="130"
-                        Margin="5,0,5,0"
-                        Content="PMC Detail"
-                        GroupName="ModuleSelect">
-                        <i:Interaction.Triggers>
-                            <i:EventTrigger EventName="Click">
-                                <cal:ActionMessage MethodName="SwitchDetail">
-                                    <cal:Parameter Value="PMCDetail"/>
-                                </cal:ActionMessage>
-                            </i:EventTrigger>
-                        </i:Interaction.Triggers>
-                    </RadioButton>
-                    <RadioButton
-                        Width="130"
-                        Margin="5,0,5,0"
-                        Content="RoBo Detail"
-                        GroupName="ModuleSelect">
-                        <i:Interaction.Triggers>
-                            <i:EventTrigger EventName="Click">
-                                <cal:ActionMessage MethodName="SwitchDetail">
-                                    <cal:Parameter Value="RoBoDetail"/>
-                                </cal:ActionMessage>
-                            </i:EventTrigger>
-                        </i:Interaction.Triggers>
-                    </RadioButton>
-
-                </StackPanel>
+           
             </Border>
 
         </Grid>

Furnace/FurnaceUI/Views/Operations/StatusView.xaml

@@ -2319,7 +2319,7 @@
                                         <TextBlock
                                             Width="100"
                                             Margin="2"
-                                            Text="{Binding N2PurgeLimitData,UpdateSourceTrigger=PropertyChanged}"
+                                            Text="{Binding N2PurgeLimitData,StringFormat={}{0:f3},UpdateSourceTrigger=PropertyChanged}"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             IsEnabled="False"/>