diff --git a/PEIS/App.config b/PEIS/App.config
index e35a23d..d8968f5 100644
--- a/PEIS/App.config
+++ b/PEIS/App.config
@@ -15,9 +15,9 @@
-
+
-
+
@@ -31,7 +31,6 @@
-
+
-
\ No newline at end of file
diff --git a/PEIS/PEIS.csproj b/PEIS/PEIS.csproj
index 7075a43..81a8cd4 100644
--- a/PEIS/PEIS.csproj
+++ b/PEIS/PEIS.csproj
@@ -12,7 +12,7 @@
WinExe
PEIS
PEIS
- v4.0
+ v4.5.2
512
true
@@ -81,9 +81,8 @@
..\packages\AForge.Video.DirectShow.2.2.5\lib\AForge.Video.DirectShow.dll
-
- False
- ..\..\..\..\..\..\..\Users\15012\Downloads\Aspose.Total for .NET (Apr 2018)\Aspose.Imaging for .NET v18.3\net4.0\Aspose.Imaging.dll
+
+ ..\packages\Aspose.Imaging.19.1.0\lib\net40\Aspose.Imaging.dll
..\packages\Microsoft.PinYinConverter.1.0.0\lib\ChnCharInfo.dll
@@ -786,5 +785,7 @@
+
+
\ No newline at end of file
diff --git a/PEIS/Properties/Resources.Designer.cs b/PEIS/Properties/Resources.Designer.cs
index 797f1ab..f142d85 100644
--- a/PEIS/Properties/Resources.Designer.cs
+++ b/PEIS/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace PEIS.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -47,8 +47,8 @@ namespace PEIS.Properties {
}
///
- /// 重写当前线程的 CurrentUICulture 属性
- /// 重写当前线程的 CurrentUICulture 属性。
+ /// 重写当前线程的 CurrentUICulture 属性，对
+ /// 使用此强类型资源类的所有资源查找执行重写。
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
diff --git a/PEIS/Properties/Settings.Designer.cs b/PEIS/Properties/Settings.Designer.cs
index 80fd4d3..14641a7 100644
--- a/PEIS/Properties/Settings.Designer.cs
+++ b/PEIS/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace PEIS.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/PEIS/Properties/licenses.licx b/PEIS/Properties/licenses.licx
index e1b99c7..e69de29 100644
--- a/PEIS/Properties/licenses.licx
+++ b/PEIS/Properties/licenses.licx
@@ -1,11 +0,0 @@
-DevExpress.Patch.InMemoryPatch, DevExpress.Patch.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=7fc7bfca2443de66
-DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/PEIS/View/MainForm.Designer.cs b/PEIS/View/MainForm.Designer.cs
index 0821d43..8a2e295 100644
--- a/PEIS/View/MainForm.Designer.cs
+++ b/PEIS/View/MainForm.Designer.cs
@@ -82,7 +82,6 @@ namespace PEIS.View
((System.ComponentModel.ISupportInitialize)(this.PbClose)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.XtmmMain)).BeginInit();
this.panelFooter.SuspendLayout();
- this.stepPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NbcMain)).BeginInit();
this.SuspendLayout();
//
@@ -310,7 +309,6 @@ namespace PEIS.View
//
// stepPanel
//
- this.stepPanel.Controls.Add(this.stepViewer2);
this.stepPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.stepPanel.Location = new System.Drawing.Point(100, 4);
this.stepPanel.Margin = new System.Windows.Forms.Padding(0);
@@ -318,16 +316,6 @@ namespace PEIS.View
this.stepPanel.Size = new System.Drawing.Size(1336, 79);
this.stepPanel.TabIndex = 0;
//
- // stepViewer2
- //
- this.stepViewer2.Dock = System.Windows.Forms.DockStyle.Left;
- this.stepViewer2.Eid = null;
- this.stepViewer2.Location = new System.Drawing.Point(0, 0);
- this.stepViewer2.Margin = new System.Windows.Forms.Padding(0);
- this.stepViewer2.Name = "stepViewer2";
- this.stepViewer2.Size = new System.Drawing.Size(1561, 79);
- this.stepViewer2.TabIndex = 1;
- //
// lblStep
//
this.lblStep.Dock = System.Windows.Forms.DockStyle.Left;
@@ -607,7 +595,6 @@ namespace PEIS.View
((System.ComponentModel.ISupportInitialize)(this.XtmmMain)).EndInit();
this.panelFooter.ResumeLayout(false);
this.panelFooter.PerformLayout();
- this.stepPanel.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.NbcMain)).EndInit();
this.ResumeLayout(false);
diff --git a/PEIS/packages.config b/PEIS/packages.config
index b8044d6..ebad781 100644
--- a/PEIS/packages.config
+++ b/PEIS/packages.config
@@ -6,15 +6,17 @@
+
+
-
-
+
+