baogq
/
RfidConveyorBelt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style - 更新错别字

Browse Source
master
SoulStar 7 days ago
parent 6bd493c0d7
commit 142114b01f
1 changed files with 1 additions and 278 deletions
Show Stats Download Patch File Download Diff File

279
SlnMesnac.WPF/Page/IndexPage/ProductionLineUserControl.xaml
Unescape Escape View File

@ -138,7 +138,7 @@
<!--<Button
Content="查询" Width="200" Visibility="Hidden" FontSize="20" Command="{Binding GetOrderInfoCommand}" CommandParameter="{Binding Name,ElementName=Search}"
Background="#009999" Margin="0 0 100 0"/>-->
<TextBlock Text="上次读取状态:" FontSize="15" Foreground="White" Margin="0,0,8,0"/>
<TextBlock Text="上次写入状态:" FontSize="15" Foreground="White" Margin="0,0,8,0"/>
<TextBlock Text="{Binding LastWriteState,Mode=TwoWay}" FontSize="15" Style="{StaticResource SuccessTextStyle}" Margin="0,0,8,0"/>
<!--<TextBlock Text="成功" FontSize="15" Style="{StaticResource SuccessTextStyle}" Margin="0,0,8,0"/>-->
</StackPanel>
@ -205,9 +205,6 @@ Content="查询" Width="200" Visibility="Hidden" FontSize="20" Command="{Binding
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<!--<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>-->
</Grid.RowDefinitions>
<!-- 面板标题 -->
@ -254,27 +251,6 @@ Content="查询" Width="200" Visibility="Hidden" FontSize="20" Command="{Binding
<TextBlock Text="{Binding ProductType,Mode=TwoWay}" Grid.Column="1" FontSize="15"/>
</Grid>
<!-- RFID总数量 -->
<!--<Grid Grid.Row="5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="7*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="生产数量" Grid.ColumnSpan="1" FontSize="15"/>
<TextBlock Text="{Binding RfidCount,Mode=TwoWay}" FontSize="15" Grid.Column="1" Grid.ColumnSpan="2"/>
</Grid>-->
<!-- 已写入数量 -->
<!--<Grid Grid.Row="6">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="已写入数量:" FontSize="15"/>
<TextBlock Text="{Binding WriteCount,Mode=TwoWay}" FontSize="15" Grid.Column="1"/>
</Grid>-->
<Grid Grid.Row="5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
@ -294,15 +270,6 @@ Content="查询" Width="200" Visibility="Hidden" FontSize="20" Command="{Binding
<TextBlock Text="带号:" FontSize="15"/>
<TextBlock Text="{Binding NextProductNo,Mode=TwoWay}" Grid.Column="1" FontSize="15"/>
</Grid>
<!-- 生产状态 -->
<!--<Grid Grid.Row="8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="生产状态:" FontSize="15"/>
<TextBlock Text="{Binding ProductStatus,Mode=TwoWay}" FontSize="15" Style="{StaticResource ProducingTextStyle}" Grid.Column="1"/>
</Grid>-->
</Grid>
</Border>
@ -394,201 +361,6 @@ Content="查询" Width="200" Visibility="Hidden" FontSize="20" Command="{Binding
</DataTemplate>
</TabControl.ContentTemplate>
<!-- 7号线标签页 -->
<!--<TabItem Header="7号线">
<Grid Margin="10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
-->
<!-- 当前生产订单信息面板 -->
<!--
<Border Grid.Column="0" BorderThickness="1" BorderBrush="#E0E0E0"
CornerRadius="4" Margin="0,0,5,0">
<Grid Margin="10">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
-->
<!-- 面板标题 -->
<!--
<StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,10">
<TextBlock Text="当前生产订单信息" FontWeight="Bold" FontSize="15"/>
</StackPanel>
-->
<!-- 订单编号 -->
<!--
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="订单编号:" />
<TextBlock Text="S260402000112832604106" Grid.Column="1"/>
</Grid>
-->
<!-- 产线编号 -->
<!--
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="产线编号:" />
<TextBlock Text="7号线" Grid.Column="1"/>
</Grid>
-->
<!-- 产品类型 -->
<!--
<Grid Grid.Row="3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="产品类型:" />
<TextBlock Text="整芯带" Grid.Column="1"/>
</Grid>
-->
<!-- RFID总数量 -->
<!--
<Grid Grid.Row="4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="7*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="RFID总数量:" Grid.ColumnSpan="1" />
<TextBlock Text="20" Grid.Column="1" Grid.ColumnSpan="2"/>
</Grid>
-->
<!-- 已写入数量 -->
<!--
<Grid Grid.Row="5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="已写入数量:" />
<TextBlock Text="8" Grid.Column="1"/>
</Grid>
-->
<!-- 生产状态 -->
<!--
<Grid Grid.Row="6">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="生产状态:" />
<TextBlock Text="生产中" Style="{StaticResource ProducingTextStyle}" Grid.Column="1"/>
</Grid>
</Grid>
</Border>
-->
<!-- 实时RFID读写信息面板 -->
<!--
<Border Grid.Column="1" BorderThickness="1" BorderBrush="#E0E0E0"
CornerRadius="4" Margin="5,0,0,0">
<Grid Margin="10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="305*"/>
<ColumnDefinition Width="48*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
-->
<!-- 面板标题 -->
<!--
<StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,10" Grid.ColumnSpan="2">
<TextBlock Text="实时RFID读写信息" FontWeight="Bold" FontSize="15"/>
</StackPanel>
-->
<!-- RFID编码 -->
<!--
<Grid Grid.Row="1" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="RFID编码:" />
<TextBlock Text="S260402000112832604106 08" Grid.Column="1"/>
</Grid>
-->
<!-- 原始EPC -->
<!--
<Grid Grid.Row="2" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="原始EPC:" />
<TextBlock Text="303032313B312D34567890ABCD" Grid.Column="1"/>
</Grid>
-->
<!-- 读取时间 -->
<!--
<Grid Grid.Row="3" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="读取时间:" />
<TextBlock Text="2026-04-02 15:30:22" Grid.Column="1"/>
</Grid>
-->
<!-- 写入时间 -->
<!--
<Grid Grid.Row="4" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="写入时间:" />
<TextBlock Text="2026-04-02 15:30:23" Grid.Column="1"/>
</Grid>
-->
<!-- 写入状态 -->
<!--
<Grid Grid.Row="5" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="写入状态:" />
<TextBlock Text="写入成功" Style="{StaticResource SuccessTextStyle}" Grid.Column="1"/>
</Grid>
</Grid>
</Border>
</Grid>
</TabItem>-->
</TabControl>
@ -617,7 +389,6 @@ Content="查询" Width="200" Visibility="Hidden" FontSize="20" Command="{Binding
Foreground="Black" >
<DataGrid.Columns>
<!--<DataGridTextColumn Binding="{Binding SerialNumber}" Header="编号" Width="0.1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
<DataGridTextColumn Binding="{Binding OrderNumber}" Header="订单号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding LineNumber}" Header="产线号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding ProductType}" Header="产品类型" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
@ -625,7 +396,6 @@ Content="查询" Width="200" Visibility="Hidden" FontSize="20" Command="{Binding
<DataGridTextColumn Binding="{Binding RFIDCode}" Header="RFID编码" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding ReadTime}" Header="读取时间" Width="1.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding WriteTime}" Header="写入时间" Width="1.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<!--<DataGridTextColumn Binding="{Binding WriteStatus}" Header="写入状态" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />-->
<DataGridTemplateColumn Header="写入状态" Width="1*">
<DataGridTemplateColumn.CellStyle>
<Style TargetType="DataGridCell">
@ -674,52 +444,5 @@ Content="查询" Width="200" Visibility="Hidden" FontSize="20" Command="{Binding
</Border>
</ScrollViewer>
</Grid>
<!--</ScrollViewer>-->
<!-- 状态栏 -->
<!--<Border Grid.Row="2"
Background="#2C3E50"
Padding="20,8">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
-->
<!-- 系统状态 -->
<!--
<StackPanel Grid.Column="0" Orientation="Horizontal">
<Border Width="10"
Height="10"
CornerRadius="5"
Background="#4CAF50"
Margin="0,0,8,0"/>
<TextBlock Text="系统运行正常"
Foreground="White"
FontSize="12"/>
<TextBlock Text=" | "
Foreground="#BDC3C7"
Margin="8,0"/>
<TextBlock Text="数据更新时间："
Foreground="#BDC3C7"
FontSize="12"/>
<TextBlock x:Name="UpdateTimeText"
Text="::"
Foreground="White"
FontSize="12"
FontWeight="Bold"/>
</StackPanel>
-->
<!-- 版本信息 -->
<!--
<StackPanel Grid.Column="1" Orientation="Horizontal">
<TextBlock Text="版本：v1.0.0"
Foreground="#BDC3C7"
FontSize="12"/>
</StackPanel>
</Grid>
</Border>-->
</Grid>
</UserControl>

Write Preview
Loading…
Cancel
Save