ltwork hai 1 ano
pai
achega
82712f19c6

+ 13 - 0
BlankApp1/BlankApp1/ViewModels/MaskViewModel.cs

@@ -0,0 +1,13 @@
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PLCTool.ViewModels
+{
+    public  class MaskViewModel:BindableBase
+    {
+    }
+}

+ 1 - 1
BlankApp1/BlankApp1/Views/BusinessManageView/TestResultDetailView.xaml

@@ -8,7 +8,7 @@
              xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:cvt="clr-namespace:PLCTool.Controls.Convert"
              BorderBrush="#CBCBCB" BorderThickness="1"
-             Height="600" Width="1050" >
+             Height="600" Width="1200" >
 
     <UserControl.Resources>
 

+ 3 - 2
BlankApp1/BlankApp1/Views/MainWindow.xaml

@@ -166,8 +166,9 @@
             </StackPanel>
 
         </Border>
-        <Grid Grid.RowSpan="3"  Background="#80000000" Visibility="Collapsed"/>
+        <!--蒙版-->
+        <ContentControl Grid.RowSpan="3" prism:RegionManager.RegionName="MaskRegion" />
+
 
-    
     </Grid>
 </Window>

+ 12 - 0
BlankApp1/BlankApp1/Views/MaskView.xaml

@@ -0,0 +1,12 @@
+<UserControl x:Class="PLCTool.Views.MaskView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:PLCTool.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid   Background="#80000000" />
+    </Grid>
+</UserControl>

+ 28 - 0
BlankApp1/BlankApp1/Views/MaskView.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace PLCTool.Views
+{
+    /// <summary>
+    /// MaskView.xaml 的交互逻辑
+    /// </summary>
+    public partial class MaskView : UserControl
+    {
+        public MaskView()
+        {
+            InitializeComponent();
+        }
+    }
+}