补全软件全称

-补充软件正式名称
-修复系统管理页面可以跳过密码验证的bug
-更换加载图
-调整生成报告字体为win10自带的等线字体

WpfTest1/MainWindow.xaml

@@ -8,12 +8,12 @@
         xmlns:my="clr-namespace:WpfTest1"
         xmlns:System="clr-namespace:System;assembly=mscorlib" x:Class="WpfTest1.MainWindow"
         mc:Ignorable="d"
-        Title="劳拉" Height="725" Width="1366"
+        Title="劳拉核心体姿评测系统" Height="725" Width="1366"
         ShowTitleBar="True"
         ShowIconOnTitleBar="True"
         PreviewKeyDown="processGrid_KeyDown"
         WindowStartupLocation="CenterScreen"
-        WindowState = "Normal" Loaded="MetroWindow_Loaded"
+        WindowState = "Normal"
         >
     <Controls:MetroWindow.Resources>
         <Style BasedOn="{StaticResource MetroTabItem}" TargetType="{x:Type TabItem}" x:Key="smallHeader" >
@@ -57,7 +57,7 @@
             </Button>
         </Controls:WindowCommands>
     </Controls:MetroWindow.RightWindowCommands>
-    <Grid x:Name="mainWndGrid" Background="#FFFFFF">
+    <Grid x:Name="mainWndGrid" Background="#FFFFFF" Loaded="mainWndGrid_Loaded">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="395*"/>
             <ColumnDefinition Width="959*"/>
@@ -181,7 +181,7 @@
                         </Button.ContentTemplate>
                     </Button>
                     <Label x:Name="labelSoftwareName" Content="欢迎使用劳拉" FontSize="32" HorizontalAlignment="Center" Margin="0,61,0,0" VerticalAlignment="Top" Foreground="White"/>
-                    <Label x:Name="labelHomepageCversion" Content="编译版本：20200301" HorizontalAlignment="Center" Margin="0,109,0,0" VerticalAlignment="Top" Foreground="White"/>
+                    <Label x:Name="labelHomepageCversion" Content="编译版本：20200411" HorizontalAlignment="Center" Margin="0,109,0,0" VerticalAlignment="Top" Foreground="White"/>
                 </Grid>
             </TabItem>
             <TabItem Header="用户管理" Style="{StaticResource smallHeader}" >
@@ -308,7 +308,7 @@
             </TabItem>
             <!--系统设置-->
             <TabItem Header="系统设置" x:Name="tabitemDoctorSetting" Style="{StaticResource smallHeader}">
-                <TabControl x:Name="tabControlSystemSetting" HorizontalAlignment="Left" Height="645" Margin="10,-5,0,0" VerticalAlignment="Top" Width="1338" SelectionChanged="tabControlSystemSetting_SelectionChanged">
+                <TabControl x:Name="tabControlSystemSetting" HorizontalAlignment="Left" Height="645" Margin="10,-5,0,0" VerticalAlignment="Top" Width="1338">
                     <TabItem Header="医师账户管理" Style="{StaticResource smallerHeader}" >
                         <Grid x:Name="Seeting_ExpressionManagent" Background="White" Margin="0,0,0,0"  >
                             <DataGrid x:Name="dataGridDoctor" AutoGenerateColumns="False" IsReadOnly="True"  HorizontalAlignment="Left" Margin="299,10,0,0" VerticalAlignment="Top" Height="603" Width="1039" Loaded="LoadDoctorDataGrid" MouseDoubleClick="dataGridDoctor_MouseDoubleClick">

WpfTest1/MainWindow.xaml.cs

@@ -69,12 +69,14 @@ namespace WpfTest1
         #region 初始化与系统调用部分
 
         //初始化全部组件后需要先输入医生密码才能进入
-        private void MetroWindow_Loaded(object sender, RoutedEventArgs e)
+        private void mainWndGrid_Loaded(object sender, RoutedEventArgs e)
         {
+            labelHomepageCversion.Content = "编译日期：" + Toolkits.Constants.compileDate;
+            labelSoftwareName.Content = String.Format("欢迎使用{0}", Constants.softwareName);
             //之后测试登陆
             SmallDialogs.LoginWindow lw = new SmallDialogs.LoginWindow(this);
             lw.ShowDialog();
-            if(loginDoctor == null)
+            if (loginDoctor == null)
             {
                 this.Close();
             }
@@ -92,11 +94,9 @@ namespace WpfTest1
                 loginedDoctorName.Content = "欢迎您， " + loginDoctor.name;
                 return;
             }
-            
+
             loadQuestionaire(filterQuestionaire, "filter");
             loadQuestionaire(evaluationQuestionaire, "evaluation");
-            labelHomepageCversion.Content = "编译日期：" + Toolkits.Constants.compileDate;
-            labelSoftwareName.Content = String.Format("欢迎使用{0}", Constants.softwareName);
             
         }
 
@@ -1219,11 +1219,6 @@ namespace WpfTest1
             }
         }
 
-        private void tabControlSystemSetting_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            lastSettingLogin = DateTime.Now;
-        }
-
         #region 医师管理
         //系统设置--医师管理
         private void LoadDoctorDataGrid(object sender, RoutedEventArgs e)
@@ -1448,5 +1443,7 @@ namespace WpfTest1
             }
         }
         #endregion
+
+        
     }
 }

WpfTest1/Toolkits/Constants.cs

@@ -10,11 +10,11 @@ namespace WpfTest1.Toolkits
     public class Constants
     {
         //软件名称
-        public static string softwareName = "劳拉系统";
+        public static string softwareName = "劳拉核心体姿评测系统";
         //编译版本
-        public static string version = "0.1.1.1";
+        public static string version = "0.1.1.3";
         //编译日期
-        public static string compileDate = "20200331";
+        public static string compileDate = "20200411";
         //加密狗验证所使用的pid
         public static string registerPid = "3DE6BA91";
         //加密狗验证所使用的uid

WpfTest1/Toolkits/ReportGenerater.cs

@@ -17,7 +17,7 @@ namespace WpfTest1.Toolkits
             string fileName = Constants.reportPath + "\\" + oneRecord.r_id.ToString() + ".pdf";
             Document document = new Document(PageSize.A4);
             //中文字体
-            string chinese = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Fonts), "STSONG.TTF");
+            string chinese = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Fonts), "DENGL.TTF");
             //System.Console.WriteLine(chinese);
             BaseFont baseFont = BaseFont.CreateFont(chinese, BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
             //文字大小12，文字样式
@@ -32,7 +32,7 @@ namespace WpfTest1.Toolkits
             document.Add(title);
             //加一个空段预防遮挡
             document.Add(new iTextSharp.text.Paragraph(" "));
-            var border = new Paragraph("------------------------------------------------------------------------------------------------------", new Font(baseFont, 16, Font.BOLD, BaseColor.BLACK));
+            var border = new Paragraph("-----------------------------------------------------------------", new Font(baseFont, 16, Font.BOLD, BaseColor.BLACK));
             border.Alignment = Element.ALIGN_CENTER;
             document.Add(border);