标定添加语音提示;页面红色字显示;MainWindow不可移动
This commit is contained in:
		
							parent
							
								
									86f06ce191
								
							
						
					
					
						commit
						316d98242f
					
				| 
						 | 
				
			
			@ -114,12 +114,13 @@ namespace DM_Weight.ViewModels
 | 
			
		|||
                if (channelStock.Quantity > 0)
 | 
			
		||||
                {
 | 
			
		||||
                    StrMessage = "库位库存不为零,请取出药品后点击【清空】按钮,清空完成后输入标定数量并放入对应数量药品并根据下一步提示操作";
 | 
			
		||||
 | 
			
		||||
                    _portUtil.SpeakAsync("请取出药品后点击【清空】按钮,清空完成后放入药品输入标定数量点击标定按钮");
 | 
			
		||||
                }
 | 
			
		||||
                else
 | 
			
		||||
                {
 | 
			
		||||
                    Status = 1;
 | 
			
		||||
                    StrMessage = "正在清零,清零完成后输入标定数量并放入对应数量药品后点击【标定】按钮";
 | 
			
		||||
                    _portUtil.SpeakAsync("清零完成后输入数量并放入对应数量药品后点击【标定】按钮");
 | 
			
		||||
                    ClearMethod();
 | 
			
		||||
 | 
			
		||||
                }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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="标定数量"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue