sc
/
DyeingComputer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

工作列表页面

master
sc 5 months ago
parent
91541e2af8 92d0cd1454
commit
42496d55c5
13 changed files with 125 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      DyeingComputer.csproj
  2. BIN
      Lmage/inf.png
  3. BIN
      Lmage/start.png
  4. BIN
      Lmage/start2.png
  5. BIN
      Lmage/start3.png
  6. 36
      Properties/Resources.Designer.cs
  7. 14
      Properties/Resources.en-US.resx
  8. 12
      Properties/Resources.resx
  9. 12
      Properties/Resources.zh-CN.resx
  10. 16
      Properties/Resources.zh-TW.resx
  11. 41
      View/WorkOrderView.xaml
  12. 5
      View/WorkOrderView.xaml.cs
  13. BIN
      View/start2.png

6
DyeingComputer.csproj
View File

@ -292,6 +292,7 @@
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.zh-CN.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
@ -403,6 +404,11 @@
<Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
<Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
<Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
<Resource Include="Lmage\inf.png" />
<Resource Include="Lmage\start2.png" />
<Resource Include="Lmage\start3.png" />
<Resource Include="View\start2.png" />
<Resource Include="Lmage\start.png" />
<Resource Include="Lmage\2001.png" />
<Resource Include="Lmage\2000.png" />
<Resource Include="Lmage\guandao %2812%29.png" />

BIN
Lmage/inf.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
Lmage/start.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
Lmage/start2.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
Lmage/start3.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

36
Properties/Resources.Designer.cs
View File

@ -105,6 +105,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Amount 的本地化字符串。
/// </summary>
public static string Amount {
get {
return ResourceManager.GetString("Amount", resourceCulture);
}
}
/// <summary>
/// 查找类似 Auto 的本地化字符串。
/// </summary>
@ -447,6 +456,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Grams 的本地化字符串。
/// </summary>
public static string Grams {
get {
return ResourceManager.GetString("Grams", resourceCulture);
}
}
/// <summary>
/// 查找类似 GuidingWheel 的本地化字符串。
/// </summary>
@ -519,6 +537,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 inf 的本地化字符串。
/// </summary>
public static string inf {
get {
return ResourceManager.GetString("inf", resourceCulture);
}
}
/// <summary>
/// 查找类似 I/O 的本地化字符串。
/// </summary>
@ -843,6 +870,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 ProductCode 的本地化字符串。
/// </summary>
public static string ProductCode {
get {
return ResourceManager.GetString("ProductCode", resourceCulture);
}
}
/// <summary>
/// 查找类似 ProgramGroup 的本地化字符串。
/// </summary>

14
Properties/Resources.en-US.resx
View File

@ -505,9 +505,21 @@
<value>Swing</value>
</data>
<data name="CylinderBottom" xml:space="preserve">
<value />
<value>CylinderBottom</value>
</data>
<data name="Jump" xml:space="preserve">
<value>Jump</value>
</data>
<data name="ProductCode" xml:space="preserve">
<value>ProductCode </value>
</data>
<data name="Grams" xml:space="preserve">
<value>Grams </value>
</data>
<data name="Amount" xml:space="preserve">
<value>Amount</value>
</data>
<data name="inf" xml:space="preserve">
<value>Information</value>
</data>
</root>

12
Properties/Resources.resx
View File

@ -510,4 +510,16 @@
<data name="Jump" xml:space="preserve">
<value>Jump</value>
</data>
<data name="ProductCode" xml:space="preserve">
<value>ProductCode</value>
</data>
<data name="Grams" xml:space="preserve">
<value>Grams</value>
</data>
<data name="Amount" xml:space="preserve">
<value>Amount</value>
</data>
<data name="inf" xml:space="preserve">
<value>inf</value>
</data>
</root>

12
Properties/Resources.zh-CN.resx
View File

@ -510,4 +510,16 @@
<data name="Jump" xml:space="preserve">
<value>跳步</value>
</data>
<data name="ProductCode" xml:space="preserve">
<value>原料代码</value>
</data>
<data name="Grams" xml:space="preserve">
<value>目标 g</value>
</data>
<data name="Amount" xml:space="preserve">
<value>实际</value>
</data>
<data name="inf" xml:space="preserve">
<value>信息</value>
</data>
</root>

16
Properties/Resources.zh-TW.resx
View File

@ -505,9 +505,21 @@
<value>擺佈</value>
</data>
<data name="CylinderBottom" xml:space="preserve">
<value />
<value>缸底</value>
</data>
<data name="Jump" xml:space="preserve">
<value />
<value>跳步</value>
</data>
<data name="ProductCode" xml:space="preserve">
<value>原料代碼</value>
</data>
<data name="Grams" xml:space="preserve">
<value>目標g</value>
</data>
<data name="Amount" xml:space="preserve">
<value>實際</value>
</data>
<data name="inf" xml:space="preserve">
<value>信息</value>
</data>
</root>

41
View/WorkOrderView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
xmlns:local="clr-namespace:DyeingComputer.View"
xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"
xmlns:lang="clr-namespace:DyeingComputer.Properties"
xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel"
xmlns:ConvertMoels="clr-namespace:DyeingComputer.ConvertMoels"
@ -19,13 +20,17 @@
<Grid>
<Rectangle Margin="0,0,0,0" Fill="#FFCCCCCC" VerticalAlignment="Top" Height="40"/>
<Button Content="{x:Static lang:Resources._lock}" x:Name="WorkOrderView_lock" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="0,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_lock_Click"/>
<Button Content="{x:Static lang:Resources.New}" x:Name="WorkOrderView_new" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="200,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_new_Click"/>
<Button Content="{x:Static lang:Resources.Delete}" x:Name="WorkOrderView_del" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="400,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_del_Click"/>
<Button Content="{x:Static lang:Resources.Redye}" x:Name="WorkOrderView_redy" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="600,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_redy_Click"/>
<Button Content="{x:Static lang:Resources._lock}" x:Name="WorkOrderView_lock" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="0,0,0,0"
VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_lock_Click"/>
<Button Content="{x:Static lang:Resources.New}" x:Name="WorkOrderView_new" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="200,0,0,0"
VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_new_Click"/>
<Button Content="{x:Static lang:Resources.Delete}" x:Name="WorkOrderView_del" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="400,0,0,0"
VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_del_Click"/>
<Button Content="{x:Static lang:Resources.Redye}" x:Name="WorkOrderView_redy" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="600,0,0,0"
VerticalAlignment="Top" Width="200" Background="White" Click="WorkOrderView_redy_Click"/>
<DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True" SelectionChanged="Grid_SelectionChanged"
Margin="0,340,0,0" d:ItemsSource="{d:SampleData ItemCount=20}" AutoGenerateColumns="False" MinColumnWidth="30"
Margin="0,40,0,300" d:ItemsSource="{d:SampleData ItemCount=20}" AutoGenerateColumns="False" MinColumnWidth="30"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
@ -33,8 +38,8 @@
Background="White" SelectionMode="Single" FontSize="15" >
<DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}">
<Setter Property="Height" Value="30" />
<Setter Property="FontSize" Value="25" />
<Setter Property="Height" Value="40" />
<Setter Property="FontSize" Value="30" />
<Style.Triggers>
<Trigger Property="ItemsControl.AlternationIndex" Value="0">
<Setter Property="Background" Value="#FFFFFFFF" />
@ -68,7 +73,7 @@
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Header="{x:Static lang:Resources.ProcessName}" Width="300" Binding="{Binding ProgramName}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.ProcessName}" Width="350" Binding="{Binding ProgramName}" IsReadOnly="True"/>
<DataGridTextColumn Header="ProcessID" Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Header="lock" Binding="{Binding lock}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Header="{x:Static lang:Resources.State}" Width="120" IsReadOnly="True">
@ -78,12 +83,24 @@
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Header="{x:Static lang:Resources.StartTime}" Width="250" Binding="{Binding StartTime}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Time}" Width="100" Binding="{Binding Time}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.EndTime}" Width="250" Binding="{Binding EndTime}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Time}" Width="150" Binding="{Binding Time}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.StartTime}" Width="350" Binding="{Binding StartTime}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Width="*" Binding="{Binding Remark}" IsReadOnly="True"/>
</DataGrid.Columns>
</DataGrid>
<ScottPlot:WpfPlot x:Name="tu" Margin="0,40,0,0" Height="300" VerticalAlignment="Top" />
<Grid VerticalAlignment="Bottom" Height="300">
<lvc:CartesianChart Margin="0,0,200,0" x:Name="chart" Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}"/>
<Button x:Name="inf" FontSize="20" HorizontalAlignment="Right" Height="100" VerticalAlignment="Top" Width="200" Click="start_Click">
<Button.Background>
<ImageBrush ImageSource="/Lmage/inf.png" TileMode="None" Stretch="Uniform"/>
</Button.Background>
</Button>
<Button x:Name="start" FontSize="20" HorizontalAlignment="Right" Height="200" VerticalAlignment="Bottom" Width="200" Click="start_Click" >
<Button.Background>
<ImageBrush ImageSource="/Lmage/start3.png" TileMode="None"/>
</Button.Background>
</Button>
</Grid>
</Grid>
</UserControl>

5
View/WorkOrderView.xaml.cs
View File

@ -129,8 +129,6 @@ namespace DyeingComputer.View
var _mainWindow = Application.Current.Windows.Cast<Window>().FirstOrDefault(window => window is MainWindow) as MainWindow;//跨页面
_mainWindow.container.Content = new TechnologicalProcessView();//获取控件
}
private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮
{
@ -224,6 +222,9 @@ namespace DyeingComputer.View
}
}
private void start_Click(object sender, RoutedEventArgs e)
{
}
}
}

BIN
View/start2.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

Write Preview
Loading…
Cancel
Save