sc 12 months ago
parent
commit
294277320a
  1. 2
      MainWindow.xaml
  2. 4
      MainWindow.xaml.cs
  3. 37
      Properties/Resources.Designer.cs
  4. 31
      Properties/Resources.en-US.resx
  5. 15
      Properties/Resources.resx
  6. 21
      Properties/Resources.zh-CN.resx
  7. 18
      Properties/Resources.zh-TW.resx
  8. 7
      SunlightCentralizedControlManagement_SCCM_.csproj
  9. 155
      View/MonitorView.xaml
  10. 50
      View/MonitorView.xaml.cs

2
MainWindow.xaml

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

4
MainWindow.xaml.cs

@ -82,6 +82,10 @@ namespace SunlightCentralizedControlManagement_SCCM_
{
Picture.Content = new View.Whole();
}
private void ListViewItem_Monitor(object sender, MouseButtonEventArgs e)
{
Picture.Content = new View.MonitorView();
}
private void Buttonhelp_Click(object sender, RoutedEventArgs e)
{

37
Properties/Resources.Designer.cs

@ -60,6 +60,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
/// <summary>
/// 查找类似 continue 的本地化字符串。
/// </summary>
public static string _continue {
get {
return ResourceManager.GetString("continue", resourceCulture);
}
}
/// <summary>
/// 查找类似 lock 的本地化字符串。
/// </summary>
@ -1815,15 +1824,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
/// <summary>
/// 查找类似 Rate 的本地化字符串。
/// </summary>
public static string Rate1 {
get {
return ResourceManager.GetString("Rate1", resourceCulture);
}
}
/// <summary>
/// 查找类似 Ready 的本地化字符串。
/// </summary>
@ -1915,20 +1915,20 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
/// <summary>
/// 查找类似 RunningTime 的本地化字符串。
/// 查找类似 Resume 的本地化字符串。
/// </summary>
public static string RunningTime {
public static string Resume {
get {
return ResourceManager.GetString("RunningTime", resourceCulture);
return ResourceManager.GetString("Resume", resourceCulture);
}
}
/// <summary>
/// 查找类似 RunningTime 的本地化字符串。
/// </summary>
public static string RunningTime1 {
public static string RunningTime {
get {
return ResourceManager.GetString("RunningTime1", resourceCulture);
return ResourceManager.GetString("RunningTime", resourceCulture);
}
}
@ -2040,6 +2040,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
/// <summary>
/// 查找类似 stop 的本地化字符串。
/// </summary>
public static string Stop {
get {
return ResourceManager.GetString("Stop", resourceCulture);
}
}
/// <summary>
/// 查找类似 StopProcess 的本地化字符串。
/// </summary>

31
Properties/Resources.en-US.resx

@ -444,9 +444,6 @@
<data name="RunningTime" xml:space="preserve">
<value>Running Time</value>
</data>
<data name="RunningTime1" xml:space="preserve">
<value>Running Time</value>
</data>
<data name="AddTheMedicine" xml:space="preserve">
<value>Add The Medicine</value>
</data>
@ -624,9 +621,6 @@
<data name="Rate" xml:space="preserve">
<value>Rate</value>
</data>
<data name="Rate1" xml:space="preserve">
<value>Rate</value>
</data>
<data name="Tank" xml:space="preserve">
<value>Tank</value>
</data>
@ -870,15 +864,14 @@
<data name="USER" xml:space="preserve">
<value>USER</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Monitor" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
<data name="Monitor" xml:space="preserve">
<value>Monitor</value>
</data>
<data name="Machine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
<data name="Machine" xml:space="preserve">
<value>Machine</value>
</data>
<data name="MachineGroup" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
<data name="MachineGroup" xml:space="preserve">
<value>MachineGroup</value>
</data>
<data name="ConveyorCenters" xml:space="preserve">
<value>Conveyor</value>
@ -886,13 +879,13 @@
<data name="ProductionPlanning" xml:space="preserve">
<value>Planning</value>
</data>
<data name="Monitor" xml:space="preserve">
<value>Monitor</value>
<data name="continue" xml:space="preserve">
<value>Continue</value>
</data>
<data name="Machine" xml:space="preserve">
<value>Machine</value>
<data name="Resume" xml:space="preserve">
<value>Resume</value>
</data>
<data name="MachineGroup" xml:space="preserve">
<value>MachineGroup</value>
<data name="Stop" xml:space="preserve">
<value>Stop</value>
</data>
</root>

15
Properties/Resources.resx

@ -444,9 +444,6 @@
<data name="RunningTime" xml:space="preserve">
<value>RunningTime</value>
</data>
<data name="RunningTime1" xml:space="preserve">
<value>RunningTime</value>
</data>
<data name="AddTheMedicine" xml:space="preserve">
<value>AddTheMedicine</value>
</data>
@ -624,9 +621,6 @@
<data name="Rate" xml:space="preserve">
<value>Rate</value>
</data>
<data name="Rate1" xml:space="preserve">
<value>Rate</value>
</data>
<data name="Tank" xml:space="preserve">
<value>Tank</value>
</data>
@ -885,4 +879,13 @@
<data name="ProductionPlanning" xml:space="preserve">
<value>ProductionPlanning</value>
</data>
<data name="continue" xml:space="preserve">
<value>continue</value>
</data>
<data name="Resume" xml:space="preserve">
<value>Resume</value>
</data>
<data name="Stop" xml:space="preserve">
<value>stop</value>
</data>
</root>

21
Properties/Resources.zh-CN.resx

@ -444,9 +444,6 @@
<data name="RunningTime" xml:space="preserve">
<value>运转</value>
</data>
<data name="RunningTime1" xml:space="preserve">
<value>运转</value>
</data>
<data name="AddTheMedicine" xml:space="preserve">
<value>加药</value>
</data>
@ -624,9 +621,6 @@
<data name="Rate" xml:space="preserve">
<value>速率</value>
</data>
<data name="Rate1" xml:space="preserve">
<value>速率</value>
</data>
<data name="Tank" xml:space="preserve">
<value>缸</value>
</data>
@ -870,9 +864,6 @@
<data name="USER" xml:space="preserve">
<value>用户</value>
</data>
<data name="ProductionPlanning" xml:space="preserve">
<value>生产计划</value>
</data>
<data name="Monitor" xml:space="preserve">
<value>监控</value>
</data>
@ -885,4 +876,16 @@
<data name="ConveyorCenters" xml:space="preserve">
<value>输送中心</value>
</data>
<data name="ProductionPlanning" xml:space="preserve">
<value>生产计划</value>
</data>
<data name="continue" xml:space="preserve">
<value>继续</value>
</data>
<data name="Resume" xml:space="preserve">
<value>恢复</value>
</data>
<data name="Stop" xml:space="preserve">
<value>结束</value>
</data>
</root>

18
Properties/Resources.zh-TW.resx

@ -444,9 +444,6 @@
<data name="RunningTime" xml:space="preserve">
<value>運轉</value>
</data>
<data name="RunningTime1" xml:space="preserve">
<value>運轉</value>
</data>
<data name="AddTheMedicine" xml:space="preserve">
<value>加藥</value>
</data>
@ -624,9 +621,6 @@
<data name="Rate" xml:space="preserve">
<value>速率</value>
</data>
<data name="Rate1" xml:space="preserve">
<value>速率</value>
</data>
<data name="Tank" xml:space="preserve">
<value>缸</value>
</data>
@ -852,12 +846,12 @@
<data name="PopUpLogout" xml:space="preserve">
<value>退出</value>
</data>
<data name="Whole" xml:space="preserve">
<value>全域</value>
</data>
<data name="Help" xml:space="preserve">
<value>幫助</value>
</data>
<data name="Whole" xml:space="preserve">
<value>全域</value>
</data>
<data name="process" xml:space="preserve">
<value>工藝</value>
</data>
@ -879,10 +873,10 @@
<data name="MachineGroup" xml:space="preserve">
<value>機器羣組</value>
</data>
<data name="ProductionPlanning" xml:space="preserve">
<value>生產計劃</value>
</data>
<data name="ConveyorCenters" xml:space="preserve">
<value>輸送中心</value>
</data>
<data name="ProductionPlanning" xml:space="preserve">
<value>生產計劃</value>
</data>
</root>

7
SunlightCentralizedControlManagement_SCCM_.csproj

@ -103,6 +103,9 @@
<Compile Include="View\info.xaml.cs">
<DependentUpon>info.xaml</DependentUpon>
</Compile>
<Compile Include="View\MonitorView.xaml.cs">
<DependentUpon>MonitorView.xaml</DependentUpon>
</Compile>
<Compile Include="View\RoilingTextBlock.xaml.cs">
<DependentUpon>RoilingTextBlock.xaml</DependentUpon>
</Compile>
@ -138,6 +141,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\MonitorView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\RoilingTextBlock.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>

155
View/MonitorView.xaml

@ -0,0 +1,155 @@
<UserControl x:Class="SunlightCentralizedControlManagement_SCCM_.View.MonitorView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"
xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d"
d:DesignHeight="1000" d:DesignWidth="1900">
<Grid>
<DataGrid x:Name="Griddata" AlternationCount="2" IsReadOnly="True" SelectionChanged="Griddata_SelectionChanged"
Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=999}" AutoGenerateColumns="False" MinColumnWidth="30"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All"
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">
<DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}">
<Setter Property="Height" Value="30" />
<Setter Property="FontSize" Value="25" />
<Style.Triggers>
<Trigger Property="ItemsControl.AlternationIndex" Value="0">
<Setter Property="Background" Value="#FFFFFFFF" />
</Trigger>
<Trigger Property="ItemsControl.AlternationIndex" Value="1">
<Setter Property="Background" Value="#FFF0F0F0" />
</Trigger>
<Trigger Property="IsMouseOver" Value="False"/>
</Style.Triggers>
</Style>
</DataGrid.RowStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="MinWidth" Value="20"/>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#FFC0C0C0"/>
<Setter Property="BorderBrush" Value="#FFC0C0C0"/>
<Setter Property="Foreground" Value="Black"/>
</Trigger>
</Style.Triggers>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns>
<!--列信息绑定-->
<DataGridTextColumn Header="{x:Static lang:Resources.Machine}" Binding="{Binding Name}" Width="150" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.WorkOrder}" Binding="{Binding WorkOrder}" Width="200" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Dyelot}" Binding="{Binding Dyelot}" Width="200" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Temperature}" Binding="{Binding Temperature}" Width="100" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.process}" Binding="{Binding Process}" Width="300" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="300" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.message}" Binding="{Binding Message}" Width="*" IsReadOnly="True"/>
</DataGrid.Columns>
</DataGrid>
<DataGrid x:Name="Gridstep" AlternationCount="2" IsReadOnly="True" SelectionChanged="Gridstep_SelectionChanged"
Margin="700,300,0,50" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="Black"
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" MinHeight="632" TabIndex="1" Focusable="True">
<DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}">
<Setter Property="Height" Value="30" />
<Setter Property="FontSize" Value="25" />
<Style.Triggers>
<Trigger Property="ItemsControl.AlternationIndex" Value="0">
<Setter Property="Background" Value="#FFFFFFFF" />
</Trigger>
<Trigger Property="ItemsControl.AlternationIndex" Value="1">
<Setter Property="Background" Value="#FFF0F0F0" />
</Trigger>
<Trigger Property="IsMouseOver" Value="False"/>
</Style.Triggers>
</Style>
</DataGrid.RowStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="MinWidth" Value="20"/>
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#FFC0C0C0"/>
<Setter Property="BorderBrush" Value="#FFC0C0C0"/>
<Setter Property="Foreground" Value="Black"/>
</Trigger>
</Style.Triggers>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns>
<!--列信息绑定-->
<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.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"/>
<DataGridTextColumn Binding="{Binding Parameter1}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Binding="{Binding Parameter2}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Binding="{Binding Parameter3}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Binding="{Binding Parameter4}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Binding="{Binding Parameter5}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Binding="{Binding Parameter6}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Binding="{Binding Parameter7}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Binding="{Binding Parameter8}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Binding="{Binding Parameter9}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Binding="{Binding Parameter10}" Width="0" MinWidth="0" MaxWidth="0"/>
<DataGridTextColumn Binding="{Binding DYELOT}" Width="0" MinWidth="0" MaxWidth="0"/>
</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" >
<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">
<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">
<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">
<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">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="InsertComment" 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">
<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"/>
</StackPanel>
</ListViewItem>
</StackPanel>
</Grid>
</UserControl>

50
View/MonitorView.xaml.cs

@ -0,0 +1,50 @@
using SunlightCentralizedControlManagement_SCCM_.ViewModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace SunlightCentralizedControlManagement_SCCM_.View
{
/// <summary>
/// MonitorView.xaml 的交互逻辑
/// </summary>
public partial class MonitorView : UserControl
{
public MonitorView()
{
InitializeComponent();
Griddata.ItemsSource = MainWindowViewModel.Machines.DefaultView;
}
private void Griddata_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
}
private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
}
private void Gridstep_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
}
private void ListViewItem_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
}
}
}
Loading…
Cancel
Save