diff --git a/MasaBlazorApp3/Pages/DrawerAdd.razor b/MasaBlazorApp3/Pages/DrawerAdd.razor
index ff6c9ee..5157be1 100644
--- a/MasaBlazorApp3/Pages/DrawerAdd.razor
+++ b/MasaBlazorApp3/Pages/DrawerAdd.razor
@@ -255,7 +255,6 @@
                         );
                         logger.Info($"抽屉打开失败");
                         RestData();
-                        PortUtil.Operate = false;
                         stop();
                     }
 
@@ -277,7 +276,6 @@
                             await GetWeightQuantity();
                         }
                         this.status = 3;
-                        PortUtil.Operate = false;
                         stop();
                     }
                     else
@@ -357,7 +355,8 @@
 
     void RestData()
     {
-        
+
+        PortUtil.Operate = false;
         PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
         this.status = 0;
         this.BeforeQuantity = new int[9];
diff --git a/MasaBlazorApp3/Pages/DrawerTake.razor b/MasaBlazorApp3/Pages/DrawerTake.razor
index bb7166d..81d8730 100644
--- a/MasaBlazorApp3/Pages/DrawerTake.razor
+++ b/MasaBlazorApp3/Pages/DrawerTake.razor
@@ -712,6 +712,7 @@
     void RestData()
     {
 
+        PortUtil.Operate = false;
         PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
         this.status = 0;
         this.BeforeQuantity = new int[9];
diff --git a/MasaBlazorApp3/Pages/Home.razor b/MasaBlazorApp3/Pages/Home.razor
index 1023ef2..3754be9 100644
--- a/MasaBlazorApp3/Pages/Home.razor
+++ b/MasaBlazorApp3/Pages/Home.razor
@@ -1,5 +1,7 @@
 @page "/"
+@using MasaBlazorApp3.Pojo.Config
 @using MasaBlazorApp3.Util
+@using Microsoft.Extensions.Options
 @using log4net
 @layout EmptyLayout
 
@@ -189,6 +191,7 @@
 
     Timer timer;
     @inject PortUtil _portUtil;
+    @inject IOptions<DrawerConfig> drawerSetting;
     private readonly ILog logger = LogManager.GetLogger(typeof(Home));
     @inject Microsoft.Extensions.Options.IOptions<Pojo.Config.SettingConfig> setting;
     bool currentPage = true;
@@ -321,10 +324,16 @@
             }
         }
     }
-    void logout()
+    async void logout()
     {
         if (globalStateService.Operator != null)
-        {
+        { //查询所有标签抽屉，设置标签灯为灭灯
+            int[] labels = drawerSetting.Value.label;
+            for (int i = 0; i < labels.Length; i++)
+            {
+                await _portUtil.setOffLight(labels[i]);
+            }
+            PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
             globalStateService.Operator = null;
             globalStateService.Reviewer = null;
         }
diff --git a/MasaBlazorApp3/Pages/InvoiceAddDialog.razor b/MasaBlazorApp3/Pages/InvoiceAddDialog.razor
index 69565e3..1c37b9c 100644
--- a/MasaBlazorApp3/Pages/InvoiceAddDialog.razor
+++ b/MasaBlazorApp3/Pages/InvoiceAddDialog.razor
@@ -189,6 +189,7 @@
 
     async Task CancelOpera()
     {
+        PortUtil.Operate = false;
         PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
         status = 0;
         dialogService.Close(false);
@@ -261,6 +262,7 @@
                         var b = await PortUtil.OpenDrawerStatusForErZhong(drawerNo);
                         if (b)
                         {
+                            PortUtil.Operate = true;
                             PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
                             PortUtil.SpeakAsync($"{drawerNo}号抽屉已经打开，请，加药");
                             options._data = 1;
@@ -421,7 +423,7 @@
 
     void RestData()
     {
-
+        PortUtil.Operate = true;
         this.status = 0;
         _flagList.Clear();
         this.ColNos.Clear();
diff --git a/MasaBlazorApp3/Pages/InvoiceOutDialog.razor b/MasaBlazorApp3/Pages/InvoiceOutDialog.razor
index 9abbbb7..2386e34 100644
--- a/MasaBlazorApp3/Pages/InvoiceOutDialog.razor
+++ b/MasaBlazorApp3/Pages/InvoiceOutDialog.razor
@@ -213,6 +213,7 @@
                         //         }
                         //     }
                         // }
+                        PortUtil.Operate = true;
                         var b = await PortUtil.OpenDrawerStatusForErZhong(drawerNo);
                         if (b)
                         {
@@ -381,7 +382,7 @@
 
     void RestData()
     {
-        
+        PortUtil.Operate=false;
         PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
         this.status = 0;
         this.BeforeQuantity = new int[9];
diff --git a/MasaBlazorApp3/Pages/LoginDialog.razor b/MasaBlazorApp3/Pages/LoginDialog.razor
index 4d0a203..e1d874d 100644
--- a/MasaBlazorApp3/Pages/LoginDialog.razor
+++ b/MasaBlazorApp3/Pages/LoginDialog.razor
@@ -1,4 +1,4 @@
-@page "/loginDialog"
+@page "/loginDialog";
 @using MasaBlazorApp3.Pojo.Config;
 @using MasaBlazorApp3.Pojo.Vo;
 @using MasaBlazorApp3.Util;
diff --git a/MasaBlazorApp3/Shared/MainLayout.razor b/MasaBlazorApp3/Shared/MainLayout.razor
index 8351429..0c194d6 100644
--- a/MasaBlazorApp3/Shared/MainLayout.razor
+++ b/MasaBlazorApp3/Shared/MainLayout.razor
@@ -1,9 +1,9 @@
 @namespace MasaBlazorApp3
 @using MasaBlazorApp3.Pojo.Config
 @using MasaBlazorApp3.Util
-@using Microsoft.Extensions.Options
-@using log4net
-@inherits LayoutComponentBase
+@using Microsoft.Extensions.Options;
+@using log4net;
+@inherits LayoutComponentBase;
 
 <style>
     .my-tab-menu {
diff --git a/MasaBlazorApp3/appsettings.json b/MasaBlazorApp3/appsettings.json
index d438930..d25db9f 100644
--- a/MasaBlazorApp3/appsettings.json
+++ b/MasaBlazorApp3/appsettings.json
@@ -24,7 +24,7 @@
     //"drawerProtocol": 485,
     "scanCodePortPath": "COM1",
     "canBusExsit": true,
-    "canBusPortPath": "COM33",
+    "canBusPortPath": "COM2",
     "totalDrawerCount": 16,
     "canBusTwoExsit": true,
     "StorageCan": 1,