diff --git a/UserControls/DispenseMacInfo.xaml b/UserControls/DispenseMacInfo.xaml
index 7bdd78a..08c3392 100644
--- a/UserControls/DispenseMacInfo.xaml
+++ b/UserControls/DispenseMacInfo.xaml
@@ -38,8 +38,9 @@
             <Button x:Name="Manual" Content="{x:Static lang:Resources.Manual}" HorizontalAlignment="Right" Height="35" Margin="0,0,115,10" VerticalAlignment="Bottom" Width="80" Click="Manual_Click" Padding="0,4,0,4"/>
             <Button x:Name="Screen" Content="{x:Static lang:Resources.Screen}" HorizontalAlignment="Right" Height="35" Margin="0,0,215,10" VerticalAlignment="Bottom" Width="80" Click="Screen_Click" Padding="0,4,0,4"/>
 
-            <materialDesign:PackIcon x:Name="mlock" Kind="Lock" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="50" Height="50" Foreground="#FFA98C00" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"/>
-            
+            <materialDesign:PackIcon x:Name="mlock" Kind="Lock" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="40" Height="40" Foreground="#FFA98C00" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="0,0,0,5"/>
+            <materialDesign:PackIcon x:Name="Disconnect" Kind="LanDisconnect" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="40" Height="40" Foreground="#FFA98C00" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="50,0,0,5"/>
+
         </Grid>
         <TextBlock x:Name="IP" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Top" Foreground="{x:Null}"  />
         <TextBlock x:Name="PORT" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Top" Foreground="{x:Null}"  />
diff --git a/UserControls/DispenseMacInfo.xaml.cs b/UserControls/DispenseMacInfo.xaml.cs
index 27d0c38..72a4a2c 100644
--- a/UserControls/DispenseMacInfo.xaml.cs
+++ b/UserControls/DispenseMacInfo.xaml.cs
@@ -34,7 +34,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserControls
 
         private void State_Click(object sender, RoutedEventArgs e)//状态
         {
-            if (mlock.Visibility == Visibility.Visible)
+            if ((mlock.Visibility == Visibility.Visible) || (Disconnect.Visibility == Visibility.Visible))
             {
                 MessageBox.Show(Properties.Resources.Not_a,"Dispense",MessageBoxButton.OK);
                 return;
@@ -46,7 +46,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserControls
 
         private void Manual_Click(object sender, RoutedEventArgs e)//手动呼叫
         {
-            if (mlock.Visibility == Visibility.Visible)
+            if ((mlock.Visibility == Visibility.Visible) || (Disconnect.Visibility == Visibility.Visible))
             {
                 MessageBox.Show(Properties.Resources.Not_a, "Dispense", MessageBoxButton.OK);
                 return;
@@ -58,7 +58,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserControls
 
         private void Screen_Click(object sender, RoutedEventArgs e)//远程画面
         {
-            if (mlock.Visibility == Visibility.Visible)
+            if ((mlock.Visibility == Visibility.Visible)||(Disconnect.Visibility == Visibility.Visible))
             {
                 MessageBox.Show(Properties.Resources.Not_a, "Dispense", MessageBoxButton.OK);
                 return;
diff --git a/View/DispenseView.xaml.cs b/View/DispenseView.xaml.cs
index e1b9c16..927e0ec 100644
--- a/View/DispenseView.xaml.cs
+++ b/View/DispenseView.xaml.cs
@@ -70,7 +70,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 dispenseMacInfo[i].IP.Text = DispenseMac.AsEnumerable().Select(row => row.Field<string>("IP")).ElementAt(i);
                 dispenseMacInfo[i].USER.Text = DispenseMac.AsEnumerable().Select(row => row.Field<string>("User")).ElementAt(i);
                 dispenseMacInfo[i].PORT.Text = DispenseMac.AsEnumerable().Select(row => row.Field<int>("PORT")).ElementAt(i).ToString();
-                dispenseMacInfo[i].PASSWD.Text = DispenseMac.AsEnumerable().Select(row => row.Field<string>("Password")).ElementAt(i);
+                dispenseMacInfo[i].PASSWD.Text = DispenseMac.AsEnumerable().Select(row =>   row.Field<string>("Password")).ElementAt(i);
                 dispenseMacInfo[i].type_.Text = DispenseMac.AsEnumerable().Select(row => row.Field<int>("type")).ElementAt(i).ToString();
                 dispenseMacInfo[i].type_N.Text = StatenClassConvert.Convert(DispenseMac.AsEnumerable().Select(row => row.Field<int>("type")).ElementAt(i));
                 dispenseMacInfo[i].mac.Text = DispenseMac.AsEnumerable().Select(row => row.Field<string>("name")).ElementAt(i);
@@ -140,11 +140,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 dispenseMacInfo[i].WorkingStatus.Text = DispenseMac.AsEnumerable().Select(row => row.Field<string>("WorkingStatus")).ElementAt(i);
                 if (x == "899")
                 {
-                    dispenseMacInfo[i].state.Background = new SolidColorBrush(Color.FromRgb(255, 0, 0));
+                    dispenseMacInfo[i].state.Background = new SolidColorBrush(Color.FromRgb(255, 0, 0)); 
+                    dispenseMacInfo[i].Disconnect.Visibility = Visibility.Visible;
                 }
                 else
                 {
                     dispenseMacInfo[i].state.Background = new SolidColorBrush(Color.FromRgb(255, 255, 255));
+                    dispenseMacInfo[i].Disconnect.Visibility = Visibility.Collapsed;
                 }
                 if (y)
                 {