修改监控部分功能

SamplePreSystem.UI/Views/MonitorManager/MonitorView.xaml

@@ -6,6 +6,7 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:local="clr-namespace:SamplePre.UIWpf.SampleManager"
+    xmlns:cnt="clr-namespace:SamplePreSystem.UI.Converters"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pro="clr-namespace:SamplePreSystem.UI.BaseControls"
@@ -13,6 +14,11 @@
     d:DesignWidth="800"
     Background="#E6E6E6"
     mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <cnt:CommunicationColorConverter x:Key="CommunicationColorConverter" />
+    </UserControl.Resources>
+    
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
@@ -58,6 +64,9 @@
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
 
+                            <Border Width="12" Height="12" Style="{StaticResource ColorBreathStyle}" Background="{Binding TxtState, Converter={StaticResource CommunicationColorConverter}}" CornerRadius="90"/>
+                            <TextBlock Text="{Binding TxtState}" FontSize="13" VerticalAlignment="Center" Margin="5,0,30,0"/>
+
                             <Button
                                 Width="80"
                                 Height="25"
@@ -200,9 +209,9 @@
                             Text="样品进度" />
                         <Grid Grid.Row="1">
                             <StackPanel HorizontalAlignment="Left">
-                                <TextBlock Margin="5" Text="当前SOP：DCM固相萃取" />
-                                <TextBlock Margin="5" Text="当前样品：xxx" />
-                                <TextBlock Margin="5" Text="当前步骤：离心" />
+                                <TextBlock Margin="5" Text="{Binding SopProgress.sopName, StringFormat= 当前SOP：{0}}" />
+                                <TextBlock Margin="5" Text="{Binding SopProgress.sampleName, StringFormat= 样品名称：{0}}" />
+                                <TextBlock Margin="5" Text="{Binding SopProgress.actionName, StringFormat= 当前动作：{0}}" />
                                 <TextBlock />
                             </StackPanel>
                             <pro:RingProgressBar
@@ -211,7 +220,7 @@
                                 Height="200"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Progress="{Binding CurrentPercent}" />
+                                Progress="{Binding SopProgress.CurrentPercent}" />
                             <TextBlock
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
@@ -273,10 +282,7 @@
                                     Binding="{Binding state}"
                                     Header="状态" />
 
-                                <DataGridTextColumn
-                                    Width="*"
-                                    Binding="{Binding sapmleName}"
-                                    Header="样品名称" />
+                              
                                 <DataGridTextColumn
                                     Width="*"
                                     Binding="{Binding actionName}"