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

Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

master
忱 沈 2 years ago
parent
292e41a5c4 d8abe646b7
commit
9f75476c47
3 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      MainWindow.xaml
  2. 4
      Windows/RECIPE.xaml
  3. 8
      Windows/RECIPE.xaml.cs

2
MainWindow.xaml
View File

@ -200,7 +200,7 @@
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" IsReadOnly="True" Binding="{Binding TARGET_WT}" CellStyle="{StaticResource CellStyle}"/> <DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" IsReadOnly="True" Binding="{Binding TARGET_WT}" CellStyle="{StaticResource CellStyle}"/>
<DataGridTextColumn Header="单位" Width="80" FontSize="15" MaxWidth="80" MinWidth="80" IsReadOnly="True" Binding="{Binding UNIT}" CellStyle="{StaticResource CellStyle}"/> <DataGridTextColumn Header="单位" Width="80" FontSize="15" MaxWidth="80" MinWidth="80" IsReadOnly="True" Binding="{Binding UNIT}" CellStyle="{StaticResource CellStyle}"/>
<DataGridTextColumn Header="备注" Width="600" FontSize="15" MinWidth="600" Binding="{Binding REMARK}" CellStyle="{StaticResource CellStyle}" IsReadOnly="False"/> <DataGridTextColumn Header="备注" FontSize="15" MinWidth="1000" Binding="{Binding REMARK}" CellStyle="{StaticResource CellStyle}" IsReadOnly="False"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>

4
Windows/RECIPE.xaml
View File

@ -14,8 +14,8 @@
<ViewModel:RECIPEViewModel x:Key="RECIPEViewModel"/> <ViewModel:RECIPEViewModel x:Key="RECIPEViewModel"/>
</Window.Resources> </Window.Resources>
<Grid> <Grid>
<!--设备表--> <!--表-->
<DataGrid x:Name="DatagridDissolve" MouseDoubleClick="Dissolve_MouseDoubleClick" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" <DataGrid x:Name="DatagridRECIPE" MouseDoubleClick="RECIPE_MouseDoubleClick" SelectionMode="Single" AlternationCount="2" IsReadOnly="True"
Margin="15,0,15,150" d:ItemsSource="{d:SampleData ItemCount=999}" AutoGenerateColumns="False" MinColumnWidth="30" Margin="15,0,15,150" d:ItemsSource="{d:SampleData ItemCount=999}" AutoGenerateColumns="False" MinColumnWidth="30"
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"

8
Windows/RECIPE.xaml.cs
View File

@ -90,7 +90,7 @@ namespace formula_manage.Windows
private void RECIPE_Loaded(object sender, RoutedEventArgs e)//打开页面执行 private void RECIPE_Loaded(object sender, RoutedEventArgs e)//打开页面执行
{ {
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取 UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取
this.DatagridDissolve.LoadingRow += new EventHandler<DataGridRowEventArgs>(this.DataGridEquipment_LoadingRow);//生成序列号 this.DatagridRECIPE.LoadingRow += new EventHandler<DataGridRowEventArgs>(this.DataGridEquipment_LoadingRow);//生成序列号
TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1"); //读配置文件 TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1"); //读配置文件
TEXT_SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2"); TEXT_SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2");
@ -135,7 +135,7 @@ namespace formula_manage.Windows
Stuff_data.Fill(dataTable); //查询结果存入缓存 Stuff_data.Fill(dataTable); //查询结果存入缓存
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
DatagridDissolve.ItemsSource = dataTable.DefaultView; //数据加入表格 DatagridRECIPE.ItemsSource = dataTable.DefaultView; //数据加入表格
} }
catch (Exception) catch (Exception)
{ {
@ -144,9 +144,9 @@ namespace formula_manage.Windows
} }
} }
private void Dissolve_MouseDoubleClick(object sender, MouseButtonEventArgs e)//数据表双击事件 private void RECIPE_MouseDoubleClick(object sender, MouseButtonEventArgs e)//数据表双击事件
{ {
int rownum = DatagridDissolve.SelectedIndex;//获取鼠标选中行并定义变量 int rownum = DatagridRECIPE.SelectedIndex;//获取鼠标选中行并定义变量
if (rownum != -1)//判断鼠标定位是否有效 if (rownum != -1)//判断鼠标定位是否有效
{ {

Write Preview
Loading…
Cancel
Save