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

Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

master
sc 12 months ago
parent
294277320a 9b210d67f3
commit
dc7ee5013e
8 changed files with 142 additions and 15 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. 2
      MainWindow.xaml
  2. 27
      Properties/Resources.Designer.cs
  3. 9
      Properties/Resources.en-US.resx
  4. 9
      Properties/Resources.resx
  5. 9
      Properties/Resources.zh-CN.resx
  6. 18
      Properties/Resources.zh-TW.resx
  7. 43
      View/MonitorView.xaml
  8. 40
      View/MonitorView.xaml.cs

2
MainWindow.xaml
View File

@ -105,7 +105,7 @@
</ListViewItem>
<ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="PipeLeak" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
<materialDesign:PackIcon Kind="Pipe" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
<TextBlock Text="{x:Static lang:Resources.ConveyorCenters}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>

27
Properties/Resources.Designer.cs
View File

@ -411,6 +411,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
/// <summary>
/// 查找类似 Conveyor 的本地化字符串。
/// </summary>
public static string Conveyor {
get {
return ResourceManager.GetString("Conveyor", resourceCulture);
}
}
/// <summary>
/// 查找类似 ConveyorCenters 的本地化字符串。
/// </summary>
@ -600,6 +609,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
/// <summary>
/// 查找类似 DyeingMachine 的本地化字符串。
/// </summary>
public static string DyeingMachine {
get {
return ResourceManager.GetString("DyeingMachine", resourceCulture);
}
}
/// <summary>
/// 查找类似 Dyelot 的本地化字符串。
/// </summary>
@ -1842,6 +1860,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
/// <summary>
/// 查找类似 Receipt 的本地化字符串。
/// </summary>
public static string Receipt {
get {
return ResourceManager.GetString("Receipt", resourceCulture);
}
}
/// <summary>
/// 查找类似 Recover 的本地化字符串。
/// </summary>

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

@ -888,4 +888,13 @@
<data name="Stop" xml:space="preserve">
<value>Stop</value>
</data>
<data name="DyeingMachine" xml:space="preserve">
<value>Dyeing Machine</value>
</data>
<data name="Receipt" xml:space="preserve">
<value>Receipt</value>
</data>
<data name="Conveyor" xml:space="preserve">
<value>Conveyor</value>
</data>
</root>

9
Properties/Resources.resx
View File

@ -888,4 +888,13 @@
<data name="Stop" xml:space="preserve">
<value>stop</value>
</data>
<data name="DyeingMachine" xml:space="preserve">
<value>DyeingMachine</value>
</data>
<data name="Receipt" xml:space="preserve">
<value>Receipt</value>
</data>
<data name="Conveyor" xml:space="preserve">
<value>Conveyor</value>
</data>
</root>

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

@ -888,4 +888,13 @@
<data name="Stop" xml:space="preserve">
<value>结束</value>
</data>
<data name="DyeingMachine" xml:space="preserve">
<value>染色机</value>
</data>
<data name="Receipt" xml:space="preserve">
<value>单据</value>
</data>
<data name="Conveyor" xml:space="preserve">
<value>输送</value>
</data>
</root>

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

@ -879,4 +879,22 @@
<data name="ProductionPlanning" xml:space="preserve">
<value>生產計劃</value>
</data>
<data name="Conveyor" xml:space="preserve">
<value>輸送</value>
</data>
<data name="continue" xml:space="preserve">
<value>繼續</value>
</data>
<data name="Stop" xml:space="preserve">
<value>停止</value>
</data>
<data name="Resume" xml:space="preserve">
<value>恢復</value>
</data>
<data name="DyeingMachine" xml:space="preserve">
<value>染色機</value>
</data>
<data name="Receipt" xml:space="preserve">
<value>單據</value>
</data>
</root>

43
View/MonitorView.xaml
View File

@ -15,7 +15,7 @@
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"
Background="White" SelectionMode="Single" FontSize="15" TabIndex="1" Focusable="True" VerticalAlignment="Top" Height="300">
Background="White" SelectionMode="Single" FontSize="15" TabIndex="1" Focusable="True" VerticalAlignment="Top" Height="300" BorderBrush="Black">
<DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}">
<Setter Property="Height" Value="30" />
@ -94,7 +94,7 @@
<!--列信息绑定-->
<DataGridTextColumn Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Binding="{Binding Program}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="60" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="70" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Directives}" Width="300" Binding="{Binding StepName}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="*" Binding="{Binding ParameterName}" IsReadOnly="True"/>
@ -112,38 +112,59 @@
</DataGrid.Columns>
</DataGrid>
<TextBlock x:Name="log" HorizontalAlignment="Left" Margin="0,300,0,50" TextWrapping="Wrap" Width="700" FontSize="25" Background="White" Text="{Binding Sys_log}"/>
<StackPanel x:Name="scr" VerticalAlignment="Bottom" Height="50" Background="#FF00204E" Orientation="Horizontal">
<ListViewItem Width="150" Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
<StackPanel Orientation="Horizontal" Height="50" >
<StackPanel x:Name="mt" VerticalAlignment="Bottom" Height="50" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0" Width="700" HorizontalAlignment="Left">
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_DyeingMachine">
<StackPanel Orientation="Horizontal" >
<materialDesign:PackIcon Kind="CoffeeMachine" Width="25" Height="40" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.DyeingMachine}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Conveyor">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Pipe" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Conveyor}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Receipt">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="ReceiptText" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Receipt}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
</StackPanel>
<StackPanel x:Name="scr" VerticalAlignment="Bottom" Height="50" Background="#FF00204E" Orientation="Horizontal" Margin="700,0,0,0">
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Resume" IsEnabled="False" x:Name="Resume">
<StackPanel Orientation="Horizontal" >
<materialDesign:PackIcon Kind="Resume" Width="25" Height="40" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Resume}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Height="50" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Paused" IsEnabled="False" x:Name="Paused">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Pause" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Paused}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Stop" IsEnabled="False" x:Name="Stop">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Stop" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Stop}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_edit" IsEnabled="False" x:Name="edit">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Edit" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.edit}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Insert" IsEnabled="False" x:Name="Insert">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="InsertComment" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<materialDesign:PackIcon Kind="InsertInvitation" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Insert}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
</StackPanel>
</ListViewItem>
<ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
<ListViewItem Width="150" Height="50" MouseLeftButtonUp="ListViewItem_Delete" IsEnabled="False" x:Name="Delete">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Delete" Width="25" Height="25" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
<TextBlock Text="{x:Static lang:Resources.Delete}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>

40
View/MonitorView.xaml.cs
View File

@ -32,17 +32,51 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
}
private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)
private void Gridstep_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
Delete.IsEnabled = true;
Insert.IsEnabled = true;
edit.IsEnabled = true;
Paused.IsEnabled = true;
Resume.IsEnabled = true;
}
private void ListViewItem_DyeingMachine(object sender, MouseButtonEventArgs e)
{
}
private void ListViewItem_Conveyor(object sender, MouseButtonEventArgs e)
{
private void Gridstep_SelectionChanged(object sender, SelectionChangedEventArgs e)
}
private void ListViewItem_Receipt(object sender, MouseButtonEventArgs e)
{
}
private void ListViewItem_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
private void ListViewItem_Resume(object sender, MouseButtonEventArgs e)
{
}
private void ListViewItem_Paused(object sender, MouseButtonEventArgs e)
{
}
private void ListViewItem_Stop(object sender, MouseButtonEventArgs e)
{
}
private void ListViewItem_edit(object sender, MouseButtonEventArgs e)
{
}
private void ListViewItem_Insert(object sender, MouseButtonEventArgs e)
{
}
private void ListViewItem_Delete(object sender, MouseButtonEventArgs e)
{
}

Write Preview
Loading…
Cancel
Save