diff --git a/Aucma.Scada.UI/MainWindow.xaml b/Aucma.Scada.UI/MainWindow.xaml index 82e2df91..d43a26f1 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 72d6523a..e558766b 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"> + + - - + + - - - - - + + + + + + + + + + +