Compare commits

...
8 Commits
5 changed files with 46 additions and 12 deletions

No files matched your search

+13 -2
View File
@@ -4,8 +4,19 @@
x:Class="SunlightAggregationTerminal.InfoChemicalStatistics"
Title="耗用统计">
<Grid>
<Grid>
<CollectionView x:Name="CardCollectionView">
<Grid RowDefinitions="Auto, *" >
<Grid ColumnDefinitions="*, Auto" Grid.Row="0" Grid.Column="0" Margin="5">
<HorizontalStackLayout Grid.Row="0" Grid.Column="0" Margin="5,0,0,0" >
<DatePicker x:Name="StartTime" Format="yyyy年MM月dd日" FontSize="16"
MaximumWidthRequest="150" MinimumWidthRequest="130" WidthRequest="135"/>
<Label Text="~" FontSize="28"/>
<DatePicker x:Name="EndTime" Format="yyyy年MM月dd日" FontSize="16"
MaximumWidthRequest="150" MinimumWidthRequest="130" WidthRequest="135"/>
</HorizontalStackLayout>
<Button Grid.Row="0" Grid.Column="1" Text="查询" Clicked="Button_Clicked"
WidthRequest="60" Padding="5,0,5,0" Margin="20,0,0,5" />
</Grid>
<CollectionView Grid.Row="1" x:Name="CardCollectionView">
<!-- 保持滚动条 -->
<CollectionView.ItemTemplate>
<DataTemplate>
+17
View File
@@ -22,6 +22,10 @@ public partial class InfoChemicalStatistics : ContentPage
InitializeComponent();
Dictionary<string, object> Dictionary = new Dictionary<string, object>();
Dictionary.Add("Command", "ChemicalStatistics");
DateTime StartTimee_ = (DateTime)StartTime.Date!;
Dictionary.Add("StartTime", StartTimee_.ToString("yyyy-MM-dd"));
DateTime EndTime_ = (DateTime)EndTime.Date!;
Dictionary.Add("EndTime", EndTime_.AddDays(1).ToString("yyyy-MM-dd"));
Total_Command(Dictionary.ToJsonString());
}
@@ -49,6 +53,7 @@ public partial class InfoChemicalStatistics : ContentPage
LoadingIndicator.IsVisible = false;
}
public static void Total_data(string dat)
{
try
@@ -69,4 +74,16 @@ public partial class InfoChemicalStatistics : ContentPage
{
}
}
//搜索按钮
private void Button_Clicked(object sender, EventArgs e)
{
Dictionary<string, object> Dictionary = new Dictionary<string, object>();
Dictionary.Add("Command", "ChemicalStatistics");
DateTime StartTimee_ = (DateTime)StartTime.Date!;
Dictionary.Add("StartTime", StartTimee_.ToString("yyyy-MM-dd"));
DateTime EndTime_ = (DateTime)EndTime.Date!;
Dictionary.Add("EndTime", EndTime_.AddDays(1).ToString("yyyy-MM-dd"));
Total_Command(Dictionary.ToJsonString());
}
}
+4 -3
View File
@@ -27,12 +27,13 @@
</Button>
<HorizontalStackLayout Grid.Row="1" Grid.Column="0" Margin="5,0,0,0" >
<DatePicker x:Name="StartTime" Format="yyyy年MM月dd日" FontSize="16"
MaximumWidthRequest="150" MinimumWidthRequest="130" WidthRequest="145"/>
MaximumWidthRequest="150" MinimumWidthRequest="130" WidthRequest="135"/>
<Label Text="~" FontSize="28"/>
<DatePicker x:Name="EndTime" Format="yyyy年MM月dd日" FontSize="16"
MaximumWidthRequest="150" MinimumWidthRequest="130" WidthRequest="145"/>
MaximumWidthRequest="150" MinimumWidthRequest="130" WidthRequest="135"/>
</HorizontalStackLayout>
<Button Grid.Row="1" Grid.Column="1" Text="搜索" Clicked="Button_Clicked" Padding="30,0,30,0" Margin="0,0,10,5" />
<Button Grid.Row="1" Grid.Column="1" Text="搜索" Clicked="Button_Clicked"
WidthRequest="60" Padding="5,0,5,0" Margin="20,0,0,5" />
</Grid>
<Grid Grid.Row="1" Grid.Column="0">
+7 -2
View File
@@ -35,12 +35,16 @@ public partial class QueryPage : ContentPage
CardCollectionView.ItemsSource = DyelotItems;
}
//扫码按钮
private async void OnScanButtonClicked(object sender, EventArgs e)
{
ResultEntry.Text = "";
// 跳转到扫码页面
await Navigation.PushAsync(new ScanPage(0));
}
//打开单个选项卡
private async void TapGestureRecognizer_Tapped(object sender, TappedEventArgs e)
{
if (sender is Microsoft.Maui.Controls.BindableObject bindable)
@@ -52,6 +56,7 @@ public partial class QueryPage : ContentPage
await Navigation.PushAsync(new QueryDetail(item));
}
}
ResultEntry.Text = "";
}
//信息回复
@@ -105,7 +110,7 @@ public partial class QueryPage : ContentPage
private void Button_Clicked(object sender, EventArgs e)
{
if (ResultEntry.Text != null)
if (ResultEntry.Text.Length >0)
{
Dictionary<string, object> QueryDictionary = new Dictionary<string, object>();
QueryDictionary.Add("Command", "QueryDyelot");
@@ -113,7 +118,7 @@ public partial class QueryPage : ContentPage
"[Batch],[OrderNo],[TotalWeight],[LiquidRatio],[TotalVolume],[Final],[UserAccount]," +
"[FabricName],[ColorName],[CustomerName],[Notes]");
QueryDictionary.Add("DyelotName", ResultEntry.Text);
Query_Command(QueryDictionary.ToJsonString());
Query_Command(QueryDictionary.ToJsonString());
}
else
{
+5 -5
View File
@@ -92,13 +92,13 @@
<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.7" />
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.51" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.7" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.10" />
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.80" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.10" />
<PackageReference Include="TouchSocket" Version="4.2.10" />
<PackageReference Include="TouchSocket.Http" Version="4.2.10" />
<PackageReference Include="ZXing.Net.Maui.Controls" Version="0.7.4" />
<PackageReference Include="ZXing.Net.Maui.Controls" Version="0.10.3" />
</ItemGroup>
<ItemGroup>