Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

Audit.csproj

@@ -79,6 +79,9 @@
   <PropertyGroup>
     <SignManifests>false</SignManifests>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Logo\SUNLIGHT.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CommonServiceLocator, Version=2.0.6.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>packages\CommonServiceLocator.2.0.6\lib\net48\CommonServiceLocator.dll</HintPath>
@@ -140,6 +143,9 @@
     <Compile Include="ViewModel\LogViewModel.cs" />
     <Compile Include="ViewModel\MainViewModel.cs" />
     <Compile Include="ViewModel\ViewModelLocator.cs" />
+    <Compile Include="Windows\help.xaml.cs">
+      <DependentUpon>help.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Windows\LogWindow.xaml.cs">
       <DependentUpon>LogWindow.xaml</DependentUpon>
     </Compile>
@@ -162,6 +168,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Windows\help.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Windows\LogWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -260,9 +270,11 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
+    <Resource Include="Logo\SUNLIGHT.ico" />
     <Content Include="docs\font-awesome-4.7.0\css\font-awesome.css" />
     <Content Include="docs\font-awesome-4.7.0\css\font-awesome.min.css" />
     <Content Include="docs\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
+    <Resource Include="Logo\sunlight_sc.png" />
     <Resource Include="docs\font-awesome-4.7.0\HELP-US-OUT.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

MainWindow.xaml

@@ -61,8 +61,8 @@
     </mah:MetroWindow.Resources>
     <Grid>
 
-        <Rectangle HorizontalAlignment="Left" Height="1105" 
+        <Rectangle HorizontalAlignment="Left" Height="885" 
-                   Fill="#FFCCCCCC" VerticalAlignment="Top" Width="180"/>
+                   Fill="#FFCCCCCC" VerticalAlignment="Center" Width="180"/>
 
         <RadioButton Content="查询" Tag="&#xF15C;" HorizontalAlignment="Left" 
                      Height="55" Margin="0,190,0,0" VerticalAlignment="Top" Width="180" 
@@ -74,7 +74,17 @@
 
         <RadioButton Content="退出" Tag="&#xF08B;" HorizontalAlignment="Left" 
                      Height="55" Margin="0,745,0,0" VerticalAlignment="Top" Width="180" 
-                     Background="#FFCCCCCC" Style="{DynamicResource RadioButtonStyle}" Checked="RadioButton_Checked"/>
+                     Background="#FFCCCCCC" Style="{DynamicResource RadioButtonStyle}" Checked="exit"/>
+
+        <RadioButton Content="帮助" Tag="&#xf0b1;" HorizontalAlignment="Left" 
+                     Height="55" Margin="0,685,0,0" VerticalAlignment="Top" Width="180" 
+                     Background="#FFCCCCCC" Style="{DynamicResource RadioButtonStyle}" Checked="help"/>
+
+        <Rectangle HorizontalAlignment="Left" Height="150" Margin="15,15,0,0" VerticalAlignment="Top" Width="150">
+            <Rectangle.Fill>
+                <ImageBrush ImageSource="/Logo/sunlight_sc.png"/>
+            </Rectangle.Fill>
+        </Rectangle>
 
     </Grid>
 </mah:MetroWindow>

MainWindow.xaml.cs

@@ -34,9 +34,15 @@ namespace Audit
 
         }
 
-        private void RadioButton_Checked(object sender, RoutedEventArgs e)
+        private void exit(object sender, RoutedEventArgs e)
         {
             Application.Current.Shutdown();//关闭窗口
         }
+
+        private void help(object sender, RoutedEventArgs e)
+        {
+            Windows.help help= new Windows.help();
+            help.Show();//实例化并打开帮助窗口
+        }
     }
 }

Windows/help.xaml

@@ -0,0 +1,22 @@
+<Window x:Class="Audit.Windows.help"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Audit.Windows"
+        mc:Ignorable="d"
+        Title="SUNLIGHT" Height="450" Width="300" WindowStartupLocation="CenterScreen"  ResizeMode="NoResize">
+    <Grid>
+        <Rectangle HorizontalAlignment="Center" Height="165" Margin="0,20,0,0" VerticalAlignment="Top" Width="170">
+            <Rectangle.Fill>
+                <ImageBrush ImageSource="/Logo/sunlight_sc.png"/>
+            </Rectangle.Fill>
+        </Rectangle>
+        <Label Content="化学品审计管理客户端" HorizontalAlignment="Left" Height="35" Margin="55,210,0,0" VerticalAlignment="Top" Width="175" FontSize="16" RenderTransformOrigin="0.5,0.5"/>
+        <Label Content="TEL：0575-88202605" HorizontalAlignment="Left" Height="35" Margin="55,245,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
+        <Label Content="SUNLIGHT ©  2022" HorizontalAlignment="Left" Height="35" Margin="65,365,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
+        <Label Content="FAX：0575-88029740" HorizontalAlignment="Left" Height="35" Margin="55,285,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
+        <Label Content="WEB：www.secolor.cn" HorizontalAlignment="Left" Height="35" Margin="55,325,0,0" VerticalAlignment="Top" Width="185" FontSize="16"/>
+
+    </Grid>
+</Window>

Windows/help.xaml.cs

@@ -0,0 +1,30 @@
+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.Shapes;
+
+namespace Audit.Windows
+{
+    /// <summary>
+    /// help.xaml 的交互逻辑
+    /// </summary>
+    public partial class help : Window
+    {
+        ///<Summary>
+        /// help
+        ///</Summary>
+        public help()
+        {
+            InitializeComponent();
+        }
+    }
+}