From 1c91715d36915afa70282a69bf940cff862016f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=B7=A7?= <625215135@qq.com>
Date: Wed, 30 Jul 2025 17:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MasaBlazorApp3/Pages/Home.razor              | 61 ++++++++++----------
 MasaBlazorApp3/Pages/OrderDetailDialog.razor |  1 -
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/MasaBlazorApp3/Pages/Home.razor b/MasaBlazorApp3/Pages/Home.razor
index b8758b8..8073d35 100644
--- a/MasaBlazorApp3/Pages/Home.razor
+++ b/MasaBlazorApp3/Pages/Home.razor
@@ -45,47 +45,48 @@
         </RadzenColumn>
         <RadzenColumn Size="8">
             <RadzenRow Style="height: 100%;width:100%" Orientation="Orientation.Horizontal" JustifyContent="JustifyContent.End" AlignItems="AlignItems.Center">
-                <RadzenColumn Size="3">
+                <RadzenColumn Size="2">
                     @if (globalStateService.Operator != null)
                     {
                         //<RadzenText Style="" class="rz-color-white" TextStyle="TextStyle.H5" TextAlign="TextAlign.Center">操作人：@globalStateService.Operator.NickName</RadzenText>
                         //<RadzenText onclick="@(() => { EditPassword(1); })" Style="" class="rz-color-white" TextStyle="TextStyle.H5" TextAlign="TextAlign.Center">操作人：@globalStateService.Operator.NickName</RadzenText>
 
-                        <RadzenProfileMenu prefix="" Click="MenuClick">
-                                <Template>
-                                    <RadzenText Style="" class="rz-color-white" TextStyle="TextStyle.H5" TextAlign="TextAlign.Center">操作人：@globalStateService.Operator.NickName</RadzenText>
-                                </Template>
-                                <ChildContent>
-                                <RadzenProfileMenuItem Text="录入指纹" Value="11" Icon="account_circle"></RadzenProfileMenuItem>
+                        <RadzenProfileMenu prefix="" Click="MenuClick" Style="background-color:transparent;z-index:99">
+                            <Template>
+                                <RadzenText Style="" class="rz-color-white" TextStyle="TextStyle.H5" TextAlign="TextAlign.Center">操作人：@globalStateService.Operator.NickName</RadzenText>
+                            </Template>
+                            <ChildContent>
+                                <RadzenProfileMenuItem Text="录入指纹" Value="11" Icon="fingerprint"></RadzenProfileMenuItem>
                                 <RadzenProfileMenuItem Text="录入签名" Value="21" Icon="line_weight"></RadzenProfileMenuItem>
                                 <RadzenProfileMenuItem Text="修改密码" Value="31" Icon="password"></RadzenProfileMenuItem>
-                                </ChildContent>
-                            </RadzenProfileMenu>
+                            </ChildContent>
+                        </RadzenProfileMenu>
                     }
                     @if (globalStateService.Reviewer != null)
                     {
                         //<RadzenText Style="" class="rz-color-white" TextStyle="TextStyle.H5" TextAlign="TextAlign.Center">复核人：@globalStateService.Reviewer.NickName</RadzenText>
                         //<RadzenText onclick="@(() => { EditPassword(2); })" Style="" class="rz-color-white" TextStyle="TextStyle.H5" TextAlign="TextAlign.Center">复核人：@globalStateService.Reviewer.NickName</RadzenText>
-                        <RadzenProfileMenu prefix="" Click="MenuClick">
-                                <Template>
-                                    <RadzenText Style="" class="rz-color-white" TextStyle="TextStyle.H5" TextAlign="TextAlign.Center">操作人：@globalStateService.Operator.NickName</RadzenText>
-                                </Template>
-                                <ChildContent>
-                                <RadzenProfileMenuItem Text="录入指纹" Value="12" Path="fingerprint" Icon="account_circle"></RadzenProfileMenuItem>
-                                <RadzenProfileMenuItem Text="录入签名" Value="22" Path="edit_document" Icon="line_weight"></RadzenProfileMenuItem>
+                        <RadzenProfileMenu prefix="" Click="MenuClick" Style="background-color:transparent">
+                            <Template>
+                                <RadzenText Style="" class="rz-color-white" TextStyle="TextStyle.H5" TextAlign="TextAlign.Center">复核人：@globalStateService.Reviewer.NickName</RadzenText>
+                            </Template>
+                            <ChildContent>
+                                <RadzenProfileMenuItem Text="录入指纹" Value="12" Icon="fingerprint"></RadzenProfileMenuItem>
+                                <RadzenProfileMenuItem Text="录入签名" Value="22" Icon="line_weight"></RadzenProfileMenuItem>
                                 <RadzenProfileMenuItem Text="修改密码" Value="32" Icon="password"></RadzenProfileMenuItem>
-                                </ChildContent>
-                            </RadzenProfileMenu>
+                            </ChildContent>
+                        </RadzenProfileMenu>
                     }
                 </RadzenColumn>
                 <RadzenColumn Size="3">
-                    <div>
-                        <RadzenIcon Icon="compare_arrows" Style="font-size:3rem;cursor: pointer;" class="rz-ripple" IconColor="white" @onclick="@(() => { changeShifts(); })" />
-                        <span>交接班</span>
+                    <div @onclick="@(() => { changeShifts(); })">
+                        <RadzenIcon Icon="compare_arrows" Style="font-size:3rem;cursor: pointer;" class="rz-ripple" IconColor="white" />
+                        <div>交接班</div>
                     </div>
+                    <div style="clear:both"></div>
                 </RadzenColumn>
                 <RadzenColumn Size="2">
-                    <RadzenIcon Icon="exit_to_app" Style="font-size:3rem;cursor: pointer;" class="rz-ripple" IconColor="white" @onclick="@(() => { logout(); })" />
+                    <RadzenIcon Icon="exit_to_app" Style="font-size:3rem;cursor: pointer;margin-left:-60px" class="rz-ripple" IconColor="white" @onclick="@(() => { logout(); })" />
                 </RadzenColumn>
             </RadzenRow>
         </RadzenColumn>
@@ -106,7 +107,7 @@
                 }
             </RadzenStack>
             <RadzenStack Orientation="Orientation.Horizontal" Style="height: 50%;width:100%">
-                <RadzenStack class="home-menu rz-background-color-success-light rz-text-white rz-ripple" JustifyContent="JustifyContent.Center" @onclick="@(() => jump2Page(2))"  Style="height: 100%;width:50%">
+                <RadzenStack class="home-menu rz-background-color-success-light rz-text-white rz-ripple" JustifyContent="JustifyContent.Center" @onclick="@(() => jump2Page(2))" Style="height: 100%;width:50%">
                     <RadzenText class="rz-color-white" TextStyle="TextStyle.H2" TextAlign="TextAlign.Center">入库</RadzenText>
                     @if (globalStateService.Operator != null)
                     {
@@ -337,10 +338,10 @@
     }
     async void MenuClick(RadzenProfileMenuItem item)
     {
-        
-        string strValue= item.Value.Substring(0,1);
+
+        string strValue = item.Value.Substring(0, 1);
         Pojo.User user = new Pojo.User();
-        switch(strValue)
+        switch (strValue)
         {
             case "1":
                 int userId = 0;
@@ -359,8 +360,8 @@
             );
                 break;
             case "2":
-                if (item.Value=="21")
-                { 
+                if (item.Value == "21")
+                {
                     user = globalStateService.Operator;
                 }
                 else
@@ -383,10 +384,10 @@
                 {
                     user = globalStateService.Reviewer;
                 }
-                int userI =Convert.ToInt32(item.Value.Substring(1, 1));
+                int userI = Convert.ToInt32(item.Value.Substring(1, 1));
                 await dialogService.OpenAsync<EditPasswordDialog>(
                    $"修改密码-{user.Username}",
-                   new Dictionary<string, object>() { { "userI",userI} },
+                   new Dictionary<string, object>() { { "userI", userI } },
                    new DialogOptions() { Width = "55vw", Resizable = false, Draggable = false, ShowClose = false, ShowTitle = true }
                 );
                 break;
diff --git a/MasaBlazorApp3/Pages/OrderDetailDialog.razor b/MasaBlazorApp3/Pages/OrderDetailDialog.razor
index b18f47f..5aa9395 100644
--- a/MasaBlazorApp3/Pages/OrderDetailDialog.razor
+++ b/MasaBlazorApp3/Pages/OrderDetailDialog.razor
@@ -196,7 +196,6 @@
                             PortUtil.AllLightOff();
                             if (options._data == drawerNos.Count - 1)
                             {
-                                PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
                                 PortUtil.speechSynthesizer.SpeakAsyncCancelAll();
                                 PortUtil.SpeakAsync($"取药完成，请，点击完成按钮进行确认");
                                 this.status = 2;