Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

MainWindow.xaml

@@ -46,7 +46,7 @@
                     <StackPanel Width="150">
                         <Button Content="账号"/>
                         <Button Content="{x:Static lang:Resources.SysSet}"/>
-                        <Button Content="帮助"/>
+                        <Button Content="{x:Static lang:Resources.Help}" Click="Buttonhelp_Click"/>
                         <Separator/>
                         <Button x:Name="ButtonMinimize" Content="最小化" Click="ButtonMinimize_Click"/>
                         <Button x:Name="ButtonMaximize" Content="最大化" Click="ButtonMaximize_Click"/>
@@ -56,6 +56,7 @@
             </StackPanel>
         </Grid>
 
+
         <Grid x:Name="GridMenu" Width="60" HorizontalAlignment="Left" Background="#FF00204E" Margin="0" SizeChanged="GridMenu_SizeChanged">
             <StackPanel>
                 <Grid Background="#FF006361">
@@ -76,7 +77,7 @@
                     <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="ViewDashboard" Width="25" Height="25" Margin="10" VerticalAlignment="Center" />
-                            <TextBlock Text="工单" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                            <TextBlock Text="监控" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
                     <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
@@ -93,32 +94,8 @@
                     </ListViewItem>
                     <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
                         <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Kind="ClipboardText" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
+                            <materialDesign:PackIcon Kind="Settings" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
-                            <TextBlock Text="程序" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                            <TextBlock Text="染机" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
-                        </StackPanel>
-                    </ListViewItem>
-                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Kind="ArrowExpand" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
-                            <TextBlock Text="输入输出" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
-                        </StackPanel>
-                    </ListViewItem>
-                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Kind="Set" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
-                            <TextBlock Text="参数" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
-                        </StackPanel>
-                    </ListViewItem>
-                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Kind="SettingsApplications" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
-                            <TextBlock Text="系统参数" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
-                        </StackPanel>
-                    </ListViewItem>
-                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Kind="MathLog" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
-                            <TextBlock Text="工作记录" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
                     <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
@@ -127,12 +104,26 @@
                             <TextBlock Text="程序组" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>
                     </ListViewItem>
+                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="PipeLeak" Width="25" Height="25" Margin="10" VerticalAlignment="Center"/>
+                            <TextBlock Text="输送中心" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                        </StackPanel>
+                    </ListViewItem>
                 </ListView>
             </StackPanel>
-
         </Grid>
 
         <Grid x:Name="gdMian" Background="White" Margin="60,50,0,0">
+            
+        </Grid>
+
+
+
+
+
+
+        <Grid  Background="White" Margin="60,50,0,0" Visibility="Hidden">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="*"/>

MainWindow.xaml.cs

@@ -78,6 +78,10 @@ namespace SunlightCentralizedControlManagement_SCCM_
 
         }
 
-
+        private void Buttonhelp_Click(object sender, RoutedEventArgs e)
+        {
+          // Windows.Help help_page = new Windows.Help();
+         //   help_page.ShowDialog();//实例化并置顶打开信息窗口     
+        }
     }
 }

Properties/Resources.Designer.cs

@@ -861,6 +861,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Help 的本地化字符串。
+        /// </summary>
+        public static string Help {
+            get {
+                return ResourceManager.GetString("Help", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 High-water level 的本地化字符串。
         /// </summary>

Properties/Resources.resx

@@ -858,4 +858,7 @@
   <data name="PopUpLogout" xml:space="preserve">
     <value>PopUpLogout</value>
   </data>
+  <data name="Help" xml:space="preserve">
+    <value>Help</value>
+  </data>
 </root>

SunlightCentralizedControlManagement(SCCM).sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.11.35312.102
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SunlightCentralizedControlManagement(SCCM)", "SunlightCentralizedControlManagement(SCCM).csproj", "{2CFE8A79-C7DC-47AC-8D0C-2E03010E2458}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SunlightCentralizedControlManagement_SCCM_", "SunlightCentralizedControlManagement_SCCM_.csproj", "{2CFE8A79-C7DC-47AC-8D0C-2E03010E2458}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -96,6 +96,9 @@
     <Compile Include="UserClass\UserControlMenuItem.cs" />
     <Compile Include="ViewModel\MainWindowViewModel.cs" />
     <Compile Include="ViewModel\ViewModelLocator.cs" />
+    <Compile Include="WindowsView\Help.xaml.cs">
+      <DependentUpon>Help.xaml</DependentUpon>
+    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -114,6 +117,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="WindowsView\Help.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -218,6 +225,7 @@
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
     <Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
+    <Resource Include="WindowsView\sunlight_logotext.jpg" />
     <Resource Include="sunlightlogo.jpg" />
     <Resource Include="sunlightlogo.ico" />
     <Resource Include="LOGO\sunlightlogo.ico" />

WindowsView/Help.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="formula_manage.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:formula_manage"
+        mc:Ignorable="d"
+            Title="SUNLIGHT" Height="480" Width="300" WindowStartupLocation="CenterScreen"  ResizeMode="NoResize">
+    <Grid>
+        <Rectangle Height="150" Margin="0,20,0,0" VerticalAlignment="Top">
+            <Rectangle.Fill>
+                <ImageBrush ImageSource="/Windows/sunlight_logotext.jpg"/>
+            </Rectangle.Fill>
+        </Rectangle>
+        <Label Content="SUNLIGHT (SCCM)" HorizontalAlignment="Left" Height="35" Margin="65,210,0,0" VerticalAlignment="Top" Width="155" FontSize="16"/>
+        <Label Content="TEL：0575-88202605" HorizontalAlignment="Left" Height="35" Margin="55,245,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
+        <Label Content="VER：BETA 1.0.50" HorizontalAlignment="Left" Height="35" Margin="65,365,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
+        <Label Content="SUNLIGHT ©  2023" HorizontalAlignment="Left" Height="35" Margin="65,395,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>

WindowsView/Help.xaml.cs

@@ -0,0 +1,16 @@
+using System.Windows;
+
+namespace formula_manage
+{
+    /// <summary>
+    /// Help.xaml 的交互逻辑
+    /// </summary>
+    public partial class Help : Window
+    {
+        public Help()
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            InitializeComponent();
+        }
+    }
+}