liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 老线发泡界面修改

Browse Source
dev
wenjy 1 year ago
parent 269f67a546
commit fb1cf88039
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Common
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Common\
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Common\

2
Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.EventBus
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.EventBus\
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.EventBus\

2
Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Serilog.Es
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Serilog.Es\
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Serilog.Es\

2
Aucma.Core.OldBoxFoam/ViewModels/MainWindowViewModel.cs
Unescape Escape View File

@ -89,7 +89,7 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
info = info.OrderBy(x => x.Id).ToList();
foreach(var item in info)
{
if (item.IsConnect)
if (item.plc.IsConnected)
{
PlcState(true);
}

10
Aucma.Core.OldBoxFoam/Views/MainWindow.xaml
Unescape Escape View File

@ -56,8 +56,8 @@
<ContentControl Content="{Binding UserContent}"/>
</Border>
<DockPanel Grid.Row="2" Margin="5 0 5 3">
<Border BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
<DockPanel Grid.Row="2" Margin="5 0 5 3">
<Border BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
<Grid>
<StackPanel Grid.Row="1" Height="50" Orientation="Horizontal" Margin="5 0" HorizontalAlignment="Left">
<Button Content="发泡线监控" Height="40" x:Name="OldBoxFoamPage" FontSize="18" Margin="2 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=OldBoxFoamPage}" />
@ -69,7 +69,7 @@
<Button Content="最小化" Height="40" x:Name="Minimized" FontSize="18" Margin="2 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Background="#FF9900" BorderBrush="#FF9900" />
<Button Content="退 出" Height="40" x:Name="Exit" Margin="2 0" FontSize="18" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Background="#FF0033" BorderBrush="#FF0033"/>
</StackPanel>
<StackPanel Height="50" Orientation="Horizontal" HorizontalAlignment="Right">
<StackPanel Height="50" Orientation="Horizontal" HorizontalAlignment="Right">
<Border Width="30" Height="30" CornerRadius="15">
<Border.Background>
<ImageBrush x:Name="MesDbStatus" ImageSource="{Binding MesUIIcon}"/>
@ -110,14 +110,14 @@
<ImageBrush ImageSource="{Binding PlcUIIcon[4]}"/>
</Border.Background>
</Border>
<TextBlock Text="1#发泡机PLC" VerticalAlignment="Center" Foreground="{Binding PlcUIColor[4]}" FontSize="18" Margin="10,0"/>
<TextBlock Text="1#发泡机PLC" VerticalAlignment="Center" Foreground="Red" FontSize="18" Margin="10,0"/>
<Border Width="30" Height="30" CornerRadius="15">
<Border.Background>
<ImageBrush ImageSource="{Binding PlcUIIcon[5]}"/>
</Border.Background>
</Border>
<TextBlock Text="2#发泡机PLC" VerticalAlignment="Center" Foreground="{Binding PlcUIColor[5]}" FontSize="18" Margin="10,0"/>
<TextBlock Text="2#发泡机PLC" VerticalAlignment="Center" Foreground="Red" FontSize="18" Margin="10,0"/>
<!--<Border Width="30" Height="30" CornerRadius="15">
<Border.Background>

4
Aucma.Core.OldBoxFoam/Views/SplitPlanView.xaml
Unescape Escape View File

@ -186,8 +186,8 @@
<!--ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible"-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding PlanCode}" Header="计划编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding OrderCode}" Header="工单编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding PlanCode}" Header="MES工单编号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding OrderCode}" Header="SAP计划编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
<DataGridTextColumn Binding="{Binding MaterialName}" Header="产品型号" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>

Write Preview
Loading…
Cancel
Save