diff --git a/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll b/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll
index 422b745a..30e54854 100644
Binary files a/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll and b/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll differ
diff --git a/BPASmartClient.ScreenLib/AppMain.cs b/BPASmartClient.ScreenLib/AppMain.cs
index 31f7e192..2513c337 100644
--- a/BPASmartClient.ScreenLib/AppMain.cs
+++ b/BPASmartClient.ScreenLib/AppMain.cs
@@ -17,7 +17,7 @@ namespace BPASmartClient.ScreenLib
//启动Redis数据读取
Main.GetInstance.Start();
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
- FSystemHelper.GetInstance.CreateDesktopShortcut();
+ //FSystemHelper.GetInstance.CreateDesktopShortcut();
// FSystemHelper.GetInstance.AutoStart(true);
WindowLargeScreen windowLarge = new WindowLargeScreen();
#region 设置显示页面与标题
diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
index c48ac5f8..40f65277 100644
--- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
+++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
@@ -232,7 +232,7 @@
-
@@ -254,31 +254,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs
index c7fe6e53..8f24caf5 100644
--- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs
+++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs
@@ -404,14 +404,6 @@ namespace BeDesignerSCADA.Controls
{
cav.Load(ofd.FileName);
}
-
- DoubleAnimation da = new DoubleAnimation(-200, 0, new Duration(TimeSpan.FromMilliseconds(250)));
- da.EasingFunction = new CubicEase() { EasingMode = EasingMode.EaseOut };
- CanvasTranslate.BeginAnimation(TranslateTransform.XProperty, da);
-
- DoubleAnimation daop = new DoubleAnimation(0, 1, new Duration(TimeSpan.FromMilliseconds(250)));
- daop.EasingFunction = new CubicEase() { EasingMode = EasingMode.EaseOut };
- cav.BeginAnimation(OpacityProperty, daop);
}
///
/// 保存