From aef0f871684dcadcd19fcc23eda8fd628d16b510 Mon Sep 17 00:00:00 2001 From: hj615 Date: Tue, 2 Dec 2025 17:10:12 +0900 Subject: [PATCH] =?UTF-8?q?design:=20=EC=98=A8=EC=8B=A4=EA=B0=80=EC=8A=A4?= =?UTF-8?q?=20=ED=99=94=EB=A9=B4=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SmartAquaViewer/View/EnegyView.xaml | 138 +-- SmartAquaViewer/View/GreenHouseView.xaml | 900 ++++++++++-------- .../ViewModel/GreenHouseGasViewModel.cs | 51 + 3 files changed, 632 insertions(+), 457 deletions(-) diff --git a/SmartAquaViewer/View/EnegyView.xaml b/SmartAquaViewer/View/EnegyView.xaml index 819e21b..446828e 100644 --- a/SmartAquaViewer/View/EnegyView.xaml +++ b/SmartAquaViewer/View/EnegyView.xaml @@ -28,61 +28,86 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -400,7 +425,7 @@ helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}" helper:MultiSelectBehavior.KeyPath="Key" helper:MultiSelectBehavior.ValuePath="Value" - FontSize="16" FontWeight="Bold" + FontSize="14" FontWeight="Bold" FontFamily="{StaticResource SCDream5}" Style="{StaticResource MaterialDesignFilterChipListBox}" ItemContainerStyle="{StaticResource ListBoxItemStyle}"> @@ -443,7 +468,6 @@ - @@ -515,7 +539,7 @@ Background="#152935" BorderBrush="#325C80" BorderThickness="1"> diff --git a/SmartAquaViewer/View/GreenHouseView.xaml b/SmartAquaViewer/View/GreenHouseView.xaml index e2f76cc..a0c28e3 100644 --- a/SmartAquaViewer/View/GreenHouseView.xaml +++ b/SmartAquaViewer/View/GreenHouseView.xaml @@ -18,432 +18,532 @@ - - + + - - + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - -