From 32dfe7e24849729ff9d1a7a8e3e2eba3410701b6 Mon Sep 17 00:00:00 2001 From: wenjy Date: Thu, 21 Sep 2023 17:39:48 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=BB=84=E8=A3=85=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=95=8C=E9=9D=A2=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/HighWayIot/v16/.suo | Bin 247296 -> 357888 bytes Aucma.Scada.UI/Aucma.Scada.UI.csproj | 16 +- Aucma.Scada.UI/IndexControl.xaml | 12 -- Aucma.Scada.UI/IndexControl.xaml.cs | 28 --- .../AssemblyPlan/AssemblyPlanControl.xaml | 159 +++++++++++++++++- .../AssemblyPlan/AssemblyPlanControl.xaml.cs | 7 +- .../InStoreInfo/InStoreInfoControl.xaml.cs | 1 + .../InventoryInfoControl.xaml.cs | 1 + .../Page/InventoryInfo/LinerInventory.xaml.cs | 1 + .../Page/InventoryInfo/ShellInventory.xaml.cs | 1 + Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe | Bin 92672 -> 98816 bytes Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb | Bin 204288 -> 204288 bytes .../bin/Debug/Log/2023-09-21/LogInfo.txt | 60 +++++++ ...ma.Scada.UI.csproj.AssemblyReference.cache | Bin 34198 -> 11 bytes ...ma.Scada.UI.csproj.CoreCompileInputs.cache | 2 +- ...Aucma.Scada.UI.csproj.FileListAbsolute.txt | 2 - Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe | Bin 92672 -> 98816 bytes .../obj/Debug/Aucma.Scada.UI.g.resources | Bin 61277 -> 66075 bytes Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb | Bin 204288 -> 204288 bytes .../Debug/Aucma.Scada.UI_MarkupCompile.cache | 6 +- .../Aucma.Scada.UI_MarkupCompile.i.cache | 6 +- .../Debug/Aucma.Scada.UI_MarkupCompile.i.lref | 18 +- .../Debug/Aucma.Scada.UI_MarkupCompile.lref | 1 - Aucma.Scada.UI/obj/Debug/IndexControl.baml | Bin 968 -> 0 bytes Aucma.Scada.UI/obj/Debug/IndexControl.g.cs | 75 --------- Aucma.Scada.UI/obj/Debug/MainWindow.baml | Bin 7029 -> 7029 bytes Aucma.Scada.UI/obj/Debug/MainWindow.g.cs | 2 +- Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs | 2 +- .../AssemblyPlan/AssemblyPlanControl.baml | Bin 1036 -> 6854 bytes .../AssemblyPlan/AssemblyPlanControl.g.cs | 3 +- .../AssemblyPlan/AssemblyPlanControl.g.i.cs | 3 +- .../AssemblyPlan/AssemblyPlanViewModel.cs | 74 ++++++++ .../{ => InStoreInfo}/InStoreInfoViewModel.cs | 2 +- .../InventoryInfoViewModel.cs | 2 +- .../LinerInventoryViewModel.cs | 2 +- .../ShellInventoryViewModel.cs | 2 +- ...yIot.Common.csproj.AssemblyReference.cache | Bin 579 -> 1831 bytes ...WayIot.Mqtt.csproj.AssemblyReference.cache | Bin 1857 -> 3306 bytes ...hWayIot.Plc.csproj.AssemblyReference.cache | Bin 4044 -> 6758 bytes ....Repository.csproj.AssemblyReference.cache | Bin 4635 -> 13122 bytes ...WayIot.Rfid.csproj.AssemblyReference.cache | Bin 1408 -> 1408 bytes ...TouchSocket.csproj.AssemblyReference.cache | Bin 1160 -> 2603 bytes .../HighWayIot.csproj.AssemblyReference.cache | Bin 1725 -> 4795 bytes 43 files changed, 325 insertions(+), 163 deletions(-) delete mode 100644 Aucma.Scada.UI/IndexControl.xaml delete mode 100644 Aucma.Scada.UI/IndexControl.xaml.cs delete mode 100644 Aucma.Scada.UI/obj/Debug/IndexControl.baml delete mode 100644 Aucma.Scada.UI/obj/Debug/IndexControl.g.cs create mode 100644 Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs rename Aucma.Scada.UI/viewModel/{ => InStoreInfo}/InStoreInfoViewModel.cs (99%) rename Aucma.Scada.UI/viewModel/{ => InventoryInfo}/InventoryInfoViewModel.cs (97%) rename Aucma.Scada.UI/viewModel/{ => InventoryInfo}/LinerInventoryViewModel.cs (96%) rename Aucma.Scada.UI/viewModel/{ => InventoryInfo}/ShellInventoryViewModel.cs (98%) diff --git a/.vs/HighWayIot/v16/.suo b/.vs/HighWayIot/v16/.suo index 43c973b28899eac8a566282e59d3bad0761ae1ae..dd9e0f9853e4c1c3ead23dd81310b24b34f6ce9b 100644 GIT binary patch delta 40877 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 IE-RG(4-uq!&Hw-a delta 9013 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 S1R*)>{boW_70xm=(f - - IndexControl.xaml - AssemblyPlanControl.xaml @@ -126,17 +123,14 @@ RecordControl.xaml - - - + + + + - - - MSBuild:Compile - Designer - + Designer MSBuild:Compile diff --git a/Aucma.Scada.UI/IndexControl.xaml b/Aucma.Scada.UI/IndexControl.xaml deleted file mode 100644 index bd72429..0000000 --- a/Aucma.Scada.UI/IndexControl.xaml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/Aucma.Scada.UI/IndexControl.xaml.cs b/Aucma.Scada.UI/IndexControl.xaml.cs deleted file mode 100644 index 8984935..0000000 --- a/Aucma.Scada.UI/IndexControl.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Aucma.Scada.UI -{ - /// - /// IndexControl.xaml 的交互逻辑 - /// - public partial class IndexControl : UserControl - { - public IndexControl() - { - InitializeComponent(); - } - } -} diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml index e21c25d..46bda63 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml +++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml @@ -4,9 +4,162 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan" + xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" mc:Ignorable="d" - d:DesignHeight="450" d:DesignWidth="800"> - + d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +