|
@@ -68,7 +68,7 @@
|
|
|
</Border>
|
|
</Border>
|
|
|
|
|
|
|
|
<!-- ═══ 主内容区:左侧 2D 图 + 泵控制条 | 右侧数据栏 ═══ -->
|
|
<!-- ═══ 主内容区:左侧 2D 图 + 泵控制条 | 右侧数据栏 ═══ -->
|
|
|
- <Grid Grid.Row="1" ColumnDefinitions="*,300" Margin="14,12">
|
|
|
|
|
|
|
+ <Grid x:Name="MainGrid" Grid.Row="1" ColumnDefinitions="*,300" Margin="14,12">
|
|
|
|
|
|
|
|
<!-- 左列:2D 工艺图(占满)+ 底部泵控制条(一屏无滚动) -->
|
|
<!-- 左列:2D 工艺图(占满)+ 底部泵控制条(一屏无滚动) -->
|
|
|
<Grid Grid.Column="0" RowDefinitions="*,Auto" Margin="0,0,10,0">
|
|
<Grid Grid.Column="0" RowDefinitions="*,Auto" Margin="0,0,10,0">
|
|
@@ -382,10 +382,11 @@
|
|
|
</Grid>
|
|
</Grid>
|
|
|
|
|
|
|
|
<!-- 右侧数据栏:液位阈值 → 仪表 → 累计 → 故障 -->
|
|
<!-- 右侧数据栏:液位阈值 → 仪表 → 累计 → 故障 -->
|
|
|
- <Grid Grid.Column="1" RowDefinitions="Auto,Auto,Auto,*">
|
|
|
|
|
|
|
+ <Grid x:Name="RightPanel" Grid.Column="1" RowDefinitions="Auto,Auto,Auto,*">
|
|
|
|
|
|
|
|
<!-- 液位阈值(紧凑列表,大水箱图取消——2D 图已含水池可视化) -->
|
|
<!-- 液位阈值(紧凑列表,大水箱图取消——2D 图已含水池可视化) -->
|
|
|
- <Border Grid.Row="0" Classes="surface-card" Background="{DynamicResource SurfaceBgBrush}" Padding="14,12" Margin="0,0,0,8">
|
|
|
|
|
|
|
+ <Border Grid.Row="0" Classes="surface-card" Background="{DynamicResource SurfaceBgBrush}" Padding="14,12" Margin="0,0,0,8"
|
|
|
|
|
+ IsVisible="{Binding !IsTanksSectionHidden}">
|
|
|
<StackPanel>
|
|
<StackPanel>
|
|
|
<StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">
|
|
<StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">
|
|
|
<Border Background="{DynamicResource InfoBrush}" Width="3" Height="14" CornerRadius="1"/>
|
|
<Border Background="{DynamicResource InfoBrush}" Width="3" Height="14" CornerRadius="1"/>
|
|
@@ -462,7 +463,8 @@
|
|
|
</Border>
|
|
</Border>
|
|
|
|
|
|
|
|
<!-- 仪表 -->
|
|
<!-- 仪表 -->
|
|
|
- <Border Grid.Row="1" Classes="surface-card" Background="{DynamicResource SurfaceBgBrush}" Padding="14,12" Margin="0,0,0,8">
|
|
|
|
|
|
|
+ <Border Grid.Row="1" Classes="surface-card" Background="{DynamicResource SurfaceBgBrush}" Padding="14,12" Margin="0,0,0,8"
|
|
|
|
|
+ IsVisible="{Binding !IsGaugesSectionHidden}">
|
|
|
<StackPanel>
|
|
<StackPanel>
|
|
|
<StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">
|
|
<StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">
|
|
|
<Border Background="{DynamicResource WarningBrush}" Width="3" Height="14" CornerRadius="1"/>
|
|
<Border Background="{DynamicResource WarningBrush}" Width="3" Height="14" CornerRadius="1"/>
|
|
@@ -516,7 +518,8 @@
|
|
|
</Border>
|
|
</Border>
|
|
|
|
|
|
|
|
<!-- 累计数据 -->
|
|
<!-- 累计数据 -->
|
|
|
- <Border Grid.Row="2" Classes="surface-card" Background="{DynamicResource SurfaceBgBrush}" Padding="14,12" Margin="0,0,0,8">
|
|
|
|
|
|
|
+ <Border Grid.Row="2" Classes="surface-card" Background="{DynamicResource SurfaceBgBrush}" Padding="14,12" Margin="0,0,0,8"
|
|
|
|
|
+ IsVisible="{Binding !IsSensorsSectionHidden}">
|
|
|
<StackPanel>
|
|
<StackPanel>
|
|
|
<StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">
|
|
<StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">
|
|
|
<Border Background="{DynamicResource InfoBrush}" Width="3" Height="14" CornerRadius="1"/>
|
|
<Border Background="{DynamicResource InfoBrush}" Width="3" Height="14" CornerRadius="1"/>
|
|
@@ -537,9 +540,9 @@
|
|
|
</StackPanel>
|
|
</StackPanel>
|
|
|
</Border>
|
|
</Border>
|
|
|
|
|
|
|
|
- <!-- 故障状态(无内容时隐藏:无泵/无数字量/无报警) -->
|
|
|
|
|
|
|
+ <!-- 故障状态(无内容时隐藏:无泵/无数字量/无报警,或被配置隐藏) -->
|
|
|
<Border Grid.Row="3" Classes="surface-card" Background="{DynamicResource SurfaceBgBrush}" Padding="14,12"
|
|
<Border Grid.Row="3" Classes="surface-card" Background="{DynamicResource SurfaceBgBrush}" Padding="14,12"
|
|
|
- IsVisible="{Binding HasFaultContent}">
|
|
|
|
|
|
|
+ IsVisible="{Binding ShowFaultSection}">
|
|
|
<ScrollViewer>
|
|
<ScrollViewer>
|
|
|
<StackPanel>
|
|
<StackPanel>
|
|
|
<StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">
|
|
<StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">
|