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

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

Browse Source
This commit is contained in:
sc committed 2024-08-18 00:39:17 +08:00
2 parents 51c2aae2e9 b20c1a086e
commit 743eb186a5
9 files changed
+249 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MainWindow.xaml
+2 -1
View File
@@ -8,7 +8,8 @@
d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
mc:Ignorable="d"
Title="SUNLIGHT 838 b0.0.1 (2024/08/10)"
Height="720" Width="1270">
Height="720" Width="1280">
<!--WindowState ="Maximized" WindowStyle="None"-->
<Window.Resources>
<Style x:Key="RadioButtonStyle" TargetType="{x:Type RadioButton}">
MainWindow.xaml.cs
+1
View File
@@ -30,6 +30,7 @@ namespace DyeingComputer
InitializeComponent();
SQLiteStrat();
container.Content = new WorkOrderView();
}
Properties/Resources.Designer.cs
Generated
+81
View File
@@ -60,6 +60,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 lock 的本地化字符串。
/// </summary>
public static string _lock {
get {
return ResourceManager.GetString("lock", resourceCulture);
}
}
/// <summary>
/// 查找类似 Curve 的本地化字符串。
/// </summary>
@@ -69,6 +78,24 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Delete 的本地化字符串。
/// </summary>
public static string Delete {
get {
return ResourceManager.GetString("Delete", resourceCulture);
}
}
/// <summary>
/// 查找类似 EndTime 的本地化字符串。
/// </summary>
public static string EndTime {
get {
return ResourceManager.GetString("EndTime", resourceCulture);
}
}
/// <summary>
/// 查找类似 Engineer 的本地化字符串。
/// </summary>
@@ -105,6 +132,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 New 的本地化字符串。
/// </summary>
public static string New {
get {
return ResourceManager.GetString("New", resourceCulture);
}
}
/// <summary>
/// 查找类似 Next 的本地化字符串。
/// </summary>
@@ -132,6 +168,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 ProcessName 的本地化字符串。
/// </summary>
public static string ProcessName {
get {
return ResourceManager.GetString("ProcessName", resourceCulture);
}
}
/// <summary>
/// 查找类似 ProgramGroup 的本地化字符串。
/// </summary>
@@ -141,6 +186,33 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Redye 的本地化字符串。
/// </summary>
public static string Redye {
get {
return ResourceManager.GetString("Redye", resourceCulture);
}
}
/// <summary>
/// 查找类似 Remark 的本地化字符串。
/// </summary>
public static string Remark {
get {
return ResourceManager.GetString("Remark", resourceCulture);
}
}
/// <summary>
/// 查找类似 StartTime 的本地化字符串。
/// </summary>
public static string StartTime {
get {
return ResourceManager.GetString("StartTime", resourceCulture);
}
}
/// <summary>
/// 查找类似 SystemDataLoss 的本地化字符串。
/// </summary>
@@ -177,6 +249,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Time 的本地化字符串。
/// </summary>
public static string Time {
get {
return ResourceManager.GetString("Time", resourceCulture);
}
}
/// <summary>
/// 查找类似 Worklist 的本地化字符串。
/// </summary>
Properties/Resources.en-US.resx
+27
View File
@@ -162,4 +162,31 @@
<data name="Temperature" xml:space="preserve">
<value>Temperature</value>
</data>
<data name="lock" xml:space="preserve">
<value>Lock</value>
</data>
<data name="New" xml:space="preserve">
<value>New</value>
</data>
<data name="Delete" xml:space="preserve">
<value>Delete</value>
</data>
<data name="Redye" xml:space="preserve">
<value>Redye</value>
</data>
<data name="EndTime" xml:space="preserve">
<value>End Time</value>
</data>
<data name="ProcessName" xml:space="preserve">
<value>Process name</value>
</data>
<data name="Remark" xml:space="preserve">
<value>Remarks</value>
</data>
<data name="StartTime" xml:space="preserve">
<value>Start Time</value>
</data>
<data name="Time" xml:space="preserve">
<value>Time</value>
</data>
</root>
Properties/Resources.resx
+27
View File
@@ -120,6 +120,12 @@
<data name="CurveDiagram" xml:space="preserve">
<value>Curve</value>
</data>
<data name="Delete" xml:space="preserve">
<value>Delete</value>
</data>
<data name="EndTime" xml:space="preserve">
<value>EndTime</value>
</data>
<data name="EngineerSet" xml:space="preserve">
<value>Engineer</value>
</data>
@@ -132,6 +138,12 @@
<data name="InOut" xml:space="preserve">
<value>I/O</value>
</data>
<data name="lock" xml:space="preserve">
<value>lock</value>
</data>
<data name="New" xml:space="preserve">
<value>New</value>
</data>
<data name="Next" xml:space="preserve">
<value>Next</value>
</data>
@@ -141,9 +153,21 @@
<data name="Previous" xml:space="preserve">
<value>back</value>
</data>
<data name="ProcessName" xml:space="preserve">
<value>ProcessName</value>
</data>
<data name="Programgroup" xml:space="preserve">
<value>ProgramGroup</value>
</data>
<data name="Redye" xml:space="preserve">
<value>Redye</value>
</data>
<data name="Remark" xml:space="preserve">
<value>Remark</value>
</data>
<data name="StartTime" xml:space="preserve">
<value>StartTime</value>
</data>
<data name="SysDatLoss" xml:space="preserve">
<value>SystemDataLoss</value>
</data>
@@ -156,6 +180,9 @@
<data name="Temperature" xml:space="preserve">
<value>Temperature</value>
</data>
<data name="Time" xml:space="preserve">
<value>Time</value>
</data>
<data name="WorkOrder" xml:space="preserve">
<value>Worklist</value>
</data>
Properties/Resources.zh-CN.resx
+27
View File
@@ -162,4 +162,31 @@
<data name="Temperature" xml:space="preserve">
<value>温度</value>
</data>
<data name="lock" xml:space="preserve">
<value>锁定</value>
</data>
<data name="New" xml:space="preserve">
<value>新建</value>
</data>
<data name="Delete" xml:space="preserve">
<value>删除</value>
</data>
<data name="Redye" xml:space="preserve">
<value>重染</value>
</data>
<data name="EndTime" xml:space="preserve">
<value>结束时间</value>
</data>
<data name="ProcessName" xml:space="preserve">
<value>工艺名</value>
</data>
<data name="Remark" xml:space="preserve">
<value>备注</value>
</data>
<data name="StartTime" xml:space="preserve">
<value>开始时间</value>
</data>
<data name="Time" xml:space="preserve">
<value>时间</value>
</data>
</root>
Properties/Resources.zh-TW.resx
+27
View File
@@ -162,4 +162,31 @@
<data name="Temperature" xml:space="preserve">
<value>溫度</value>
</data>
<data name="lock" xml:space="preserve">
<value>鎖定</value>
</data>
<data name="New" xml:space="preserve">
<value>新建</value>
</data>
<data name="Delete" xml:space="preserve">
<value>刪除</value>
</data>
<data name="Redye" xml:space="preserve">
<value>重染</value>
</data>
<data name="EndTime" xml:space="preserve">
<value>結束時間</value>
</data>
<data name="ProcessName" xml:space="preserve">
<value>工藝名</value>
</data>
<data name="Remark" xml:space="preserve">
<value>備註</value>
</data>
<data name="StartTime" xml:space="preserve">
<value>開始時間</value>
</data>
<data name="Time" xml:space="preserve">
<value>時間</value>
</data>
</root>
View/WorkOrderView.xaml
+56 -5
View File
@@ -4,12 +4,63 @@
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"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid>
<Grid HorizontalAlignment="Left" Height="236" Margin="190,81,0,0" VerticalAlignment="Top" Width="406"/>
<DataGrid HorizontalAlignment="Left" Height="153" Margin="78,91,0,0" VerticalAlignment="Top" Width="418" d:ItemsSource="{d:SampleData ItemCount=5}"/>
d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
<Grid VerticalAlignment="Top">
<Grid VerticalAlignment="Top">
<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"/>
<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"/>
<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"/>
<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"/>
<DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True"
Margin="0,40,0,0" Height="400" d:ItemsSource="{d:SampleData ItemCount=99}" AutoGenerateColumns="False" MinColumnWidth="30"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2"
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False"
CanUserAddRows="False" CanUserDeleteRows="False" HeadersVisibility ="Column"
Background="White" SelectionMode="Single" FontSize="15" VerticalAlignment="Top" >
<DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}">
<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">
</Trigger>
</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="#000000"/>
</Trigger>
</Style.Triggers>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns>
<!--列信息绑定-->
<DataGridTextColumn Header="{x:Static lang:Resources.WorkOrderNumder}" Width="200" Binding="{Binding WorkOrder}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.ProcessName}" Width="200" Binding="{Binding ProcessName}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.StartTime}" Width="200" 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}" MinWidth="200" Binding="{Binding EndTime}" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Remark}" MinWidth="500" Binding="{Binding Remark}" IsReadOnly="True"/>
</DataGrid.Columns>
</DataGrid>
</Grid>
</Grid>
ViewModel/MainWindowViewModel.cs
+1 -1
View File
@@ -76,7 +76,7 @@ namespace DyeingComputer.ViewModel
void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件
{
Sys_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
Work_Temp = "130"+"℃";
Work_Temp = "130"+" ℃";
Work_Numder = "r2024011200014";
Status_Str = "qweqeqwqqfwfqef";
}