From 316d98242f7298830ae74f7537f55bf6c6fafd03 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Wed, 9 Apr 2025 09:20:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=AE=9A=E6=B7=BB=E5=8A=A0=E8=AF=AD?=
 =?UTF-8?q?=E9=9F=B3=E6=8F=90=E7=A4=BA;=E9=A1=B5=E9=9D=A2=E7=BA=A2?=
 =?UTF-8?q?=E8=89=B2=E5=AD=97=E6=98=BE=E7=A4=BA=EF=BC=9BMainWindow?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=A7=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/ViewModels/BiaoDingDialogViewModel.cs | 3 ++-
 DM_Weight/Views/Dialog/BiaoDingDialog.xaml      | 2 +-
 DM_Weight/Views/MainWindow.xaml                 | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/DM_Weight/ViewModels/BiaoDingDialogViewModel.cs b/DM_Weight/ViewModels/BiaoDingDialogViewModel.cs
index 3fc235f..473ca3a 100644
--- a/DM_Weight/ViewModels/BiaoDingDialogViewModel.cs
+++ b/DM_Weight/ViewModels/BiaoDingDialogViewModel.cs
@@ -114,12 +114,13 @@ namespace DM_Weight.ViewModels
                 if (channelStock.Quantity > 0)
                 {
                     StrMessage = "库位库存不为零，请取出药品后点击【清空】按钮，清空完成后输入标定数量并放入对应数量药品并根据下一步提示操作";
-
+                    _portUtil.SpeakAsync("请取出药品后点击【清空】按钮,清空完成后放入药品输入标定数量点击标定按钮");
                 }
                 else
                 {
                     Status = 1;
                     StrMessage = "正在清零，清零完成后输入标定数量并放入对应数量药品后点击【标定】按钮";
+                    _portUtil.SpeakAsync("清零完成后输入数量并放入对应数量药品后点击【标定】按钮");
                     ClearMethod();
 
                 }
diff --git a/DM_Weight/Views/Dialog/BiaoDingDialog.xaml b/DM_Weight/Views/Dialog/BiaoDingDialog.xaml
index ccbfba6..f535a8a 100644
--- a/DM_Weight/Views/Dialog/BiaoDingDialog.xaml
+++ b/DM_Weight/Views/Dialog/BiaoDingDialog.xaml
@@ -37,7 +37,7 @@
             </Grid>
 
             <StackPanel Grid.Row="1" Margin="0">
-                <TextBlock Text="{Binding StrMessage}" Margin="12" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" />
+                <TextBlock Text="{Binding StrMessage}" Foreground="Red" Margin="12" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" />
                 <TextBox Height="50" Width="200"
 Grid.Column="1"
 materialDesign:HintAssist.Hint="标定数量"
diff --git a/DM_Weight/Views/MainWindow.xaml b/DM_Weight/Views/MainWindow.xaml
index 8de71ab..48b3868 100644
--- a/DM_Weight/Views/MainWindow.xaml
+++ b/DM_Weight/Views/MainWindow.xaml
@@ -18,10 +18,10 @@
         WindowStartupLocation="CenterScreen"
         Topmost="False"
         prism:ViewModelLocator.AutoWireViewModel="True"
-        Title="主窗口" Height="768" Width="1024" WindowStyle="None" WindowState="Maximized">
-    <WindowChrome.WindowChrome>
-        <WindowChrome CornerRadius="4" GlassFrameThickness="1" />
-    </WindowChrome.WindowChrome>
+        Title="主窗口" WindowStyle="None" WindowState="Maximized">
+    <!--<WindowChrome.WindowChrome>
+        <WindowChrome CornerRadius="4" GlassFrameThickness="0" />
+    </WindowChrome.WindowChrome>-->
     
     <materialDesign:DialogHost
         DialogMargin="0"