Browse Source

fix 美化

jiangjy 2 weeks ago
parent
commit
cbae2085c6

BIN
Furnace/FurnaceRT/Config/VIDs/Equipment_VIDs_20250618.xlsx


+ 78 - 13
Furnace/FurnaceUI/Views/Operations/Maintenances/N2PurgeStatusView.xaml

@@ -17,6 +17,7 @@
     xmlns:unitControls="clr-namespace:MECF.Framework.UI.Client.Ctrlib.UnitControls;assembly=MECF.Framework.UI.Client"
     d:DesignHeight="900"
     d:DesignWidth="1280"
+    Background="{DynamicResource N2_purge_bg}"
     mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -58,7 +59,8 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <Border Margin="5" CornerRadius="6">
+    <Border  
+  Grid.Column="0" CornerRadius="6">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1*"/>
@@ -68,12 +70,13 @@
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <Border
+                BorderThickness="1,0,0,0"
+                BorderBrush="DimGray"
                 Grid.Row="1"
                 Grid.Column="1"
-                Margin="5"
-                Background="AliceBlue"
-                CornerRadius="4">
-                <Viewbox Width="700" Margin="-210,-190,10,45">
+                Margin="3"
+             >
+                <Viewbox Width="700" Margin="-210,-220,10,45">
                     <Canvas Width="600" Height="600">
 
 
@@ -1554,8 +1557,70 @@
                     </Canvas>
                 </Viewbox>
             </Border>
-
-            <Border
+            <Grid Grid.Row="1" Margin="20,-20,0,0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="60"/>
+                    <RowDefinition Height="60"/>
+                    <RowDefinition Height="60"/>
+                    <RowDefinition Height="60"/>
+                    <RowDefinition Height="60"/>
+                    <RowDefinition Height="60"/>
+                    <RowDefinition Height="60"/>
+                    <RowDefinition Height="60"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="250"/>
+                    <ColumnDefinition  Width="250"/>
+                    <ColumnDefinition  Width="250"/>
+                </Grid.ColumnDefinitions>
+           
+                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,1,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="1" Grid.Column="0" Padding="5,1,0,1">
+                    <TextBlock Text="Mode Sequence Change:" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" />
+                </Border>
+        
+                <Border  BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,1,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="1" Grid.Column ="1" Grid.ColumnSpan="2"  Padding="5,1">
+                    <StackPanel   Orientation="Horizontal" HorizontalAlignment="Center" >
+                        <Button Content="Select" Width="180" Height="45" Margin="10,0,10,0"  IsEnabled="{Binding IsPermission}">
+                            <i:Interaction.Triggers>
+                                <i:EventTrigger EventName="Click">
+                                    <cal:ActionMessage MethodName="SequenceSelect">
+                                    </cal:ActionMessage>
+                                </i:EventTrigger>
+                            </i:Interaction.Triggers>
+                        </Button>
+                    
+                    </StackPanel>
+                </Border>
+
+                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="2" Grid.Column="0" Padding="5,1,0,1">
+                    <TextBlock Text="N2 Purge Status:" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" />
+                </Border>
+
+                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="2" Grid.ColumnSpan="2" Grid.Column="1" Padding="5,1,0,1">
+                    <TextBlock  Text="{Binding N2PurgeMode, Mode=OneWay}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </Border>
+
+
+                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="3" Grid.Column="0" Padding="5,1,0,1">
+                    <TextBlock Text="O2 CheckLocation:" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" />
+                </Border>
+                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.ColumnSpan="2" Grid.Column="1" Padding="5,1,0,1">
+                    <TextBlock   Text="{Binding CheckO2Location,UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </Border>
+
+
+                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="4" Grid.Column="0" Padding="5,1,0,1">
+                    <TextBlock Text="O2 Density:" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" />
+                </Border>
+                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4" Grid.Column="1" Padding="5,1,0,1">
+                    <TextBlock   Text="{Binding N2PurgeLimitData,StringFormat={}{0:f3},UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </Border>
+                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4"  Grid.Column="2" Padding="5,1,0,1">
+                    <TextBlock   Text="{Binding N2PurgeLimitData,StringFormat={}{0:f3},UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </Border>
+            </Grid>
+          
+            <!--<Border
                 Grid.Row="1"
                 Grid.Column="0"
                 Margin="0"
@@ -1579,8 +1644,9 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            
-                            <Grid Grid.ColumnSpan="2"  >
+
+
+                            <Grid      >
                                 <Grid.RowDefinitions>
                                     <RowDefinition></RowDefinition>
                                     <RowDefinition></RowDefinition>
@@ -1642,7 +1708,6 @@
 
                             <Grid
                                     Grid.Row="1"
-                                Grid.Column="1"
                                 Width="210"
                                 Height="210"
                                 HorizontalAlignment="Center">
@@ -1684,7 +1749,7 @@
                                     Grid.Row="2"
                                     Grid.Column="2"   IsReadOnly="True"
                                     Grid.ColumnSpan="1"   Text="{Binding N2PurgeLimitData,StringFormat={}{0:f3},UpdateSourceTrigger=PropertyChanged}"/>
-                                <!--<UniformGrid
+                                --><!--<UniformGrid
                                     Grid.Row="3"
                                     Grid.ColumnSpan="3"
                                     Rows="1">
@@ -1712,13 +1777,13 @@
                                 <TextBox
                                     Grid.Row="6"
                                     Grid.Column="2"
-                                    Grid.ColumnSpan="1"/>-->
+                                    Grid.ColumnSpan="1"/>--><!--
                             </Grid>
                         </Grid>
                     </Border>
 
                 </Grid>
-            </Border>
+            </Border>-->
 
 
         </Grid>