Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationTerminal
This commit is contained in:
commit
386a22cef0
3 files changed
+16
-2
No files matched your search
+10
-2
@@ -9,7 +9,7 @@
|
||||
<converters:StringToImageConverter x:Key="StringToImageConverter" />
|
||||
</ResourceDictionary>
|
||||
</ContentPage.Resources>
|
||||
<Grid RowDefinitions="Auto, *, *" ColumnDefinitions="*, Auto" >
|
||||
<Grid RowDefinitions="Auto, Auto, *" ColumnDefinitions="*, Auto" >
|
||||
<Grid BackgroundColor="#CCCCCC" Padding="10" Grid.Row="0" Grid.Column="0" >
|
||||
<HorizontalStackLayout>
|
||||
<!-- 图片 -->
|
||||
@@ -36,7 +36,7 @@
|
||||
</Grid>
|
||||
<!-- 选项 -->
|
||||
<Grid Grid.Row="1" Grid.Column="0" HeightRequest="50">
|
||||
<HorizontalStackLayout BackgroundColor="#F0F0F0" HeightRequest="50">
|
||||
<HorizontalStackLayout BackgroundColor="#F0F0F0">
|
||||
<Button Text="实时信息" Clicked="Button_real" BackgroundColor="Transparent" TextColor="Black"/>
|
||||
<Button Text="设备信息" Clicked="Button_machine" BackgroundColor="Transparent" TextColor="Black"/>
|
||||
<Button Text="执行历史" Clicked="Button_history" BackgroundColor="Transparent" TextColor="Black"/>
|
||||
@@ -116,6 +116,14 @@
|
||||
FontSize="22" TextColor="Black"/>
|
||||
<Label Text="{Binding Dyelot}" FontAttributes="Bold"
|
||||
FontSize="22" TextColor="Black"/>
|
||||
<Label Text="@" FontAttributes="Bold"
|
||||
FontSize="22" TextColor="Black"/>
|
||||
<Label Text="{Binding ReDye}" FontAttributes="Bold"
|
||||
FontSize="22" TextColor="Black"/>
|
||||
<Label Text=" 步骤" FontAttributes="Bold"
|
||||
FontSize="22" TextColor="Black"/>
|
||||
<Label Text="{Binding Step}" FontAttributes="Bold"
|
||||
FontSize="22" TextColor="Black"/>
|
||||
</HorizontalStackLayout>
|
||||
<HorizontalStackLayout>
|
||||
<Label Text="染机: " FontAttributes="Bold"
|
||||
|
||||
Reference in new issue
Block a user