From fb57f0c3f5db5c4a48a2c45a60be880f20db3742 Mon Sep 17 00:00:00 2001 From: wenjy Date: Thu, 9 Nov 2023 16:26:54 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=AE=A1=E5=88=92=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BE=BF=E6=8D=B7=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aucma.Scada.UI/MainWindow.xaml | 4 +- .../Page/AssemblyPlan/PlanInfoEditWindow.xaml | 97 +- .../AssemblyPlan/PlanInfoEditWindow.xaml.cs | 2 + Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe | Bin 208896 -> 211968 bytes Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb | Bin 323072 -> 327168 bytes .../bin/Debug/Log/2023-11-09/LogError.html | 1935 ++ .../bin/Debug/Log/2023-11-09/LogInfo.txt | 17648 ++++++++++++++++ .../bin/Debug/Log/2023-11-09/PlcLog.txt | 656 + .../bin/Debug/Log/2023-11-09/SqlLog.txt | 1516 ++ .../AssemblyPlan/PlanInfoEditViewModel.cs | 58 +- 10 files changed, 21884 insertions(+), 32 deletions(-) diff --git a/Aucma.Scada.UI/MainWindow.xaml b/Aucma.Scada.UI/MainWindow.xaml index 82e2df9..d43a26f 100644 --- a/Aucma.Scada.UI/MainWindow.xaml +++ b/Aucma.Scada.UI/MainWindow.xaml @@ -6,11 +6,11 @@ xmlns:local="clr-namespace:Aucma.Scada.UI" mc:Ignorable="d" Title="SCADA" Height="1080" Width="1920" Icon="Icon.png" - WindowState="Maximized" ResizeMode="NoResize" Topmost="False"> + WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize" Topmost="True"> - + diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml index 72d6523..e558766 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml +++ b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml @@ -4,48 +4,86 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan" + xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan" mc:Ignorable="d" - Title="MES生产计划" Height="450" Width="800" Name="window"> - + Title="MES生产计划" Height="650" Width="900" Name="window" Background="White" + ResizeMode="NoResize" Topmost="True"> + + - - + + - - - - - + + + + + + + + + + +