添加详细工作信息展示
This commit is contained in:
commit
fac463078b
8 files changed
+329
-178
No files matched your search
@@ -4,14 +4,16 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:DyeingComputer.View"
|
||||
xmlns:lang="clr-namespace:DyeingComputer.Properties"
|
||||
xmlns:lang="clr-namespace:DyeingComputer.Properties"
|
||||
xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel"
|
||||
d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
|
||||
mc:Ignorable="d" Loaded="UserControl_Loaded"
|
||||
KeyDown="UserControl_KeyDown"
|
||||
d:DesignHeight="630" d:DesignWidth="1280">
|
||||
<Grid Focusable="True">
|
||||
<DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True" SelectionChanged="Grid_SelectionChanged"
|
||||
Margin="630,0,0,0" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"
|
||||
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="Black"
|
||||
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="{x:Null}"
|
||||
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"
|
||||
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
|
||||
CanUserAddRows="True" CanUserDeleteRows="False" HeadersVisibility ="Column" SelectedIndex="{Binding Sys_workSTEPID}"
|
||||
@@ -65,7 +67,7 @@
|
||||
<DataGridTextColumn Binding="{Binding DYELOT}" Width="0" MinWidth="0" MaxWidth="0"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<TextBlock x:Name="log" HorizontalAlignment="Left" Margin="0,40,0,0" TextWrapping="Wrap" Width="600" FontSize="20" Background="White"/>
|
||||
<TextBlock x:Name="log" HorizontalAlignment="Left" Margin="0,40,0,0" TextWrapping="Wrap" Width="600" FontSize="25" Background="White" Text="{Binding Sys_log}"/>
|
||||
<TextBlock x:Name="name" HorizontalAlignment="Left" Margin="600,0,0,0" TextWrapping="Wrap" FontSize="24" Background="#FFD0D0D0" Text="NAME" Height="30" Block.TextAlignment="Center">
|
||||
<TextBlock.LayoutTransform>
|
||||
<!--文字同样旋转90度-->
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using DyeingComputer.UserClass;
|
||||
using DyeingComputer.ViewModel;
|
||||
using DyeingComputer.Windows;
|
||||
using ScottPlot;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
@@ -28,7 +29,7 @@ namespace DyeingComputer.View
|
||||
public partial class TechnologicalProcessView : UserControl
|
||||
{
|
||||
public TechnologicalProcessView()
|
||||
{
|
||||
{
|
||||
InitializeComponent();
|
||||
DataContext = new MainWindowViewModel();
|
||||
FocusManager.SetFocusedElement(Grid, Grid);
|
||||
@@ -39,7 +40,7 @@ namespace DyeingComputer.View
|
||||
else
|
||||
{
|
||||
TechnologicalProcess_sql();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static object workName;
|
||||
|
||||
Reference in new issue
Block a user