From f08871fe7d148d667f2f11f80f64de71a0d9504c Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 15 六月 2026 18:19:37 +0800
Subject: [PATCH] 优化标准老化界面
---
Plugin.DataBoard/DataBoard.xaml | 92 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 78 insertions(+), 14 deletions(-)
diff --git a/Plugin.DataBoard/DataBoard.xaml b/Plugin.DataBoard/DataBoard.xaml
index 81d6c11..3dcec31 100644
--- a/Plugin.DataBoard/DataBoard.xaml
+++ b/Plugin.DataBoard/DataBoard.xaml
@@ -11,11 +11,15 @@
xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
xmlns:wv2="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
mc:Ignorable="d"
+ xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"
Loaded="PluginControl_Loaded"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
- <Style TargetType="ComboBox" BasedOn="{StaticResource FormComboxStyle}">
+ <Style x:Key="cbDate" TargetType="ComboBox" BasedOn="{StaticResource FormComboxStyle}">
<EventSetter Event="SelectionChanged" Handler="ComboBox_SelectionChanged"/>
+ <Setter Property="pu:ComboBoxHelper.ClearButtonVisibility" Value="Collapsed"/>
+ <Setter Property="SelectedValuePath" Value="Value"/>
+ <Setter Property="DisplayMemberPath" Value="Name"/>
</Style>
<Style TargetType="pu:DateTimePicker" BasedOn="{StaticResource TimePicker}">
<Setter Property="MinWidth" Value="0"/>
@@ -28,6 +32,7 @@
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
+ <RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
@@ -37,17 +42,32 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
- <ComboBox x:Name="cb0" ItemsSource="{Binding Options}" SelectedValuePath="Value" DisplayMemberPath="Name"/>
+ <pu:FormGroup Header="鍨嬪彿">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition/>
+ <ColumnDefinition Width="Auto"/>
+ </Grid.ColumnDefinitions>
+ <ComboBox x:Name="modelSelect" Style="{StaticResource FormComboxStyle}"
+ pu:ComboBoxHelper.ClearButtonVisibility="Visible" SelectionChanged="modelSelect_SelectionChanged"/>
+ <Button x:Name="btnAll" Grid.Column="1" Click="Button_Click"
+ Style="{StaticResource RfhBtn}" Content="鍏ㄩ儴鍒锋柊"/>
+ </Grid>
+ </pu:FormGroup>
- <ComboBox x:Name="cb1" Grid.Column="1" ItemsSource="{Binding Options}"
- SelectedValuePath="Value" DisplayMemberPath="Name"/>
- <ComboBox x:Name="cb2" Grid.Column="2" ItemsSource="{Binding Options}"
- SelectedValuePath="Value" DisplayMemberPath="Name"/>
+ <ComboBox Grid.Row="1" Grid.Column="0" x:Name="cb0" ItemsSource="{Binding Options}"
+ Style="{StaticResource cbDate}"/>
- <ComboBox x:Name="cb3" Grid.Column="3" ItemsSource="{Binding Options}"
- SelectedValuePath="Value" DisplayMemberPath="Name"/>
+ <ComboBox Grid.Row="1" Grid.Column="1" x:Name="cb1" ItemsSource="{Binding Options}"
+ Style="{StaticResource cbDate}"/>
- <Grid Grid.Row="1" Grid.Column="0">
+ <ComboBox Grid.Row="1" Grid.Column="2" x:Name="cb2" ItemsSource="{Binding Options}"
+ Style="{StaticResource cbDate}"/>
+
+ <ComboBox Grid.Row="1" Grid.Column="3" x:Name="cb3" ItemsSource="{Binding Options}"
+ Style="{StaticResource cbDate}"/>
+
+ <Grid Grid.Row="2" Grid.Column="0">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
@@ -63,7 +83,7 @@
Content="{DynamicResource bd.btn}"/>
</Grid>
- <Grid Grid.Row="1" Grid.Column="1">
+ <Grid Grid.Row="2" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
@@ -79,7 +99,7 @@
Content="{DynamicResource bd.btn}"/>
</Grid>
- <Grid Grid.Row="1" Grid.Column="2">
+ <Grid Grid.Row="2" Grid.Column="2">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
@@ -95,7 +115,7 @@
Content="{DynamicResource bd.btn}"/>
</Grid>
- <Grid Grid.Row="1" Grid.Column="3">
+ <Grid Grid.Row="2" Grid.Column="3">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
@@ -111,10 +131,54 @@
Content="{DynamicResource bd.btn}"/>
</Grid>
- <wv2:WebView2 Grid.Row="2" Grid.ColumnSpan="4" Name = "webview2"
+ <lvc:CartesianChart Grid.Row="3" Background="#FFF" BorderThickness="1" BorderBrush="{DynamicResource CommonBoarder}"
+ Title="{Binding Chart0Title}"
+ TooltipTextPaint="{Binding TooltipTextPaint}"
+ Padding="0"
+ Margin="2"
+ Series="{Binding Chart0_series}"
+ XAxes="{Binding Chart0_xAxes}"
+ YAxes="{Binding Chart0_yAxes}"
+ x:Name="chart0">
+ </lvc:CartesianChart>
+
+ <lvc:PieChart Grid.Row="3" Grid.Column="1" Background="#FFF" BorderThickness="1" BorderBrush="{DynamicResource CommonBoarder}"
+ Title="{Binding Chart1Title}"
+ TooltipTextPaint="{Binding TooltipTextPaint}"
+ Padding="0"
+ Margin="2"
+ Series="{Binding Chart1_series}"
+ LegendPosition="Top"
+ x:Name="chart1">
+ </lvc:PieChart>
+
+ <lvc:CartesianChart Grid.Row="3" Grid.Column="2" Background="#FFF" BorderThickness="1" BorderBrush="{DynamicResource CommonBoarder}"
+ Title="{Binding Chart2Title}"
+ TooltipTextPaint="{Binding TooltipTextPaint}"
+ Padding="0"
+ Margin="2"
+ Series="{Binding Chart2_series}"
+ XAxes="{Binding Chart2_xAxes}"
+ YAxes="{Binding Chart2_yAxes}"
+ LegendPosition="Top"
+ x:Name="chart2">
+ </lvc:CartesianChart>
+
+ <lvc:CartesianChart Grid.Row="3" Grid.Column="3" Background="#FFF" BorderThickness="1" BorderBrush="{DynamicResource CommonBoarder}"
+Title="{Binding Chart3Title}"
+TooltipTextPaint="{Binding TooltipTextPaint}"
+Padding="0"
+Margin="2"
+Series="{Binding Chart3_series}"
+XAxes="{Binding Chart3_xAxes}"
+YAxes="{Binding Chart3_yAxes}"
+x:Name="chart3">
+ </lvc:CartesianChart>
+
+ <!--<wv2:WebView2 Grid.Row="3" Grid.ColumnSpan="4" Name="webview2"
SizeChanged="webview2_SizeChanged"
NavigationCompleted="Webview2_NavigationCompleted"
- Loaded="webview2_Loaded"/>
+ Loaded="webview2_Loaded"/>-->
</Grid>
</Border>
</hb:PluginControl>
--
Gitblit v1.9.1