sc/SunlightCentralizedControlManagement
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

显示逻辑修改

Browse Source
This commit is contained in:
sc committed 2025-04-23 22:04:16 +08:00
2 parents 51510fd83a b3d2884ffa
commit bfc15cca8b
3 files changed
+31 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

View/MonitorView.xaml
+7 -7
View File
@@ -103,7 +103,7 @@
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" Background="White" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" Background="White"
GridLinesVisibility="All" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" BorderBrush="{x:Null}" GridLinesVisibility="All" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" BorderBrush="{x:Null}"
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False" CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" > CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" IsHitTestVisible ="False">
<DataGrid.RowStyle > <DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
<Setter Property="Height" Value="30" /> <Setter Property="Height" Value="30" />
@@ -148,16 +148,16 @@
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
<TextBlock Grid.Column="0" x:Name="machin_LOG" TextWrapping="Wrap" FontSize="27" VerticalAlignment="Top" Height="40" Background="#FF2793FF" Foreground="White" FontWeight="Bold"/> <TextBlock Grid.Column="0" x:Name="machin_LOG" TextWrapping="Wrap" FontSize="27" VerticalAlignment="Top" Height="40" Background="#FF2793FF" Foreground="White" FontWeight="Bold"/>
<TextBlock Grid.Column="0" x:Name="log" Text="{Binding Sys_machine}" TextWrapping="Wrap" FontSize="25" Background="White" Margin="0,40,0,0" Grid.ColumnSpan="2"/> <Grid Margin="0,40,0,0" Grid.ColumnSpan="2" Grid.Column="0" >
<Grid Margin="0,40,0,0" Grid.ColumnSpan="2" Grid.Column="0" >
<rdp:RemoteDesktopWpf x:Name="rdp" Visibility="Collapsed" /> <rdp:RemoteDesktopWpf x:Name="rdp" Visibility="Collapsed" />
<ContentControl x:Name="Picture" Background="White"/> <ContentControl x:Name="Picture" Background="White"/>
<TextBlock x:Name="log" Text="{Binding Sys_machine}" TextWrapping="Wrap" FontSize="25" Background="White"/>
</Grid> </Grid>
<GridSplitter Grid.Row="0" Grid.Column="1" Width="5" HorizontalAlignment="Center" Background="#FF00204E"/> <GridSplitter Grid.Row="0" Grid.Column="1" Width="5" HorizontalAlignment="Center" Background="#FF00204E"/>
</Grid> </Grid>
<StackPanel Grid.Row="3" x:Name="mt" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0" Width="700" HorizontalAlignment="Left"> <StackPanel Grid.Row="3" x:Name="mt" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0" Width="700" HorizontalAlignment="Left">
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD"> <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_DyeingMachine"> <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_DyeingMachine" IsEnabled="False" x:Name="DyeingMachine">
<StackPanel Orientation="Horizontal" > <StackPanel Orientation="Horizontal" >
<materialDesign:PackIcon Kind="CoffeeMachine" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/> <materialDesign:PackIcon Kind="CoffeeMachine" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.DyeingMachine}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/> <TextBlock Text="{x:Static lang:Resources.DyeingMachine}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -165,7 +165,7 @@
</ListViewItem> </ListViewItem>
</ListView> </ListView>
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD"> <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_Curve"> <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_Curve" IsEnabled="False" x:Name="Curve">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="ChartBellCurve" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/> <materialDesign:PackIcon Kind="ChartBellCurve" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
<TextBlock Text="{x:Static lang:Resources.Curve}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/> <TextBlock Text="{x:Static lang:Resources.Curve}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -173,7 +173,7 @@
</ListViewItem> </ListViewItem>
</ListView> </ListView>
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD"> <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Screen"> <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Screen" IsEnabled="False" x:Name="Screen">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Monitor" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/> <materialDesign:PackIcon Kind="Monitor" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Screen}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/> <TextBlock Text="{x:Static lang:Resources.Screen}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
@@ -181,7 +181,7 @@
</ListViewItem> </ListViewItem>
</ListView> </ListView>
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD"> <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Receipt"> <ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Receipt" IsEnabled="False" x:Name="Receipt">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="ReceiptText" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/> <materialDesign:PackIcon Kind="ReceiptText" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Receipt}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/> <TextBlock Text="{x:Static lang:Resources.Receipt}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
View/MonitorView.xaml.cs
+19 -8
View File
@@ -43,6 +43,10 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
//DataContext = new MainWindowViewModel(); //DataContext = new MainWindowViewModel();
InitializeComponent(); InitializeComponent();
CountDown(); CountDown();
machine= MainWindowViewModel.machine;
workOrder= MainWindowViewModel.workOrder;
dyelot= MainWindowViewModel.dyelot;
machin_LOG.Text = MainWindowViewModel.machin_LOG;
} }
private string machine; private string machine;
@@ -53,13 +57,17 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
private void Griddata_SelectionChanged(object sender, SelectionChangedEventArgs e)//设备列表 private void Griddata_SelectionChanged(object sender, SelectionChangedEventArgs e)//设备列表
{ {
Stop.IsEnabled = true; Stop.IsEnabled = true;
Paused.IsEnabled = true;
Insert.IsEnabled = false; Insert.IsEnabled = false;
edit.IsEnabled = false; edit.IsEnabled = false;
Paused.IsEnabled = false;
Resume.IsEnabled = false; Resume.IsEnabled = false;
Delete.IsEnabled = false; Delete.IsEnabled = false;
Jump.IsEnabled = false; Jump.IsEnabled = false;
DyeingMachine.IsEnabled = true;
Curve.IsEnabled = true;
Screen.IsEnabled = true;
Receipt.IsEnabled = true;
MainWindowViewModel.TechnologicalProcess_bool = true; MainWindowViewModel.TechnologicalProcess_bool = true;
int rownum = Griddata.SelectedIndex;//获取鼠标选中行并定义变量 int rownum = Griddata.SelectedIndex;//获取鼠标选中行并定义变量
if (rownum != -1)//判断鼠标定位是否有效 if (rownum != -1)//判断鼠标定位是否有效
@@ -68,13 +76,16 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
workOrder = (Griddata.Columns[2].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列， workOrder = (Griddata.Columns[2].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
dyelot = (Griddata.Columns[3].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列， dyelot = (Griddata.Columns[3].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
machin_LOG.Text = Properties.Resources.Machine + ":" + machine + " " + Properties.Resources.WorkOrder + ":" + workOrder; MainWindowViewModel.machine = machine;
MainWindowViewModel.workOrder= workOrder;
MainWindowViewModel.dyelot= dyelot;
MainWindowViewModel.machin_LOG = Properties.Resources.Machine + ":" + machine + " " + Properties.Resources.WorkOrder + ":" + workOrder;
machin_LOG.Text = MainWindowViewModel.machin_LOG;
} }
} }
private void Gridstep_SelectionChanged(object sender, SelectionChangedEventArgs e) private void Gridstep_SelectionChanged(object sender, SelectionChangedEventArgs e)
{ {
Paused.IsEnabled = true;
MainWindowViewModel.TechnologicalProcess_bool = false; MainWindowViewModel.TechnologicalProcess_bool = false;
int rownum = Gridstep.SelectedIndex;//获取鼠标选中行并定义变量 int rownum = Gridstep.SelectedIndex;//获取鼠标选中行并定义变量
if (rownum != -1)//判断鼠标定位是否有效 if (rownum != -1)//判断鼠标定位是否有效
@@ -192,10 +203,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
DAT = "SC821" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_821.ToJsonString() DAT = "SC821" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_821.ToJsonString()
}); });
} }
Gridstep.IsHitTestVisible = false;
Insert.IsEnabled = false; Insert.IsEnabled = false;
edit.IsEnabled = false; edit.IsEnabled = false;
Paused.IsEnabled = false;
Resume.IsEnabled = false; Resume.IsEnabled = false;
Delete.IsEnabled = false; Delete.IsEnabled = false;
Jump.IsEnabled = false; Jump.IsEnabled = false;
@@ -215,7 +225,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
ID = index, ID = index,
DAT = "SC821" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_821.ToJsonString() DAT = "SC821" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + dat_821.ToJsonString()
}); });
} }
Gridstep.IsHitTestVisible = true;
Insert.IsEnabled = true; Insert.IsEnabled = true;
edit.IsEnabled = true; edit.IsEnabled = true;
Paused.IsEnabled = true; Paused.IsEnabled = true;
@@ -369,8 +381,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
{ {
Time_D++; Time_D++;
if (Time_D > 10) if (Time_D > 10)
{ {
Paused.IsEnabled = false;
MainWindowViewModel.TechnologicalProcess_bool = true; MainWindowViewModel.TechnologicalProcess_bool = true;
} }
} }
ViewModel/MainWindowViewModel.cs
+5
View File
@@ -389,6 +389,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
public static bool IO_view; public static bool IO_view;
public static bool ParameterSet_view=true; public static bool ParameterSet_view=true;
public static bool SysSet_view=true; public static bool SysSet_view=true;
public static string machine;
public static string workOrder;
public static string dyelot;
public static string machin_LOG;
private async void DATA_view()//IO显示 private async void DATA_view()//IO显示
{ {
await Task.Run(() => await Task.Run(() =>