user_lt il y a 1 an
Parent
commit
4af252e4b5

+ 1 - 0
BlankApp1/BlankApp1/PLCTool.csproj

@@ -11,6 +11,7 @@
     <None Remove="Assets\Images\register.png" />
     <None Remove="Assets\Images\wifi信号.png" />
     <None Remove="Assets\Images\电量蓝色.png" />
+    <None Remove="Views\BusinessManageView\AutoTestView.xaml~RF1f86dd9.TMP" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="12.0.1" />

+ 32 - 2
BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/AddDetailViewModel.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
 
@@ -32,16 +33,34 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             SureCommand = new DelegateCommand<string>(Sure);
             CancelCommand = new DelegateCommand(Close);
             TxtLostFocusCommand = new DelegateCommand(LostFocus);
+            TxtPLCValueLostFocusCommand=new DelegateCommand(LostFocusPLCValue);
+        
             PLCTypes.Add("bool");
             PLCTypes.Add("word");
             PLCTypes.Add("dword");
             PLCTypes.Add("real");
             GetPLCConfig();
 
-
-
         }
 
+        private void LostFocusPLCValue()
+        {
+            if (!IsInteger(PLCValue))
+            {
+                MessageBox.Show("请填写正整数!", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
+                return;
+            }
+        }
+        /// <summary>
+        /// 判断输入的数据
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        private bool IsInteger(string input)
+        {
+            Regex regex = new Regex(@"^[0-9]\d*$");
+            return regex.IsMatch(input);
+        }
         private void LostFocus()
         {
             var findResult = plcConfigs?.FirstOrDefault(x => x.PlcAddress == PLCAddress);
@@ -127,6 +146,15 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 MessageBox.Show("请选择PLC变量类型!", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
                 return;
             }
+            if(SelectPLCType=="bool")
+            {
+                if((PLCValue!="0")&&(PLCValue!="1"))
+                {
+                    MessageBox.Show("PLC变量类型为bool,数据值必须为0或者1!", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                    return;
+                }
+               
+            }
             BasPlcItemConfigDto basPlcItemConfigDto = new BasPlcItemConfigDto()
             {
                 Id = id,
@@ -167,6 +195,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         public DelegateCommand<string> SureCommand { set; get; }
         public DelegateCommand CancelCommand { set; get; }
         public DelegateCommand TxtLostFocusCommand { set; get; }
+        public DelegateCommand TxtPLCValueLostFocusCommand { set; get; }
+        
 
         #endregion
         #region 变量绑定

+ 10 - 12
BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/BaseConfigViewModel.cs

@@ -78,20 +78,18 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <param name="obj"></param>
         private void Query(object obj)
         {
-         
-            
-                if (StartTime > EndTime)
-                {
-                    MessageBox.Show("起始时间大于结束时间,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
-                    return;
-                }
+
+            if (StartTime > EndTime)
+            {
+                MessageBox.Show("起始时间大于结束时间,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
+                return;
+            }
                 //if (Convert.ToDateTime(StartTime).AddDays(2) < Convert.ToDateTime(EndTime))
                 //{
                 //    MessageBox.Show("起始时间和结束时间间隔不能大于2天,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
                 //    return;
                 //}
             
-           
             conditionConfig = (from a in allConfigList
                                       where (EndTime == DateTime.MinValue ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
                                        && (string.IsNullOrEmpty(ScheduleName) ? true : (a.SchemeName == ScheduleName))
@@ -100,7 +98,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                                            && (string.IsNullOrEmpty(SelectTest) ? true : (a.ItemType == SelectTest))
                                select a).ToList();
             //默认显示的第一页
-            conditionConfig = conditionConfig.OrderBy(x => x.SchemeId).ToList();
+            conditionConfig = conditionConfig.OrderBy(x => x.SchemeName).ThenBy(x => x.SchemeId).ToList();
             Getpage();
             //BaseConfigList = new ObservableCollection<BasicPlcTestSchemeDto>(conditionConfig);
         }
@@ -218,7 +216,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 //书写规则例如:txt files(*.txt)|*.txt
                 Filter = "Excel files(*.xlsx)|*.xlsx|All files(*.*)|*.*",
                 //设置默认文件名(可以不设置)
-                FileName = "配置导出",
+                FileName = "配置导出" + string.Format("{0:yyyyMMddHHmm}", DateTime.Now),
 
                 //获取或设置一个值,该值指示如果用户省略扩展名,文件对话框是否自动在文件名中添加扩展名。(可以不设置)
                 AddExtension = true,
@@ -297,7 +295,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                     conditionConfig.Add(basicPlcTestSchemeDto);
                    
                 }
-                conditionConfig=conditionConfig.OrderBy(x => x.SchemeId).ToList();
+                conditionConfig = conditionConfig.OrderBy(x => x.SchemeName).ThenBy(x => x.SchemeId).ToList();
                 //默认显示的第一页
                 Getpage();
             }
@@ -415,7 +413,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <summary>
         /// 每页数量
         /// </summary>
-        private int countPerPage = 10;
+        private int countPerPage = 15;
         public int CountPerPage
         {
             get { return countPerPage; }

+ 1 - 1
BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/PLCConfigViewModel.cs

@@ -298,7 +298,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <summary>
         /// 每页数量
         /// </summary>
-        private int countPerPage = 10;
+        private int countPerPage = 15;
         public int CountPerPage
         {
             get { return countPerPage; }

+ 67 - 19
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -65,12 +65,23 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             StartCommand = new DelegateCommand(Start);
             StopOrContinueCommand = new DelegateCommand<object>(StopOrContinueMethod);
             CancelCommand = new DelegateCommand<object>(Cancel);
+            UnLoadCommand = new DelegateCommand(Unload);
               BeforeConList = new ObservableCollection<BasPlcItemConfigDto>();
             InConList = new ObservableCollection<BasPlcItemConfigDto>();
             OutConList = new ObservableCollection<BasPlcItemConfigDto>();
             GetConfigOption();
 
         }
+        /// <summary>
+        /// 关闭窗体是触发
+        /// </summary>
+        /// <exception cref="NotImplementedException"></exception>
+        private void Unload()
+        {
+           
+             m.Reset();  //阻塞线程
+             RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+        }
 
         private void Cancel(object obj)
         {
@@ -551,6 +562,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             bool isJudgeResult = await TestJudgementMethod();
             //下一项
             StepIndex = 0;
+            await Task.Delay(2000);
 
         }
         /// <summary>
@@ -651,7 +663,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
 
                         item.RealValue = readResult;
                         item.TestTime = DateTime.Now;
-                        if (readResult.Trim() == plcValue.Trim())
+                        if (readResult.Trim() == plcValue?.Trim())
                         {
                             item.TestResult = "通过";
                             countCond++;
@@ -869,6 +881,21 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             switch (SelectOutJudge)
             {
                 case "人工判定":
+                    DateTime entryTime = DateTime.Now;
+                    await Task.Run(async () =>
+                    {
+                        while (entryTime.AddMilliseconds(delayTime * 1000) > DateTime.Now)
+                        {
+                            //显示进度条
+                            System.Windows.Application.Current.Dispatcher.Invoke((delegate
+                            {
+                                ProVisibility = Visibility.Visible;
+                            }));
+
+                            await Task.Delay(1000);
+                        }
+                    });
+                    ProVisibility = Visibility.Hidden;
                     //弹出确认的对话框
                     MessageBoxResult boxResult = MessageBox.Show(OutDetail, "确认", MessageBoxButton.OKCancel, MessageBoxImage.Information);
                     if (boxResult == MessageBoxResult.OK)
@@ -887,6 +914,21 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     switch (OutSelectLogic)
                     {
                         case "NULL":
+                            DateTime entryTime2 = DateTime.Now;
+                            await Task.Run(async () =>
+                            {
+                                while (entryTime2.AddMilliseconds(delayTime * 1000) > DateTime.Now)
+                                {
+                                    //显示进度条
+                                    System.Windows.Application.Current.Dispatcher.Invoke((delegate
+                                    {
+                                        ProVisibility = Visibility.Visible;
+                                    }));
+
+                                    await Task.Delay(1000);
+                                }
+                            });
+                            ProVisibility = Visibility.Hidden;
                             bizTestRecordDtlDto.JudgementResult = "通过";
                             StepIndex = 3;
                             break;
@@ -902,6 +944,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             }
             //更新测试记录
             //更新测试记录
+            endTime = DateTime.Now;
             AddOrEditTesDtltRecord(globalSchDetailId);
 
             return isJudge;
@@ -912,6 +955,21 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private async Task ReadJudge(String strLogic)
         {
             int countCond = 0;
+            DateTime entryTime = DateTime.Now;
+            await Task.Run(async () =>
+            {
+                while (entryTime.AddMilliseconds(delayTime * 1000) > DateTime.Now)
+                {
+                    //显示进度条
+                    System.Windows.Application.Current.Dispatcher.Invoke((delegate
+                    {
+                        ProVisibility = Visibility.Visible;
+                    }));
+
+                    await Task.Delay(1000);
+                }
+            });
+            ProVisibility = Visibility.Hidden;
             foreach (var item in OutConList.OrderBy(x => x.Id))
             {
                 string plcAddress = item.PlcAddress;
@@ -922,24 +980,12 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 {
 
                     case "bool":
-                        DateTime entryTime = DateTime.Now;
+                      
                         string readResult = string.Empty;
-                        //一直读
-                        await Task.Run(async () =>
-                        {
-                            while (entryTime.AddMilliseconds(delayTime * 1000) > DateTime.Now)
-                            {
-                                //显示进度条
-                                System.Windows.Application.Current.Dispatcher.Invoke((delegate
-                                {
-                                    ProVisibility = Visibility.Visible;
-                                }));
-
-                                await Task.Delay(1000);
-                            }
-                        });
+                        //
+                  
                         readResult = PLCCom.GetInstance().ReadPlcObject(plcAddress, VarType.Bit);
-                        ProVisibility = Visibility.Hidden;
+                      
                         ///实时值记录
                         item.RealValue = readResult;
                         item.TestTime = DateTime.Now;
@@ -997,6 +1043,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 }
 
             }
+          
             //测试记录存入数据库
             //输出项测试结果json转化
             string prefixJsonStr = ModelToJsonToStr(SelectOutJudge, OutSelectLogic, OutDetail, OutConList);
@@ -1077,7 +1124,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// </summary>
         private void Close()
         {
-            RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+           
+         
         }
 
 
@@ -1128,9 +1176,9 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         public DelegateCommand StartCommand { set; get; }
         public DelegateCommand<object> StopOrContinueCommand { set; get; }
         public DelegateCommand<object> CancelCommand { set; get; }
+        public DelegateCommand UnLoadCommand { set; get; }
         
 
-
         #endregion
         #region 变量绑定
         /// <summary>

+ 10 - 2
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ManualTestViewModel.cs

@@ -938,6 +938,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             }
             //更新测试记录
             //更新测试记录
+            endTime = DateTime.Now;
             AddOrEditTesDtltRecord(globalSchDetailId);
             return isJudge;
         }
@@ -1032,11 +1033,12 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         }
 
                         break;
-                        break;
+                     
 
                 }
 
             }
+           
             //测试记录存入数据库
             //输出项测试结果json转化
             string prefixJsonStr = ModelToJsonToStr(SelectOutJudge, OutSelectLogic, OutDetail, OutConList);
@@ -1117,7 +1119,13 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// </summary>
         private void Close()
         {
-            RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            MessageBoxResult boxResult = MessageBox.Show("确认退出自动测试", "确认", MessageBoxButton.OKCancel, MessageBoxImage.Information);
+            if (boxResult == MessageBoxResult.OK)
+            {
+              
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            }
+            
         }
 
 

+ 4 - 4
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/QueryViewModel.cs

@@ -320,7 +320,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                     && (string.IsNullOrEmpty(SelectTest) ? true : (a.ItemType == SelectTest))
                                select a).ToList();
             //默认显示的第一页
-            conditionConfig = conditionConfig.OrderBy(x => x.SchemeId).ToList();
+            conditionConfig = conditionConfig.OrderBy(x => x.SchemeName).ThenBy(x => x.SchemeId).ToList();
             Getpage();
             //BaseConfigList = new ObservableCollection<BasicPlcTestSchemeDto>(conditionConfig);
         }
@@ -355,7 +355,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 //书写规则例如:txt files(*.txt)|*.txt
                 Filter = "Excel files(*.xlsx)|*.xlsx|All files(*.*)|*.*",
                 //设置默认文件名(可以不设置)
-                FileName = "配置导出",
+                FileName = "测试记录" + string.Format("{0:yyyyMMddHHmm}", DateTime.Now),
 
                 //获取或设置一个值,该值指示如果用户省略扩展名,文件对话框是否自动在文件名中添加扩展名。(可以不设置)
                 AddExtension = true,
@@ -463,7 +463,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                    
 
                 }
-                conditionConfig = conditionConfig.OrderBy(x => x.SchemeId).ToList();
+                conditionConfig = conditionConfig.OrderBy(x => x.SchemeName).ThenBy(x => x.SchemeId).ToList();
                 //默认显示的第一页
                 Getpage();
             }
@@ -583,7 +583,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// <summary>
         /// 每页数量
         /// </summary>
-        private int countPerPage = 10;
+        private int countPerPage = 15;
         public int CountPerPage
         {
             get { return countPerPage; }

+ 4 - 4
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/TestOperViewModel.cs

@@ -142,7 +142,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                     && (string.IsNullOrEmpty(SelectTest) ? true : (a.ItemType == SelectTest))
                                select a).ToList();
             //默认显示的第一页
-            conditionConfig = conditionConfig.OrderBy(x => x.SchemeId).ToList();
+            conditionConfig = conditionConfig.OrderBy(x => x.SchemeName).ThenBy(x => x.SchemeId).ToList();
             Getpage();
             //BaseConfigList = new ObservableCollection<BasicPlcTestSchemeDto>(conditionConfig);
         }
@@ -213,7 +213,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 //书写规则例如:txt files(*.txt)|*.txt
                 Filter = "Excel files(*.xlsx)|*.xlsx|All files(*.*)|*.*",
                 //设置默认文件名(可以不设置)
-                FileName = "配置导出",
+                FileName = "测试项" + string.Format("{0:yyyyMMddHHmm}", DateTime.Now),
 
                 //获取或设置一个值,该值指示如果用户省略扩展名,文件对话框是否自动在文件名中添加扩展名。(可以不设置)
                 AddExtension = true,
@@ -292,7 +292,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     conditionConfig.Add(basicPlcTestSchemeDto);
 
                 }
-                conditionConfig = conditionConfig.OrderBy(x => x.SchemeId).ToList();
+                conditionConfig = conditionConfig.OrderBy(x => x.SchemeName).ThenBy(x => x.SchemeId).ToList();
                 //默认显示的第一页
                 Getpage();
             }
@@ -414,7 +414,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// <summary>
         /// 每页数量
         /// </summary>
-        private int countPerPage = 10;
+        private int countPerPage = 15;
         public int CountPerPage
         {
             get { return countPerPage; }

+ 1 - 1
BlankApp1/BlankApp1/ViewModels/MonitorManageViewModel/PLCWriteViewModel.cs

@@ -113,7 +113,7 @@ namespace PLCTool.ViewModels.MonitorManageViewModel
         /// <returns></returns>
         private  bool IsInteger(string input)
         {
-            Regex regex = new Regex(@"^[1-9]\d*$");
+            Regex regex = new Regex(@"^[0-9]\d*$");
             return regex.IsMatch(input);
         }
         /// <summary>

+ 2 - 2
BlankApp1/BlankApp1/ViewModels/StatisticsViewModel.cs

@@ -130,7 +130,7 @@ namespace BlankApp1.ViewModels
                     //统计所有测试项个数
                     allSchCount++;
                 }
-                conditionConfig = conditionConfig.OrderBy(x => x.SchemeId).ToList();
+                conditionConfig = conditionConfig.OrderBy(x => x.SchemeName).ThenBy(x=>x.SchemeId).ToList();
                 //默认显示的第一页
                 Getpage();
             }
@@ -296,7 +296,7 @@ namespace BlankApp1.ViewModels
         /// <summary>
         /// 每页数量
         /// </summary>
-        private int countPerPage = 10;
+        private int countPerPage = 15;
         public int CountPerPage
         {
             get { return countPerPage; }

+ 9 - 2
BlankApp1/BlankApp1/Views/BasicConfigView/AddDetailView.xaml

@@ -44,12 +44,19 @@
             <TextBox  Height="28" Width="120" Text="{Binding PLCItem}" />
         </StackPanel>
         <StackPanel Orientation="Horizontal"  Grid.Row="3" HorizontalAlignment="Center">
-            <TextBlock Text="PLC变量类型:"  Style="{StaticResource NormalTextBlockStyle}" />
+            <TextBlock Text="PLC变量类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0" TextAlignment="Right" Width="80"/>
             <ComboBox  Height="28" Width="120" ItemsSource="{Binding PLCTypes}" SelectedItem="{Binding SelectPLCType}" />
         </StackPanel>
         <StackPanel Orientation="Horizontal" Grid.Row="4" HorizontalAlignment="Center">
             <TextBlock Text="PLC变量值:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0" TextAlignment="Right" Width="80"/>
-            <TextBox  Height="28" Width="120" Text="{Binding PLCValue}" />
+            <TextBox  Height="28" Width="120" Text="{Binding PLCValue}" >
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="LostFocus">
+                        <i:InvokeCommandAction Command="{Binding TxtPLCValueLostFocusCommand}" CommandParameter="{Binding ElementName=TBSeriesDescription}"/>
+                    </i:EventTrigger>
+
+                </i:Interaction.Triggers>
+            </TextBox>
         </StackPanel>
         <StackPanel Orientation="Horizontal" Grid.Row="5" HorizontalAlignment="Center">
             <TextBlock Text="描述:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0" TextAlignment="Right" Width="80" />

+ 8 - 3
BlankApp1/BlankApp1/Views/BusinessManageView/AutoTestView.xaml

@@ -5,10 +5,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:PLCTool.Views.BusinessManageView"
              xmlns:hc="https://handyorg.github.io/handycontrol"
+             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:prism="http://prismlibrary.com/" 
-             BorderBrush="#CBCBCB" BorderThickness="1"
-             Height="700" Width="1100" >
-   
+             BorderBrush="#CBCBCB" BorderThickness="1" 
+             Height="700" Width="1100"   >
     <UserControl.Resources>
         <Style TargetType="TextBlock" x:Key="textBlockStyle">
             <Setter Property="Width" Value="80"/>
@@ -20,6 +20,11 @@
     </UserControl.Resources>
 
     <Grid>
+        <b:Interaction.Triggers>
+            <b:EventTrigger EventName="Unloaded">
+                <b:InvokeCommandAction Command="{Binding UnLoadCommand}"/>
+            </b:EventTrigger>
+        </b:Interaction.Triggers>
         <Grid.RowDefinitions>
 
             <RowDefinition Height="50" />

+ 6 - 1
BlankApp1/BlankApp1/Views/BusinessManageView/AutoTestView.xaml.cs

@@ -23,6 +23,11 @@ namespace PLCTool.Views.BusinessManageView
         public AutoTestView()
         {
             InitializeComponent();
+           
         }
-    }
+        
+
+
+   
+}
 }

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

@@ -90,7 +90,7 @@
                                     </StackPanel>
                                 </Button>
                                 <Button  Width="auto" Background="Transparent" HorizontalContentAlignment ="Left" Foreground="Black" Height="25" BorderThickness="0"
-                 Command="{Binding DataContext.PdfReportCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid}}" CommandParameter="{Binding SchemeId}" Cursor="Hand" Margin="0,0,5,0" >
+                 Command="{Binding DataContext.PdfReportCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid}}" CommandParameter="{Binding SchemeId}" Cursor="Hand" >
 
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock  Text="生成pdf报表" VerticalAlignment="Center" Foreground="Blue"/>

+ 1 - 0
BlankApp1/BlankApp1/Views/BusinessManageView/QueryView.xaml.cs

@@ -23,6 +23,7 @@ namespace BlankApp1.Views
         public QueryView()
         {
             InitializeComponent();
+            
         }
     }
 }

+ 1 - 1
BlankApp1/BlankApp1/Views/MainWindow.xaml

@@ -7,7 +7,7 @@
         prism:ViewModelLocator.AutoWireViewModel="True"
         Height="600"
   Width="800"
-  WindowStartupLocation="CenterScreen"
+  WindowStartupLocation="CenterScreen" 
   MouseMove="Window_MouseMove"
   AllowsTransparency="True"
   WindowStyle="None">