Ver a proveniência

1

样式分支
fyf há 1 ano
ascendente
cometimento
7af19f5977
6 ficheiros alterados com 9 adições e 9 eliminações
  1. +1
    -1
      BPASmartClient.ScreenLib/AppMain.cs
  2. +3
    -3
      BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml
  3. +1
    -1
      BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs
  4. +1
    -1
      BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControlViewModel.cs
  5. +1
    -1
      BPASmartClient.ScreenLib/炒锅/ScreenMinWokControlViewModel.cs
  6. +2
    -2
      WpfTest/MainWindow.xaml.cs

+ 1
- 1
BPASmartClient.ScreenLib/AppMain.cs Ver ficheiro

@@ -18,7 +18,7 @@ namespace BPASmartClient.ScreenLib
Main.GetInstance.Start();
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
FSystemHelper.GetInstance.CreateDesktopShortcut();
FSystemHelper.GetInstance.AutoStart(true);
// FSystemHelper.GetInstance.AutoStart(true);
WindowLargeScreen windowLarge = new WindowLargeScreen();
#region 设置显示页面与标题
string TitleName = $"{type.Assembly.ManifestModule.Name.Replace(".dll", "")}";


+ 3
- 3
BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml Ver ficheiro

@@ -322,7 +322,7 @@
</Grid>
</StackPanel>
</GroupBox>
<GroupBox Grid.Row="0" Margin="10,10,10,0" Height="310" Width="450" Header="煮面设备 MorkS" Style="{DynamicResource from}" Tag="Start">
<GroupBox Grid.Row="0" Margin="10,10,10,0" Height="320" Width="450" Header="煮面设备 MorkS" Style="{DynamicResource from}" Tag="Start">
<StackPanel>
<GroupBox Header="设备信息" Margin="20,0,0,0"/>
<Grid Height="80" >
@@ -389,7 +389,7 @@
</StackPanel>
<Grid Grid.Column="1" >
<Grid> <Grid VerticalAlignment="Top" Margin="0,-30,0,0"> <Image Style="{DynamicResource imagezhu}"></Image> <Image Style="{DynamicResource image中1}" Margin="0,400,0,0"></Image> <GroupBox Margin="600,100,0,500" Header="{Binding GZallCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="累计故障数" Content="次" Width="100"/> <GroupBox Margin="600,400,0,0" Header="{Binding SplitMealsCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="食堂累计刷卡次数" Content="次" Width="160"/> <GroupBox Margin="-500,100,0,0" Header="{Binding UserCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="日总接待人数" Content="人" Width="160"/> </Grid> <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="信息通知区域" VerticalAlignment="Bottom" Style="{DynamicResource from}">
<Grid> <Grid VerticalAlignment="Top" Margin="0,-30,0,0"> <Image Style="{DynamicResource imagezhu}"></Image> <Image Style="{DynamicResource image中1}" Margin="0,400,0,0"></Image> <GroupBox Margin="600,100,0,500" Header="{Binding GZallCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="累计故障数" Content="次" Width="100"/> <GroupBox Margin="600,400,0,0" Header="{Binding SplitMealsCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="食堂累计刷卡次数" Content="次" Width="160"/> <GroupBox Margin="-500,100,0,0" Header="{Binding UserCout,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource GroupStyle圆形}" Tag="日总接待人数" Content="人" Width="160"/> </Grid> <GroupBox Margin="0,0,0,0" Height="320" Width="950" Header="信息通知区域" VerticalAlignment="Bottom" Style="{DynamicResource from}">
<!--<ListBox Margin="10,-10,10,10" ScrollViewer.VerticalScrollBarVisibility="Disabled" ItemsSource="{Binding AlarmAll,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
<ListBox.ItemTemplate>
<DataTemplate>
@@ -502,7 +502,7 @@
</StackPanel>
</GroupBox>
<GroupBox Margin="10,10,10,0" Height="640" Width="450" Header="今日商品热销统计" Style="{DynamicResource from}">
<GroupBox Margin="10,10,10,0" Height="650" Width="450" Header="今日商品热销统计" Style="{DynamicResource from}">
<ListBox
Background="Transparent"
BorderThickness="0"


+ 1
- 1
BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs Ver ficheiro

@@ -237,7 +237,7 @@ namespace BPASmartClient.ScreenLib
StatsCountAll= JsonConvert.DeserializeObject<ObservableCollection<StatsAllModel>>(str);
}
}));
Thread.Sleep(100);
Thread.Sleep(1000);
}), $"{DateTime.Now},线程服务");
}
}


+ 1
- 1
BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControlViewModel.cs Ver ficheiro

@@ -103,7 +103,7 @@ namespace BPASmartClient.ScreenLib
OrderCount = modelMaxWok.MaxWok_OrderCount_1 + modelMaxWok.MaxWok_OrderCount_2;
}
}));
Thread.Sleep(100);
Thread.Sleep(1000);
}), $"{DateTime.Now},线程服务");
}
}


+ 1
- 1
BPASmartClient.ScreenLib/炒锅/ScreenMinWokControlViewModel.cs Ver ficheiro

@@ -102,7 +102,7 @@ namespace BPASmartClient.ScreenLib

}
}));
Thread.Sleep(100);
Thread.Sleep(1000);
}), $"{DateTime.Now},线程服务");
}
}


+ 2
- 2
WpfTest/MainWindow.xaml.cs Ver ficheiro

@@ -56,13 +56,13 @@ namespace WpfTest
if (IsRunningMqtt)
{
Send(ScreenDeviceType.大炒);
Thread.Sleep(1000);
Send(ScreenDeviceType.小炒); Thread.Sleep(1000);

Send(ScreenDeviceType.煮面机); Thread.Sleep(1000);

Send(ScreenDeviceType.分餐机); Thread.Sleep(1000);
Thread.Sleep(3000);
}
}
catch (Exception ex)


Carregando…
Cancelar
Guardar