Merge branch 'master' of http://192.168.0.12:13000/sc/SunlightAggregationTerminal
This commit is contained in:
commit
ee00cfd25f
6 files changed
+209
-36
No files matched your search
+124
-14
@@ -3,8 +3,10 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="SunlightAggregationTerminal.QueryPage"
|
||||
Title="">
|
||||
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
|
||||
<Border Grid.Row="0"
|
||||
<Grid>
|
||||
<VerticalStackLayout>
|
||||
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
|
||||
<Border Grid.Row="0"
|
||||
Grid.Column="0"
|
||||
Stroke="#CCCCCC"
|
||||
StrokeThickness="1"
|
||||
@@ -13,7 +15,7 @@
|
||||
Padding="0,0"
|
||||
VerticalOptions="Center"
|
||||
Margin="10,10,0,10">
|
||||
<Entry x:Name="ResultEntry"
|
||||
<Entry x:Name="ResultEntry"
|
||||
Grid.Row="0"
|
||||
Grid.Column="0"
|
||||
FontSize="Medium"
|
||||
@@ -21,23 +23,131 @@
|
||||
VerticalOptions="Center"
|
||||
BackgroundColor="Transparent"
|
||||
Margin="0,0,0,0" >
|
||||
</Entry>
|
||||
</Border>
|
||||
<!--扫码按钮-->
|
||||
<Button Grid.Row="0"
|
||||
</Entry>
|
||||
</Border>
|
||||
<!--扫码按钮-->
|
||||
<Button Grid.Row="0"
|
||||
Grid.Column="1"
|
||||
Clicked="OnScanButtonClicked"
|
||||
BackgroundColor="Transparent"
|
||||
WidthRequest="60"
|
||||
HeightRequest="60"
|
||||
Margin="10">
|
||||
<Button.ImageSource>
|
||||
<!-- 设置图标 -->
|
||||
<FileImageSource File="lucidescanline.png" />
|
||||
</Button.ImageSource>
|
||||
</Button>
|
||||
<VerticalStackLayout>
|
||||
|
||||
<Button.ImageSource>
|
||||
<!-- 设置图标 -->
|
||||
<FileImageSource File="lucidescanline.png" />
|
||||
</Button.ImageSource>
|
||||
</Button>
|
||||
</Grid>
|
||||
<StackLayout >
|
||||
|
||||
<HorizontalStackLayout>
|
||||
<DatePicker Format="yyyy年MM月dd日" FontSize="18"/>
|
||||
<Label Text="~" FontSize="32"/>
|
||||
<DatePicker Format="yyyy年MM月dd日" FontSize="18"/>
|
||||
<Button Text="搜索" Margin="5"/>
|
||||
</HorizontalStackLayout>
|
||||
|
||||
</StackLayout>
|
||||
|
||||
<Grid>
|
||||
<CollectionView x:Name="CardCollectionView"
|
||||
ItemsSource="{Binding DyelotItems}"
|
||||
RemainingItemsThreshold="5">
|
||||
<!-- 保持滚动条 -->
|
||||
<CollectionView.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<!-- 这里定义单个卡片的 UI 结构 -->
|
||||
<Border BackgroundColor="White"
|
||||
Stroke="#CCCCCC" StrokeThickness="1"
|
||||
Margin="10,0,10,10" StrokeShape="RoundRectangle 10">
|
||||
<Grid Padding="15">
|
||||
<VerticalStackLayout>
|
||||
<HorizontalStackLayout>
|
||||
<Label Text="工单: " FontAttributes="Bold" FontSize="22" TextColor="Black"/>
|
||||
<Label Text="{Binding Dyelot}" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
|
||||
</HorizontalStackLayout>
|
||||
<HorizontalStackLayout>
|
||||
<Label Text="机台: " FontAttributes="Bold" FontSize="22" TextColor="Black"/>
|
||||
<Label Text="{Binding Machine}" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
|
||||
</HorizontalStackLayout>
|
||||
<HorizontalStackLayout>
|
||||
<Label Text="下单时间: " FontAttributes="Bold" FontSize="22" TextColor="Black"/>
|
||||
<Label Text="{Binding CreationTime}" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
|
||||
</HorizontalStackLayout>
|
||||
<HorizontalStackLayout>
|
||||
<Label Text="面料: " FontAttributes="Bold" FontSize="22" TextColor="Black"/>
|
||||
<Label Text="{Binding FabricName}" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
|
||||
</HorizontalStackLayout>
|
||||
<HorizontalStackLayout>
|
||||
<Label Text="颜色: " FontAttributes="Bold" FontSize="22" TextColor="Black"/>
|
||||
<Label Text="{Binding ColorName}" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
|
||||
</HorizontalStackLayout>
|
||||
<HorizontalStackLayout>
|
||||
<Label Text="客户: " FontAttributes="Bold" FontSize="22" TextColor="Black"/>
|
||||
<Label Text="{Binding CustomerName}" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
|
||||
</HorizontalStackLayout>
|
||||
</VerticalStackLayout>
|
||||
</Grid>
|
||||
<Border.GestureRecognizers>
|
||||
<TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped"/>
|
||||
</Border.GestureRecognizers>
|
||||
</Border>
|
||||
</DataTemplate>
|
||||
</CollectionView.ItemTemplate>
|
||||
</CollectionView>
|
||||
|
||||
|
||||
|
||||
<CollectionView ItemsSource="{Binding Items}" IsVisible="False">
|
||||
<CollectionView.Header>
|
||||
<!-- 表头 -->
|
||||
<Grid BackgroundColor="Gray" Padding="10">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="2*" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Label Text="步骤" TextColor="White" FontAttributes="Bold" Grid.Column="0"/>
|
||||
<Label Text="物料" TextColor="White" FontAttributes="Bold" Grid.Column="1"/>
|
||||
<Label Text="状态" TextColor="White" FontAttributes="Bold" Grid.Column="2"/>
|
||||
<Label Text="实际" TextColor="White" FontAttributes="Bold" Grid.Column="3"/>
|
||||
<Label Text="时间" TextColor="White" FontAttributes="Bold" Grid.Column="4"/>
|
||||
</Grid>
|
||||
</CollectionView.Header>
|
||||
|
||||
<CollectionView.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<!-- 数据行 -->
|
||||
<Grid Padding="10" ColumnDefinitions="*,2*,*,*,*">
|
||||
<Label Text="{Binding Id}" Grid.Column="0"/>
|
||||
<Label Text="{Binding Name}" Grid.Column="1"/>
|
||||
<Label Text="{Binding Start}" Grid.Column="2"/>
|
||||
<Label Text="{Binding Value}" Grid.Column="3"/>
|
||||
<Label Text="{Binding date}" Grid.Column="4"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</CollectionView.ItemTemplate>
|
||||
</CollectionView>
|
||||
</Grid>
|
||||
</VerticalStackLayout>
|
||||
<!-- 查询中动画页面 -->
|
||||
<Grid x:Name="LoadingIndicator" BackgroundColor="Gray"
|
||||
IsVisible="False" Opacity="0.9">
|
||||
<VerticalStackLayout Padding="30" Spacing="10"
|
||||
VerticalOptions="Center"
|
||||
HorizontalOptions="Center">
|
||||
<ActivityIndicator IsRunning="True"
|
||||
Color="#512BD4"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Center" />
|
||||
<Label Text="查询中..."
|
||||
FontAttributes="Bold"
|
||||
FontSize="24"
|
||||
TextColor="Black"/>
|
||||
</VerticalStackLayout>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</ContentPage>
|
||||
Reference in new issue
Block a user