更新大屏

BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj

@@ -19,7 +19,7 @@
 		</COMReference>
 	</ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BPA.CustomResource" Version="1.0.14" />
+    <PackageReference Include="BPA.CustomResource" Version="1.0.16" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1418.22" />
   </ItemGroup>
 

BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml

@@ -33,7 +33,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.IsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Foreground" Value="Lime"></Setter>
@@ -45,7 +45,7 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备是否运行</TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
                             <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
@@ -132,7 +132,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.IsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Foreground" Value="Lime"></Setter>
@@ -144,7 +144,7 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备是否运行</TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
                             <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>

BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2.xaml

@@ -33,7 +33,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.IsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_4,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Foreground" Value="Lime"></Setter>
@@ -45,7 +45,7 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备是否运行</TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
                             <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_4,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
@@ -131,7 +131,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.IsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_3,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Foreground" Value="Lime"></Setter>
@@ -143,7 +143,7 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备是否运行</TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
                             <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_3,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>

BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3.xaml

@@ -33,7 +33,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.IsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_6,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Foreground" Value="Lime"></Setter>
@@ -45,7 +45,7 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备是否运行</TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
                             <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_6,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
@@ -131,7 +131,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.IsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding ViewData.WorkStatus_5,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Foreground" Value="Lime"></Setter>
@@ -143,7 +143,7 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备是否运行</TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备工作状态</TextBlock>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
                             <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding ViewData.SplitMeals_CreditCardCount_5,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>

BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml

@@ -203,7 +203,7 @@
                                         <Setter Property="Foreground" Value="#FFD2C106"></Setter>
                                         <Setter Property="Text" Value="空闲"></Setter>
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewData.MorkS_NoodleUpOrDown_1}" Value="true">
+                                            <DataTrigger Binding="{Binding ViewData.Morks_NoodleUpOrDown[0]}" Value="true">
                                                 <Setter Property="Foreground" Value="Lime"/>
                                                 <Setter Property="Text" Value="煮面"></Setter>
                                             </DataTrigger>
@@ -220,7 +220,7 @@
                                         <Setter Property="Foreground" Value="#FFD2C106"></Setter>
                                         <Setter Property="Text" Value="空闲"></Setter>
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewData.MorkS_NoodleUpOrDown_2}" Value="true">
+                                            <DataTrigger Binding="{Binding ViewData..Morks_NoodleUpOrDown[1]}" Value="true">
                                                 <Setter Property="Foreground" Value="Lime"/>
                                                 <Setter Property="Text" Value="煮面"></Setter>
                                             </DataTrigger>
@@ -244,7 +244,7 @@
                                         <Setter Property="Foreground" Value="#FFD2C106"></Setter>
                                         <Setter Property="Text" Value="空闲"></Setter>
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewData.MorkS_NoodleUpOrDown_3}" Value="true">
+                                            <DataTrigger Binding="{Binding ViewData.Morks_NoodleUpOrDown[2]}" Value="true">
                                                 <Setter Property="Foreground" Value="Lime"/>
                                                 <Setter Property="Text" Value="煮面"></Setter>
                                             </DataTrigger>
@@ -261,7 +261,7 @@
                                         <Setter Property="Foreground" Value="#FFD2C106"></Setter>
                                         <Setter Property="Text" Value="空闲"></Setter>
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewData.MorkS_NoodleUpOrDown_4}" Value="true">
+                                            <DataTrigger Binding="{Binding ViewData.Morks_NoodleUpOrDown[3]}" Value="true">
                                                 <Setter Property="Foreground" Value="Lime"/>
                                                 <Setter Property="Text" Value="煮面"></Setter>
                                             </DataTrigger>
@@ -285,7 +285,7 @@
                                         <Setter Property="Foreground" Value="#FFD2C106"></Setter>
                                         <Setter Property="Text" Value="空闲"></Setter>
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewData.MorkS_NoodleUpOrDown_5}" Value="true">
+                                            <DataTrigger Binding="{Binding ViewData.Morks_NoodleUpOrDown[4]}" Value="true">
                                                 <Setter Property="Foreground" Value="Lime"/>
                                                 <Setter Property="Text" Value="煮面"></Setter>
                                             </DataTrigger>
@@ -302,7 +302,7 @@
                                         <Setter Property="Foreground" Value="#FFD2C106"></Setter>
                                         <Setter Property="Text" Value="空闲"></Setter>
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewData.MorkS_NoodleUpOrDown_6}" Value="true">
+                                            <DataTrigger Binding="{Binding ViewData.Morks_NoodleUpOrDown[5]}" Value="true">
                                                 <Setter Property="Foreground" Value="Lime"/>
                                                 <Setter Property="Text" Value="煮面"></Setter>
                                             </DataTrigger>
@@ -345,10 +345,18 @@
                                         <Setter Property="Foreground" Value="#a70909"></Setter>
                                         <Setter Property="Text" Value="缺碗"></Setter>
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewData.MorkS_NoBowMeas}" Value="true">
+                                            <DataTrigger Binding="{Binding ViewData.MorkS_NoBowMeas1}" Value="true">
                                                 <Setter Property="Foreground" Value="Lime"/>
                                                 <Setter Property="Text" Value="充足"></Setter>
                                             </DataTrigger>
+                                            <DataTrigger Binding="{Binding ViewData.MorkS_NoBowMeas1}" Value="false">
+                                                <Setter Property="Foreground" Value="#a70909"/>
+                                                <Setter Property="Text" Value="缺大碗"></Setter>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding ViewData.MorkS_NoBowMeas2}" Value="false">
+                                                <Setter Property="Foreground" Value="#a70909"/>
+                                                <Setter Property="Text" Value="缺小碗"></Setter>
+                                            </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
                                 </TextBlock.Style>
@@ -375,7 +383,7 @@
                                         <Setter Property="Foreground" Value="#a70909"></Setter>
                                         <Setter Property="Text" Value="缺面"></Setter>
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ViewData.MorkS_SiloMeas}" Value="true">
+                                            <DataTrigger Binding="{Binding ViewData.Morks_SiloMeasDown}" Value="true">
                                                 <Setter Property="Foreground" Value="Lime"/>
                                                 <Setter Property="Text" Value="充足"></Setter>
                                             </DataTrigger>

BeDesignerSCADA/Converters/MathAbsConverter.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeDesignerSCADA.Converters
+{
+    [ValueConversion(typeof(float), typeof(float))]
+    public class MathAbsConverter : IValueConverter
+    {
+        static MathAbsConverter()
+        {
+            Instance = new MathAbsConverter();
+        }
+
+        public static MathAbsConverter Instance
+        {
+            get;
+            private set;
+        }
+
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            return Math.Abs((float)value);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

WpfTest/MainWindow.xaml.cs

@@ -250,17 +250,18 @@ namespace WpfTest
                     },
                     MorkS_OrderCount = new Random().Next(0, 100),
                     MorkS_ErrorOrderCount = new Random().Next(0, 100),
-                    MorkS_NoodleUpOrDown_1 = k2 == 0 ? "true" : "false",
-                    MorkS_NoodleUpOrDown_2 = k2 == 0 ? "true" : "false",
-                    MorkS_NoodleUpOrDown_3 = k2 == 0 ? "true" : "false",
-                    MorkS_NoodleUpOrDown_4 = k2 == 0 ? "true" : "false",
-                    MorkS_NoodleUpOrDown_5 = k2 == 0 ? "true" : "false",
-                    MorkS_NoodleUpOrDown_6 = k2 == 0 ? "true" : "false",
+                    Morks_NoodleUpOrDown = new bool[] {
+                    true,true,true,true,false,true
+                    },
+
+                    MorkS_Temp = false,// k2 == 0 ? "true" : "false",
+                    MorkS_BinLocation = new Random().Next(0, 6),
+                    Morks_SiloMeasUp = k2 == 0 ,
+                    Morks_SiloMeasDown = k2 == 0,
+                    MorkS_NoBowMeas1= new Random().Next(0, 2)==1,
+                    MorkS_NoBowMeas2 = new Random().Next(0, 2) == 1,
+
 
-                    MorkS_Temp = "false",// k2 == 0 ? "true" : "false",
-                    MorkS_BinLocation = new Random().Next(0, 6).ToString(),
-                    MorkS_SiloMeas = k2 == 0 ? "true" : "false",
-                    MorkS_NoBowMeas = k2 == 0 ? "true" : "false",
                     MakeOrder = new List<OrderMakeModel> {
                     new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.WAIT, SortNum="007".ToString()},
                     new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.WAIT, SortNum="008".ToString()},
@@ -284,6 +285,15 @@ namespace WpfTest
                 {
                     IsRun = k2 == 0 ? IsRun.运行 : IsRun.停止,
                     WorkStatus = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+                    WorkStatus_1 = WorkStatus.待机,
+                    WorkStatus_2 = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+                    WorkStatus_3 = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+                    WorkStatus_4 = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+                    WorkStatus_5 = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+                    WorkStatus_6 = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+                    RobotStatu1= k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+                    RobotStatu2 = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+
                     RobotStatu = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
                     //Alarm = new List<AlarmModel> {
                     //    new AlarmModel { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },

WpfTest/WpfTest.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.CustomResource" Version="1.0.14" />
+    <PackageReference Include="BPA.CustomResource" Version="1.0.16" />
   </ItemGroup>
 
 </Project>