细节优化

UAS_MES_NEW/CustomControl/HeadBar/HeadBar.Designer.cs

@@ -105,10 +105,10 @@
             // 
             resources.ApplyResources(this.UpperCollection, "UpperCollection");
             this.UpperCollection.Name = "UpperCollection";
-            this.UpperCollection.Properties.Appearance.Font = ((System.Drawing.Font)(resources.GetObject("toggleSwitch1.Properties.Appearance.Font")));
+            this.UpperCollection.Properties.Appearance.Font = ((System.Drawing.Font)(resources.GetObject("UpperCollection.Properties.Appearance.Font")));
             this.UpperCollection.Properties.Appearance.Options.UseFont = true;
-            this.UpperCollection.Properties.OffText = resources.GetString("toggleSwitch1.Properties.OffText");
-            this.UpperCollection.Properties.OnText = resources.GetString("toggleSwitch1.Properties.OnText");
+            this.UpperCollection.Properties.OffText = resources.GetString("UpperCollection.Properties.OffText");
+            this.UpperCollection.Properties.OnText = resources.GetString("UpperCollection.Properties.OnText");
             // 
             // HeadBar
             // 

UAS_MES_NEW/CustomControl/HeadBar/HeadBar.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Runtime.InteropServices;
-using UAS_MES_NEW.CustomControl.AccordionMenu;
 using System.Windows.Forms;
 using UAS_MES_NEW.DataOperate;
 using UAS_MES_NEW.Entity;
@@ -134,7 +132,7 @@ namespace UAS_MES_NEW.CustomControl
                     //清除上个用户的权限信息
                     SystemInf.Caller.Clear();
                     //清除已经打开过的窗口的信息
-                    AccordionMenu.AccordionMenu.OpenedFormName.Clear();
+                    AccordionMenu.NavagationBar.OpenedFormName.Clear();
                     //注销的时候将除了登陆窗口之外的全部窗口关闭
                     for (int i = 0; i < Application.OpenForms.Count; i++)
                     {

UAS_MES_NEW/CustomControl/HeadBar/HeadBar.resx

@@ -123,7 +123,7 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="TitleLabel.Font" type="System.Drawing.Font, System.Drawing">
-    <value>微软雅黑, 12pt</value>
+    <value>微软雅黑, 12pt, style=Bold</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="TitleLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
@@ -136,7 +136,7 @@
     <value>2, 0, 2, 0</value>
   </data>
   <data name="TitleLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 21</value>
+    <value>0, 22</value>
   </data>
   <data name="TitleLabel.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -160,10 +160,10 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>503, 0</value>
+    <value>501, 0</value>
   </data>
   <data name="MinWindow2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>15, 30</value>
+    <value>15, 28</value>
   </data>
   <data name="MinWindow2.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -190,10 +190,10 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow.Location" type="System.Drawing.Point, System.Drawing">
-    <value>518, 0</value>
+    <value>516, 0</value>
   </data>
   <data name="MinWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 30</value>
+    <value>30, 28</value>
   </data>
   <data name="MinWindow.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -220,10 +220,10 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>548, 0</value>
+    <value>546, 0</value>
   </data>
   <data name="MinWindow1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>15, 30</value>
+    <value>15, 28</value>
   </data>
   <data name="MinWindow1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -250,10 +250,10 @@
     <value>NoControl</value>
   </data>
   <data name="CloseWindow.Location" type="System.Drawing.Point, System.Drawing">
-    <value>563, 0</value>
+    <value>561, 0</value>
   </data>
   <data name="CloseWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 30</value>
+    <value>30, 28</value>
   </data>
   <data name="CloseWindow.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -283,13 +283,13 @@
     <value>NoControl</value>
   </data>
   <data name="LoginOut.Location" type="System.Drawing.Point, System.Drawing">
-    <value>423, 0</value>
+    <value>421, 0</value>
   </data>
   <data name="LoginOut.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
   </data>
   <data name="LoginOut.Size" type="System.Drawing.Size, System.Drawing">
-    <value>80, 30</value>
+    <value>80, 28</value>
   </data>
   <data name="LoginOut.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -319,13 +319,13 @@
     <value>NoControl</value>
   </data>
   <data name="Change_psw.Location" type="System.Drawing.Point, System.Drawing">
-    <value>310, 0</value>
+    <value>308, 0</value>
   </data>
   <data name="Change_psw.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
   </data>
   <data name="Change_psw.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 30</value>
+    <value>113, 28</value>
   </data>
   <data name="Change_psw.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
@@ -352,19 +352,19 @@
     <value>True</value>
   </data>
   <data name="UpperCollection.Location" type="System.Drawing.Point, System.Drawing">
-    <value>170, 0</value>
+    <value>168, 0</value>
   </data>
-  <data name="toggleSwitch1.Properties.Appearance.Font" type="System.Drawing.Font, System.Drawing">
+  <data name="UpperCollection.Properties.Appearance.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 9pt</value>
   </data>
-  <data name="toggleSwitch1.Properties.OffText" xml:space="preserve">
+  <data name="UpperCollection.Properties.OffText" xml:space="preserve">
     <value>正常采集</value>
   </data>
-  <data name="toggleSwitch1.Properties.OnText" xml:space="preserve">
+  <data name="UpperCollection.Properties.OnText" xml:space="preserve">
     <value>大写采集</value>
   </data>
   <data name="UpperCollection.Size" type="System.Drawing.Size, System.Drawing">
-    <value>140, 30</value>
+    <value>140, 28</value>
   </data>
   <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="UpperCollection.SuperTip" type="DevExpress.Utils.SuperToolTip, DevExpress.Utils.v15.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -421,7 +421,7 @@
     <value>6, 12</value>
   </data>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>593, 30</value>
+    <value>591, 28</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>HeadBar</value>

UAS_MES_NEW/UAS_MES_NEW.csproj

@@ -11,6 +11,7 @@
     <AssemblyName>UAS_MES_NEW</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -23,7 +24,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -78,10 +78,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Tool\ExcelHelper.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.0.0, Culture=neutral, PublicKeyToken=ad1060f781377a81, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Tool\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
     <Reference Include="Interop.SpeechLib, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -1009,7 +1005,6 @@
     <Compile Include="PublicMethod\ModeBusTCPServer.cs" />
     <Compile Include="PublicMethod\Print.cs" />
     <Compile Include="PublicMethod\ReadDataFromSerialPort.cs" />
-    <Compile Include="PublicMethod\ZipHelper.cs" />
     <EmbeddedResource Include="CustomControl\AccordionMenu\AccordionMenu.resx">
       <DependentUpon>AccordionMenu.cs</DependentUpon>
     </EmbeddedResource>
@@ -1124,6 +1119,9 @@
     <EmbeddedResource Include="DbFind.resx">
       <DependentUpon>DbFind.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Employee\Employee_ChooseUserToGroup.resx">
       <DependentUpon>Employee_ChooseUserToGroup.cs</DependentUpon>
     </EmbeddedResource>
@@ -1382,7 +1380,6 @@
     <EmbeddedResource Include="Main.resx">
       <DependentUpon>Main.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>
@@ -1559,6 +1556,28 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <PublishFile Include="Resources\pluslogo.png">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>DataFile</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>File</FileType>
+    </PublishFile>
+    <PublishFile Include="Resources\preview_16px_25980_easyicon.net.png">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>DataFile</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>File</FileType>
+    </PublishFile>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.