diff --git a/App.xaml b/App.xaml
index 233eae4..35f658f 100644
--- a/App.xaml
+++ b/App.xaml
@@ -4,6 +4,10 @@
xmlns:local="clr-namespace:DyeingComputer"
StartupUri="MainWindow.xaml">
-
+
+
diff --git a/App.xaml.cs b/App.xaml.cs
index 8d7b7b5..292a221 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -15,6 +15,8 @@ using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
namespace DyeingComputer
{
@@ -69,6 +71,11 @@ namespace DyeingComputer
LiveCharts.Configure(config => config.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('药')));
LiveCharts.Configure(config => config.HasGlobalSKTypeface(SKFontManager.Default.MatchCharacter('缸')));
}
+ private void ScrollViewer_ManipulationBoundaryFeedback(object sender, ManipulationBoundaryFeedbackEventArgs e)
+ {
+ // 禁用弹性效果的核心代码
+ e.Handled = true;
+ }
private UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "DyeingComputer.ini");
diff --git a/View/EquipmentSimulationView.xaml b/View/EquipmentSimulationView.xaml
index 6f8c104..4a4d0c5 100644
--- a/View/EquipmentSimulationView.xaml
+++ b/View/EquipmentSimulationView.xaml
@@ -49,7 +49,38 @@
HorizontalAlignment="Left" Canvas.Left="20" Canvas.Top="180" Margin="284,159,0,141"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/View/TechnologicalProcessView.xaml b/View/TechnologicalProcessView.xaml
index 621c5a2..fbe0930 100644
--- a/View/TechnologicalProcessView.xaml
+++ b/View/TechnologicalProcessView.xaml
@@ -23,11 +23,7 @@
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
CanUserAddRows="True" CanUserDeleteRows="False" HeadersVisibility ="Column"
Background="White" SelectionMode="Single" FontSize="15" MinHeight="632" TabIndex="1" Focusable="True" >
-
-
-
+