From 905808d91ce73b8ff5f05e74f93f90048629ea87 Mon Sep 17 00:00:00 2001 From: wenjy Date: Wed, 27 Sep 2023 08:57:01 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20UI=E4=B8=BB=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/HighWayIot/v16/.suo | Bin 404992 -> 441856 bytes Aucma.Scada.UI/Aucma.Scada.UI.csproj | 4 + Aucma.Scada.UI/MainWindow.xaml | 14 +- Aucma.Scada.UI/MainWindow.xaml.cs | 2 + .../AssemblyPlan/AssemblyPlanControl.xaml | 34 +- .../Page/InStoreInfo/InStoreInfoControl.xaml | 38 +- .../Page/InventoryInfo/LinerInventory.xaml | 6 +- .../Page/InventoryInfo/ShellInventory.xaml | 6 +- .../Page/InventoryInfo/SpaceInfoControl.xaml | 4 +- .../Page/TaskInfo/TaskInfoControl.xaml | 4 +- Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe | Bin 107008 -> 105984 bytes Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb | Bin 218624 -> 218624 bytes .../bin/Debug/HighWayIot.Common.dll | Bin 15872 -> 20480 bytes .../bin/Debug/HighWayIot.Common.pdb | Bin 52736 -> 62976 bytes .../bin/Debug/HighWayIot.Config.dll | Bin 0 -> 6144 bytes .../bin/Debug/HighWayIot.Config.pdb | Bin 0 -> 24064 bytes .../bin/Debug/HighWayIot.Log4net.dll | Bin 6656 -> 6656 bytes .../bin/Debug/HighWayIot.Log4net.pdb | Bin 24064 -> 24064 bytes .../bin/Debug/Log/2023-09-22/LogInfo.txt | 28 + .../bin/Debug/Log/2023-09-25/LogError.html | 0 .../bin/Debug/Log/2023-09-25/LogInfo.txt | 33 + .../bin/Debug/Log/2023-09-25/PlcLog.txt | 0 .../bin/Debug/Log/2023-09-25/RfidLog.txt | 0 .../bin/Debug/Log/2023-09-25/SemaphoreLog.txt | 0 .../bin/Debug/Log/2023-09-25/SqlLog.txt | 0 .../bin/Debug/Log/2023-09-25/ViewLog.txt | 0 Aucma.Scada.UI/bin/Debug/config/App.Ini | 3 + ...ma.Scada.UI.csproj.AssemblyReference.cache | Bin 11 -> 29602 bytes ...ma.Scada.UI.csproj.CoreCompileInputs.cache | 2 +- ...Aucma.Scada.UI.csproj.FileListAbsolute.txt | 36 +- ...cma.Scada.UI.csproj.GenerateResource.cache | Bin 954 -> 954 bytes Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe | Bin 107008 -> 105984 bytes .../obj/Debug/Aucma.Scada.UI.g.resources | Bin 71178 -> 71259 bytes Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb | Bin 218624 -> 218624 bytes .../Debug/Aucma.Scada.UI_MarkupCompile.cache | 2 +- .../Aucma.Scada.UI_MarkupCompile.i.cache | 2 +- .../Debug/Aucma.Scada.UI_MarkupCompile.lref | 2 +- ...gnTimeResolveAssemblyReferencesInput.cache | Bin 22235 -> 22337 bytes .../Debug/GeneratedInternalTypeHelper.g.cs | 62 +- Aucma.Scada.UI/obj/Debug/MainWindow.baml | Bin 7029 -> 7041 bytes Aucma.Scada.UI/obj/Debug/MainWindow.g.cs | 2 +- Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs | 2 +- .../AssemblyPlan/AssemblyPlanControl.baml | Bin 8047 -> 8047 bytes .../AssemblyPlan/AssemblyPlanControl.g.cs | 2 +- .../AssemblyPlan/AssemblyPlanControl.g.i.cs | 2 +- .../Page/InStoreInfo/InStoreInfoControl.baml | Bin 7218 -> 7218 bytes .../Page/InStoreInfo/InStoreInfoControl.g.cs | 2 +- .../InStoreInfo/InStoreInfoControl.g.i.cs | 2 +- .../Page/InventoryInfo/LinerInventory.baml | Bin 6899 -> 6922 bytes .../Page/InventoryInfo/LinerInventory.g.cs | 2 +- .../Page/InventoryInfo/LinerInventory.g.i.cs | 2 +- .../Page/InventoryInfo/ShellInventory.baml | Bin 6910 -> 6933 bytes .../Page/InventoryInfo/ShellInventory.g.cs | 2 +- .../Page/InventoryInfo/ShellInventory.g.i.cs | 2 +- .../Page/InventoryInfo/SpaceInfoControl.baml | Bin 4922 -> 4945 bytes .../Page/InventoryInfo/SpaceInfoControl.g.cs | 2 +- .../InventoryInfo/SpaceInfoControl.g.i.cs | 2 +- .../Debug/Page/TaskInfo/TaskInfoControl.baml | Bin 4917 -> 4917 bytes .../Debug/Page/TaskInfo/TaskInfoControl.g.cs | 2 +- .../Page/TaskInfo/TaskInfoControl.g.i.cs | 2 +- HighWayIot.Common/ExpressionExtensions.cs | 152 + HighWayIot.Common/HighWayIot.Common.csproj | 1 + .../bin/Debug/HighWayIot.Common.dll | Bin 15872 -> 20480 bytes .../bin/Debug/HighWayIot.Common.pdb | Bin 52736 -> 62976 bytes .../bin/Debug/HighWayIot.Log4net.dll | Bin 6656 -> 6656 bytes .../bin/Debug/HighWayIot.Log4net.pdb | Bin 24064 -> 24064 bytes ...yIot.Common.csproj.AssemblyReference.cache | Bin 6680 -> 1835 bytes ...yIot.Common.csproj.CoreCompileInputs.cache | 2 +- .../obj/Debug/HighWayIot.Common.dll | Bin 15872 -> 20480 bytes .../obj/Debug/HighWayIot.Common.pdb | Bin 52736 -> 62976 bytes HighWayIot.Config/AppConfig.cs | 19 +- .../bin/Debug/HighWayIot.Common.dll | Bin 0 -> 20480 bytes .../bin/Debug/HighWayIot.Common.pdb | Bin 0 -> 62976 bytes .../bin/Debug/HighWayIot.Config.dll | Bin 0 -> 6144 bytes .../bin/Debug/HighWayIot.Config.pdb | Bin 0 -> 24064 bytes .../bin/Debug/HighWayIot.Log4net.dll | Bin 0 -> 6656 bytes .../bin/Debug/HighWayIot.Log4net.pdb | Bin 0 -> 24064 bytes .../bin/Debug/Newtonsoft.Json.dll | Bin 0 -> 711952 bytes .../bin/Debug/Newtonsoft.Json.xml | 11363 ++++++++++++++++ HighWayIot.Config/bin/Debug/log4net.dll | Bin 0 -> 270336 bytes ...yIot.Config.csproj.AssemblyReference.cache | Bin 0 -> 2421 bytes .../HighWayIot.Config.csproj.CopyComplete | 0 ...yIot.Config.csproj.CoreCompileInputs.cache | 1 + ...hWayIot.Config.csproj.FileListAbsolute.txt | 14 + .../obj/Debug/HighWayIot.Config.dll | Bin 0 -> 6144 bytes .../obj/Debug/HighWayIot.Config.pdb | Bin 0 -> 24064 bytes .../bin/Debug/HighWayIot.Log4net.dll | Bin 6656 -> 6656 bytes .../bin/Debug/HighWayIot.Log4net.pdb | Bin 24064 -> 24064 bytes ...Iot.Log4net.csproj.AssemblyReference.cache | Bin 5120 -> 1093 bytes ...Iot.Log4net.csproj.CoreCompileInputs.cache | 2 +- ...WayIot.Log4net.csproj.FileListAbsolute.txt | 8 + .../obj/Debug/HighWayIot.Log4net.dll | Bin 6656 -> 6656 bytes .../obj/Debug/HighWayIot.Log4net.pdb | Bin 24064 -> 24064 bytes HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll | Bin 11776 -> 11776 bytes HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb | Bin 28160 -> 28160 bytes ...WayIot.Mqtt.csproj.AssemblyReference.cache | Bin 3306 -> 779 bytes ...WayIot.Mqtt.csproj.CoreCompileInputs.cache | 2 +- ...ighWayIot.Mqtt.csproj.FileListAbsolute.txt | 9 + HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll | Bin 11776 -> 11776 bytes HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.pdb | Bin 28160 -> 28160 bytes .../bin/Debug/HighWayIot.Common.dll | Bin 14336 -> 20480 bytes .../bin/Debug/HighWayIot.Common.pdb | Bin 46592 -> 62976 bytes .../bin/Debug/HighWayIot.Log4net.dll | Bin 6656 -> 6656 bytes .../bin/Debug/HighWayIot.Log4net.pdb | Bin 24064 -> 24064 bytes HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll | Bin 18432 -> 18432 bytes HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb | Bin 56832 -> 56832 bytes ...hWayIot.Plc.csproj.AssemblyReference.cache | Bin 6758 -> 3480 bytes ...hWayIot.Plc.csproj.CoreCompileInputs.cache | 2 +- ...HighWayIot.Plc.csproj.FileListAbsolute.txt | 15 + HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll | Bin 18432 -> 18432 bytes HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb | Bin 56832 -> 56832 bytes .../bin/Debug/HighWayIot.Common.dll | Bin 15872 -> 20480 bytes .../bin/Debug/HighWayIot.Common.pdb | Bin 52736 -> 62976 bytes .../bin/Debug/HighWayIot.Log4net.dll | Bin 6656 -> 6656 bytes .../bin/Debug/HighWayIot.Log4net.pdb | Bin 24064 -> 24064 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7776 -> 7851 bytes ....Repository.csproj.AssemblyReference.cache | Bin 17030 -> 1473 bytes ....Repository.csproj.CoreCompileInputs.cache | 2 +- ...Iot.Repository.csproj.FileListAbsolute.txt | 7 +- .../service/Impl/BaseSpaceInfoServiceImpl.cs | 77 + .../bin/Debug/HighWayIot.Common.dll | Bin 14336 -> 20480 bytes .../bin/Debug/HighWayIot.Common.pdb | Bin 46592 -> 62976 bytes .../bin/Debug/HighWayIot.Log4net.dll | Bin 6656 -> 6656 bytes .../bin/Debug/HighWayIot.Log4net.pdb | Bin 24064 -> 24064 bytes HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll | Bin 33792 -> 33792 bytes HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb | Bin 75264 -> 75264 bytes ...WayIot.Rfid.csproj.AssemblyReference.cache | Bin 1408 -> 1982 bytes ...WayIot.Rfid.csproj.CoreCompileInputs.cache | 2 +- ...ighWayIot.Rfid.csproj.FileListAbsolute.txt | 15 + HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll | Bin 33792 -> 33792 bytes HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb | Bin 75264 -> 75264 bytes .../bin/Debug/HighWayIot.TouchSocket.dll | Bin 4096 -> 4096 bytes .../bin/Debug/HighWayIot.TouchSocket.pdb | Bin 15872 -> 15872 bytes ...TouchSocket.csproj.AssemblyReference.cache | Bin 2603 -> 0 bytes ...TouchSocket.csproj.CoreCompileInputs.cache | 2 +- ...ot.TouchSocket.csproj.FileListAbsolute.txt | 6 + .../obj/Debug/HighWayIot.TouchSocket.dll | Bin 4096 -> 4096 bytes .../obj/Debug/HighWayIot.TouchSocket.pdb | Bin 15872 -> 15872 bytes HighWayIot/Program.cs | 3 - HighWayIot/bin/Debug/HighWayIot.Common.dll | Bin 14336 -> 20480 bytes HighWayIot/bin/Debug/HighWayIot.Common.pdb | Bin 46592 -> 62976 bytes HighWayIot/bin/Debug/HighWayIot.Log4net.dll | Bin 6656 -> 6656 bytes HighWayIot/bin/Debug/HighWayIot.Log4net.pdb | Bin 24064 -> 24064 bytes .../bin/Debug/HighWayIot.Repository.dll | Bin 14336 -> 16896 bytes .../bin/Debug/HighWayIot.Repository.pdb | Bin 60928 -> 73216 bytes HighWayIot/bin/Debug/HighWayIot.exe | Bin 5632 -> 5120 bytes HighWayIot/bin/Debug/HighWayIot.pdb | Bin 19968 -> 19968 bytes .../HighWayIot.csproj.AssemblyReference.cache | Bin 4795 -> 1729 bytes .../HighWayIot.csproj.CoreCompileInputs.cache | 2 +- .../HighWayIot.csproj.FileListAbsolute.txt | 21 + HighWayIot/obj/Debug/HighWayIot.exe | Bin 5632 -> 5120 bytes HighWayIot/obj/Debug/HighWayIot.pdb | Bin 19968 -> 19968 bytes 152 files changed, 11871 insertions(+), 166 deletions(-) create mode 100644 Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll create mode 100644 Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb rename HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CopyComplete => Aucma.Scada.UI/bin/Debug/Log/2023-09-25/LogError.html (100%) create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-09-25/LogInfo.txt create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-09-25/PlcLog.txt create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-09-25/RfidLog.txt create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-09-25/SemaphoreLog.txt create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-09-25/SqlLog.txt create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-09-25/ViewLog.txt create mode 100644 Aucma.Scada.UI/bin/Debug/config/App.Ini create mode 100644 HighWayIot.Common/ExpressionExtensions.cs create mode 100644 HighWayIot.Config/bin/Debug/HighWayIot.Common.dll create mode 100644 HighWayIot.Config/bin/Debug/HighWayIot.Common.pdb create mode 100644 HighWayIot.Config/bin/Debug/HighWayIot.Config.dll create mode 100644 HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb create mode 100644 HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll create mode 100644 HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb create mode 100644 HighWayIot.Config/bin/Debug/Newtonsoft.Json.dll create mode 100644 HighWayIot.Config/bin/Debug/Newtonsoft.Json.xml create mode 100644 HighWayIot.Config/bin/Debug/log4net.dll create mode 100644 HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache create mode 100644 HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CopyComplete create mode 100644 HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CoreCompileInputs.cache create mode 100644 HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.FileListAbsolute.txt create mode 100644 HighWayIot.Config/obj/Debug/HighWayIot.Config.dll create mode 100644 HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb create mode 100644 HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs delete mode 100644 HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache diff --git a/.vs/HighWayIot/v16/.suo b/.vs/HighWayIot/v16/.suo index ea6fc7a3ccf6c27c27798ad6b9b6d3a2d5029e9b..a9c29bda244d591ae16821f875bf005e2177eae8 100644 GIT binary patch delta 39301 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%0A+ixqo@El!5 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 F^WU5e=wbi> diff --git a/Aucma.Scada.UI/Aucma.Scada.UI.csproj b/Aucma.Scada.UI/Aucma.Scada.UI.csproj index 4504f455..397e1c43 100644 --- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj +++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj @@ -224,6 +224,10 @@ {89a1edd9-d79e-468d-b6d3-7d07b8843562} HighWayIot.Common + + {75180EE5-13AE-499B-B0F6-C7BFEE1140CC} + HighWayIot.Config + {deabc30c-ec6f-472e-bd67-d65702fdaf74} HighWayIot.Log4net diff --git a/Aucma.Scada.UI/MainWindow.xaml b/Aucma.Scada.UI/MainWindow.xaml index 976c3339..73bf7a9c 100644 --- a/Aucma.Scada.UI/MainWindow.xaml +++ b/Aucma.Scada.UI/MainWindow.xaml @@ -10,7 +10,7 @@ > - + @@ -21,13 +21,13 @@ - + - + - + @@ -168,7 +168,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -230,7 +230,7 @@ - + diff --git a/Aucma.Scada.UI/MainWindow.xaml.cs b/Aucma.Scada.UI/MainWindow.xaml.cs index 9e23f9d0..7a0dbf40 100644 --- a/Aucma.Scada.UI/MainWindow.xaml.cs +++ b/Aucma.Scada.UI/MainWindow.xaml.cs @@ -1,4 +1,5 @@ using Aucma.Scada.UI.viewModel; +using HighWayIot.Config; using System; using System.Collections.Generic; using System.Linq; @@ -26,6 +27,7 @@ namespace Aucma.Scada.UI InitializeComponent(); MainViewModel mainViewModel = new MainViewModel(); this.DataContext = mainViewModel; + } } } diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml index 8541c0a1..f627657d 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml +++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml @@ -36,28 +36,28 @@ - - + + - - + + - - + + - - + + - - + + @@ -131,7 +131,7 @@ RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" - Foreground="White" > + Foreground="Gray" > @@ -143,10 +143,10 @@ -