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

信息修改，字体大小

Browse Source
This commit is contained in:
sc committed 2025-09-28 00:58:20 +08:00
2 parents 818d0e5a3a e2b48ecc84
commit 4cf411dc10
7 files changed
+53 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

View/CurveView.xaml
+10 -5
View File
@@ -15,6 +15,8 @@
<UserControl.Resources> <UserControl.Resources>
<ConvertMoels:StatexmlConvert x:Key="StatexmlConvert"/> <ConvertMoels:StatexmlConvert x:Key="StatexmlConvert"/>
<ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/> <ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/>
<ConvertMoels:BoolToVisidilityConvert x:Key="BoolToVisidilityConvert"/>
<ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/>
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid>
<DataGrid x:Name="Griddata" AlternationCount="2" IsReadOnly="True" d:ItemsSource="{d:SampleData ItemCount=999}" <DataGrid x:Name="Griddata" AlternationCount="2" IsReadOnly="True" d:ItemsSource="{d:SampleData ItemCount=999}"
@@ -61,11 +63,14 @@
<Grid> <Grid>
<StackPanel Width="100" Orientation="Horizontal"> <StackPanel Width="100" Orientation="Horizontal">
<materialDesign:PackIcon Width="25" Height="30" <materialDesign:PackIcon Width="25" Height="30"
Kind="{Binding Path=State,Converter={StaticResource StatexmlConvert}}" Kind="{Binding Path=State,Converter={StaticResource StatexmlConvert}}"
Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/> Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
<materialDesign:PackIcon Width="25" Height="30" <materialDesign:PackIcon Width="25" Height="30" Kind="Lock"
Kind="{Binding Path=LOCK,Converter={StaticResource StatexmlConvert}}" Visibility="{Binding Path=LOCK,Converter={StaticResource StatexmlConvert}}"
Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/> Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
<materialDesign:PackIcon Width="25" Height="30" Kind="HandBackRight"
Visibility="{Binding Path=AUTO,Converter={StaticResource StatexmlConvert}}"
Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>
View/DyeingPlanView.xaml
+17 -17
View File
@@ -15,15 +15,15 @@
<ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/> <ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/>
</UserControl.Resources> </UserControl.Resources>
<Grid Background="White" Cursor=""> <Grid Background="White" Cursor="">
<ComboBox HorizontalAlignment="Left" Height="30" Margin="140,30,10,0" x:Name="comboBoxWorkOrder" VerticalAlignment="Top" Width="270" <ComboBox HorizontalAlignment="Left" Height="40" Margin="140,30,10,0" x:Name="comboBoxWorkOrder" VerticalAlignment="Top" Width="270"
FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" KeyDown="comboBoxWorkOrder_KeyDown"/> FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" KeyDown="comboBoxWorkOrder_KeyDown"/>
<TextBlock HorizontalAlignment="Left" Height="40" Margin="10,30,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.orders}" <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,30,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.orders}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<ComboBox HorizontalAlignment="Left" Height="30" Margin="140,80,10,0" x:Name="comboBoxDyelot" VerticalAlignment="Top" Width="270" <ComboBox HorizontalAlignment="Left" Height="40" Margin="140,80,10,0" x:Name="comboBoxDyelot" VerticalAlignment="Top" Width="270"
FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" KeyDown="comboBoxDyelot_KeyDown" /> FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" KeyDown="comboBoxDyelot_KeyDown" />
<TextBlock HorizontalAlignment="Left" Height="40" Margin="10,80,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Dyelot}" <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,80,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Dyelot}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<ComboBox HorizontalAlignment="Left" Height="30" Margin="140,130,10,0" x:Name="comboBoxMachine" VerticalAlignment="Top" Width="270" <ComboBox HorizontalAlignment="Left" Height="40" Margin="140,130,10,0" x:Name="comboBoxMachine" VerticalAlignment="Top" Width="270"
FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" DropDownClosed="comboBoxMachine_DropDownClosed" IsReadOnly="True" /> FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" DropDownClosed="comboBoxMachine_DropDownClosed" IsReadOnly="True" />
<TextBlock HorizontalAlignment="Left" Height="40" Margin="10,130,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Machine}" <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,130,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Machine}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
@@ -31,59 +31,59 @@
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBlock HorizontalAlignment="Left" Height="40" Margin="360,180,280,0" x:Name="color" TextWrapping="Wrap" <TextBlock HorizontalAlignment="Left" Height="40" Margin="360,180,280,0" x:Name="color" TextWrapping="Wrap"
VerticalAlignment="Top" Width="50" Background="#FF336FA8" MouseDown="color_color_MouseDoubleClick"/> VerticalAlignment="Top" Width="50" Background="#FF336FA8" MouseDown="color_color_MouseDoubleClick"/>
<TextBox HorizontalAlignment="Left" Height="30" Margin="140,180,10,0" x:Name="TEXTColorNumber" VerticalAlignment="Top" Width="200" <TextBox HorizontalAlignment="Left" Height="40" Margin="140,180,10,0" x:Name="TEXTColorNumber" VerticalAlignment="Top" Width="200"
FontSize="15" BorderBrush="#FF673AB7" /> FontSize="15" BorderBrush="#FF673AB7" />
<TextBlock HorizontalAlignment="Left" Height="40" Margin="10,230,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.ColorName}" <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,230,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.ColorName}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBox HorizontalAlignment="Left" Height="30" Margin="140,230,10,0" x:Name="TEXTColorName" VerticalAlignment="Top" Width="270" <TextBox HorizontalAlignment="Left" Height="40" Margin="140,230,10,0" x:Name="TEXTColorName" VerticalAlignment="Top" Width="270"
FontSize="15" BorderBrush="#FF673AB7" /> FontSize="15" BorderBrush="#FF673AB7" />
<TextBlock HorizontalAlignment="Left" Height="40" Margin="10,280,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Client}" <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,280,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Client}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBox HorizontalAlignment="Left" Height="30" Margin="140,280,10,0" x:Name="TEXTClient" VerticalAlignment="Top" Width="270" <TextBox HorizontalAlignment="Left" Height="40" Margin="140,280,10,0" x:Name="TEXTClient" VerticalAlignment="Top" Width="270"
FontSize="15" BorderBrush="#FF673AB7" /> FontSize="15" BorderBrush="#FF673AB7" />
<TextBlock HorizontalAlignment="Left" Height="40" Margin="10,330,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.ClothSpecies}" <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,330,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.ClothSpecies}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBox HorizontalAlignment="Left" Height="30" Margin="140,330,10,0" x:Name="TEXTClothSpecies" VerticalAlignment="Top" Width="270" <TextBox HorizontalAlignment="Left" Height="40" Margin="140,330,10,0" x:Name="TEXTClothSpecies" VerticalAlignment="Top" Width="270"
FontSize="15" BorderBrush="#FF673AB7" /> FontSize="15" BorderBrush="#FF673AB7" />
<TextBlock HorizontalAlignment="Left" Height="40" Margin="10,380,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.ClothWeight}" <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,380,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.ClothWeight}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBox HorizontalAlignment="Left" Height="30" Margin="140,380,10,0" x:Name="TEXTClothWeight" VerticalAlignment="Top" Width="270" <TextBox HorizontalAlignment="Left" Height="40" Margin="140,380,10,0" x:Name="TEXTClothWeight" VerticalAlignment="Top" Width="270"
FontSize="15" BorderBrush="#FF673AB7" PreviewTextInput="Tb_KeyTEXTClothWeight" InputMethod.IsInputMethodEnabled="False"/> FontSize="15" BorderBrush="#FF673AB7" PreviewTextInput="Tb_KeyTEXTClothWeight" InputMethod.IsInputMethodEnabled="False"/>
<TextBlock HorizontalAlignment="Left" Height="40" Margin="10,430,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.BathRatio}" <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,430,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.BathRatio}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBox HorizontalAlignment="Left" Height="30" Margin="140,430,10,0" x:Name="TEXTBathRatio" VerticalAlignment="Top" Width="270" <TextBox HorizontalAlignment="Left" Height="40" Margin="140,430,10,0" x:Name="TEXTBathRatio" VerticalAlignment="Top" Width="270"
FontSize="15" BorderBrush="#FF673AB7" PreviewTextInput="Tb_KeyTEXTBathRatio" InputMethod.IsInputMethodEnabled="False"/> FontSize="15" BorderBrush="#FF673AB7" PreviewTextInput="Tb_KeyTEXTBathRatio" InputMethod.IsInputMethodEnabled="False"/>
<TextBlock HorizontalAlignment="Left" Height="40" Margin="10,480,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Total}" <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,480,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Total}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBox HorizontalAlignment="Left" Height="30" Margin="140,480,10,0" x:Name="TEXTTotal" VerticalAlignment="Top" Width="270" <TextBox HorizontalAlignment="Left" Height="40" Margin="140,480,10,0" x:Name="TEXTTotal" VerticalAlignment="Top" Width="270"
FontSize="15" BorderBrush="#FF673AB7" PreviewTextInput="Tb_KeyTEXTTotal" InputMethod.IsInputMethodEnabled="False"/> FontSize="15" BorderBrush="#FF673AB7" PreviewTextInput="Tb_KeyTEXTTotal" InputMethod.IsInputMethodEnabled="False"/>
<TextBlock HorizontalAlignment="Left" Height="40" Margin="10,530,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.USER}" <TextBlock HorizontalAlignment="Left" Height="40" Margin="10,530,280,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.USER}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBox HorizontalAlignment="Left" Height="30" Margin="140,530,10,0" x:Name="TEXTUSER" VerticalAlignment="Top" Width="270" <TextBox HorizontalAlignment="Left" Height="40" Margin="140,530,10,0" x:Name="TEXTUSER" VerticalAlignment="Top" Width="270"
FontSize="15" BorderBrush="#FF673AB7" /> FontSize="15" BorderBrush="#FF673AB7" />
<TextBlock HorizontalAlignment="Right" Height="40" Margin="10,80,480,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Pump}" <TextBlock HorizontalAlignment="Right" Height="40" Margin="10,80,480,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Pump}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBox HorizontalAlignment="Right" Height="30" Margin="140,80,380,0" x:Name="PumpSpeed" VerticalAlignment="Top" Width="100" <TextBox HorizontalAlignment="Right" Height="40" Margin="140,80,380,0" x:Name="PumpSpeed" VerticalAlignment="Top" Width="100"
FontSize="15" BorderBrush="#FF673AB7" /> FontSize="15" BorderBrush="#FF673AB7" />
<TextBlock HorizontalAlignment="Right" Height="40" Margin="240,80,150,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Blower}" <TextBlock HorizontalAlignment="Right" Height="40" Margin="240,80,150,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Blower}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBox HorizontalAlignment="Right" Height="30" Margin="360,80,50,0" x:Name="Blower" VerticalAlignment="Top" Width="100" <TextBox HorizontalAlignment="Right" Height="40" Margin="360,80,50,0" x:Name="Blower" VerticalAlignment="Top" Width="100"
FontSize="15" BorderBrush="#FF673AB7" /> FontSize="15" BorderBrush="#FF673AB7" />
<TextBlock HorizontalAlignment="Right" Height="40" Margin="10,130,480,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Swing}" <TextBlock HorizontalAlignment="Right" Height="40" Margin="10,130,480,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Swing}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBox HorizontalAlignment="Right" Height="30" Margin="140,130,380,0" x:Name="Swing" VerticalAlignment="Top" Width="100" <TextBox HorizontalAlignment="Right" Height="40" Margin="140,130,380,0" x:Name="Swing" VerticalAlignment="Top" Width="100"
FontSize="15" BorderBrush="#FF673AB7" /> FontSize="15" BorderBrush="#FF673AB7" />
<TextBlock HorizontalAlignment="Right" Height="40" Margin="240,130,150,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.ClothWheel}" <TextBlock HorizontalAlignment="Right" Height="40" Margin="240,130,150,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.ClothWheel}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBox HorizontalAlignment="Right" Height="30" Margin="360,130,50,0" x:Name="ClothWheel" VerticalAlignment="Top" Width="100" <TextBox HorizontalAlignment="Right" Height="40" Margin="360,130,50,0" x:Name="ClothWheel" VerticalAlignment="Top" Width="100"
FontSize="15" BorderBrush="#FF673AB7" /> FontSize="15" BorderBrush="#FF673AB7" />
<TextBlock HorizontalAlignment="Right" Height="40" Margin="10,180,480,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Nozzle}" <TextBlock HorizontalAlignment="Right" Height="40" Margin="10,180,480,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Nozzle}"
VerticalAlignment="Top" Width="120" FontSize="25"/> VerticalAlignment="Top" Width="120" FontSize="25"/>
<TextBox HorizontalAlignment="Right" Height="30" Margin="140,180,380,0" x:Name="Nozzle" VerticalAlignment="Top" Width="100" <TextBox HorizontalAlignment="Right" Height="40" Margin="140,180,380,0" x:Name="Nozzle" VerticalAlignment="Top" Width="100"
FontSize="15" BorderBrush="#FF673AB7" /> FontSize="15" BorderBrush="#FF673AB7" />
<ComboBox HorizontalAlignment="Right" Height="30" Margin="150,30,50,0" x:Name="comboBoxProgram" VerticalAlignment="Top" Width="470" <ComboBox HorizontalAlignment="Right" Height="40" Margin="150,30,50,0" x:Name="comboBoxProgram" VerticalAlignment="Top" Width="470"
FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" DropDownClosed="comboBoxProgram_DropDownClosed" FontSize="15" IsEditable="True" BorderBrush="#FF673AB7" DropDownClosed="comboBoxProgram_DropDownClosed"
TextBoxBase.TextChanged="comboBoxProgram_TextChanged"/> TextBoxBase.TextChanged="comboBoxProgram_TextChanged"/>
<TextBlock HorizontalAlignment="Right" Height="40" Margin="10,30,480,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.process}" <TextBlock HorizontalAlignment="Right" Height="40" Margin="10,30,480,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.process}"
View/DyeingPlanView.xaml.cs
+13 -15
View File
@@ -40,6 +40,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
DataTable TEMPTable = new DataTable(); DataTable TEMPTable = new DataTable();
DataTable DyelotsBulkedRecipe=new DataTable(); DataTable DyelotsBulkedRecipe=new DataTable();
public string WorkOrder_n; public string WorkOrder_n;
string Numder = null;
string ID = null;
string P1, P2, P3, P4, P5;
public DyeingPlanView() public DyeingPlanView()
{ {
InitializeComponent(); InitializeComponent();
@@ -290,11 +293,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
} }
}//工艺修改事件 }//工艺修改事件
string Numder = null;
string ID = null;
string P1, P2, P3, P4, P5;
private void MenuItem_edit(object sender, RoutedEventArgs e) private void MenuItem_edit(object sender, RoutedEventArgs e)
{ {
int rownum = Grid_data.SelectedIndex;//获取鼠标选中行并定义变量 int rownum = Grid_data.SelectedIndex;//获取鼠标选中行并定义变量
@@ -436,17 +434,17 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
TEMPTable.Rows.Add(new object[] { TIMET, MSTT }); TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
for (int i = 0; i < dat.Rows.Count; i++) for (int i = 0; i < dat.Rows.Count; i++)
{ {
switch (dat.Rows[i][3].ToString())//步骤用时计算 switch (dat.Rows[i].Field<string>("StepID"))//步骤用时计算
{ {
case "001": case "001":
TT = MSTT; TT = MSTT;
TC = (Double)dat.Rows[i][7]; TC = dat.Rows[i].Field<double>("Parameter2");
if (TC > 9.9 || TC < 0.1) TC = 9.9;//计算限制 if (TC > 9.9 || TC < 0.1) TC = 9.9;//计算限制
MSTT = (Double)dat.Rows[i][6]; MSTT = dat.Rows[i].Field<double>("Parameter1");
TT = Math.Abs(MSTT - TT) / TC * 60; TT = Math.Abs(MSTT - TT) / TC * 60;
TIMET = Convert.ToDateTime(TIMET).AddSeconds(TT).ToString("HH:mm:ss"); TIMET = Convert.ToDateTime(TIMET).AddSeconds(TT).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT }); TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][8]).ToString("HH:mm:ss"); TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT }); TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break; break;
case "007": case "007":
@@ -458,15 +456,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
TEMPTable.Rows.Add(new object[] { TIMET, MSTT }); TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break; break;
case "013": case "013":
TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][8]* (Double)dat.Rows[i][9]).ToString("HH:mm:ss"); TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3") * dat.Rows[i].Field<double>("Parameter4")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT }); TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break; break;
case "015": case "015":
TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][8]).ToString("HH:mm:ss"); TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT }); TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break; break;
case "017": case "017":
TIMET = Convert.ToDateTime(TIMET).AddMinutes((Double)dat.Rows[i][8]).ToString("HH:mm:ss"); TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT }); TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break; break;
case "020": case "020":
@@ -478,11 +476,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
TEMPTable.Rows.Add(new object[] { TIMET, MSTT }); TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break; break;
case "031": case "031":
TIMET = Convert.ToDateTime(TIMET).AddMinutes((int)dat.Rows[i][6]).ToString("HH:mm:ss"); TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter1")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT }); TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break; break;
case "065": case "065":
TIMET = Convert.ToDateTime(TIMET).AddMinutes((int)dat.Rows[i][8]).ToString("HH:mm:ss"); TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter3")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT }); TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break; break;
case "091": case "091":
@@ -495,7 +493,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
TEMPTable.Rows.Add(new object[] { TIMET, MSTT }); TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break; break;
case "093": case "093":
TIMET = Convert.ToDateTime(TIMET).AddMinutes((int)dat.Rows[i][6]).ToString("HH:mm:ss"); TIMET = Convert.ToDateTime(TIMET).AddMinutes(dat.Rows[i].Field<double>("Parameter1")).ToString("HH:mm:ss");
TEMPTable.Rows.Add(new object[] { TIMET, MSTT }); TEMPTable.Rows.Add(new object[] { TIMET, MSTT });
break; break;
default: default:
View/MachinesView.xaml
+7 -6
View File
@@ -16,6 +16,8 @@
<UserControl.Resources> <UserControl.Resources>
<ConvertMoels:StatexmlConvert x:Key="StatexmlConvert"/> <ConvertMoels:StatexmlConvert x:Key="StatexmlConvert"/>
<ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/> <ConvertMoels:StateToColorConvert x:Key="StateToColorConvert"/>
<ConvertMoels:BoolToVisidilityConvert x:Key="BoolToVisidilityConvert"/>
<ConvertMoels:StatenToImageConvert x:Key="StatenToImageConvert"/>
<ConvertMoels:BoolRBConvert x:Key="BoolRBConvert"/> <ConvertMoels:BoolRBConvert x:Key="BoolRBConvert"/>
<ConvertMoels:IORBConvert x:Key="IORBConvert"/> <ConvertMoels:IORBConvert x:Key="IORBConvert"/>
</UserControl.Resources> </UserControl.Resources>
@@ -77,11 +79,11 @@
<Grid> <Grid>
<StackPanel Width="100" Orientation="Horizontal"> <StackPanel Width="100" Orientation="Horizontal">
<materialDesign:PackIcon Width="25" Height="30" <materialDesign:PackIcon Width="25" Height="30"
Kind="{Binding Path=State,Converter={StaticResource StatexmlConvert}}" Kind="{Binding Path=State,Converter={StaticResource StatexmlConvert}}"
Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/> Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
<materialDesign:PackIcon Width="25" Height="30" <materialDesign:PackIcon Width="25" Height="30" Kind="Lock"
Kind="{Binding Path=LOCK,Converter={StaticResource StatexmlConvert}}" Visibility="{Binding Path=LOCK,Converter={StaticResource StatexmlConvert}}"
Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/> Foreground="{Binding Path=State,Converter={StaticResource StateToColorConvert}}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>
@@ -104,7 +106,6 @@
<DataGrid x:Name="LOG_Grid" AlternationCount="2" Margin="0,0,0,0" <DataGrid x:Name="LOG_Grid" AlternationCount="2" Margin="0,0,0,0"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2"
Background="White" SelectionMode="Single" FontSize="15" > Background="White" SelectionMode="Single" FontSize="15" >
<DataGrid.RowStyle > <DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
View/ProgramgroupView.xaml.cs
+5 -1
View File
@@ -130,9 +130,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
Dictionary<string, object> Program_Rename = new Dictionary<string, object>();//缓存函数 Dictionary<string, object> Program_Rename = new Dictionary<string, object>();//缓存函数
Program_Rename.Add("ProgramName", VALUE); Program_Rename.Add("ProgramName", VALUE);
Program_Rename.Add("Groups", Group.Text); Program_Rename.Add("Groups", Group.Text);
MainWindowViewModel.SQLiteHelpers.Update("ProgramName", Program_Rename, "ProgramID='" + Programgroup_ID + "'", null); MainWindowViewModel.SQLiteHelpers.Update("ProgramName", Program_Rename, "ProgramID='" + Programgroup_ID + "'", null);
Dictionary<string, object> Program_Steps = new Dictionary<string, object>();//缓存函数
Program_Steps.Add("Program", VALUE);
MainWindowViewModel.SQLiteHelpers.Update("ProgramSteps", Program_Steps, "ProgramID='" + Programgroup_ID + "'", null);
Programgroup_sql(); Programgroup_sql();
Programgroup_Numder = null; Programgroup_Numder = null;
Programgroup_ID = null; Programgroup_ID = null;
ViewModel/CurveDiagramViewModel.cs
-4
View File
@@ -109,7 +109,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
},*/ //PH轴 },*/ //PH轴
}; };
private static Random _r = new Random();
private static ObservableCollection<DateTimePoint> MTT_values; private static ObservableCollection<DateTimePoint> MTT_values;
private static ObservableCollection<DateTimePoint> MTL_values; private static ObservableCollection<DateTimePoint> MTL_values;
private static ObservableCollection<DateTimePoint> MTH_values; private static ObservableCollection<DateTimePoint> MTH_values;
@@ -121,9 +120,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
private static ObservableCollection<DateTimePoint> STLB_values; private static ObservableCollection<DateTimePoint> STLB_values;
private static ObservableCollection<DateTimePoint> STTC_values; private static ObservableCollection<DateTimePoint> STTC_values;
private static ObservableCollection<DateTimePoint> STLC_values; private static ObservableCollection<DateTimePoint> STLC_values;
private static SQLiteHelper SQLiteHelpers = null; //定义数据库
private static string ChartAdress = Environment.CurrentDirectory + "\\DataBase\\Chart.db"; //数据库路径
static DataTable CDB = new DataTable(); static DataTable CDB = new DataTable();
private static int CDB_Count;//长度 private static int CDB_Count;//长度
WindowsView/InputBox.xaml
+1 -1
View File
@@ -11,7 +11,7 @@
Title="SUNLIGHT" Title="SUNLIGHT"
Height="150" Width="400"> Height="150" Width="400">
<Grid FocusManager.FocusedElement="{Binding ElementName=Boxx}"> <Grid FocusManager.FocusedElement="{Binding ElementName=Boxx}">
<TextBox x:Name="Boxx" Height="40" Margin="20,10,20,0" VerticalAlignment="Top" FontSize="26" <TextBox x:Name="Boxx" Height="50" Margin="20,10,20,0" VerticalAlignment="Top" FontSize="26"
MaxLines="1" BorderThickness="3,3,3,3" ClipToBounds="True"/> MaxLines="1" BorderThickness="3,3,3,3" ClipToBounds="True"/>
<Button Content="{x:Static lang:Resources.YES}" HorizontalAlignment="Left" Height="35" Margin="50,70,0,5" VerticalAlignment="Bottom" Width="80" Click="YES_Click"/> <Button Content="{x:Static lang:Resources.YES}" HorizontalAlignment="Left" Height="35" Margin="50,70,0,5" VerticalAlignment="Bottom" Width="80" Click="YES_Click"/>
<Button Content="{x:Static lang:Resources.NO}" HorizontalAlignment="Right" Height="35" Margin="0,70,50,5" VerticalAlignment="Bottom" Width="80" Click="NO_Click"/> <Button Content="{x:Static lang:Resources.NO}" HorizontalAlignment="Right" Height="35" Margin="0,70,50,5" VerticalAlignment="Bottom" Width="80" Click="NO_Click"/>