diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj index 862398c..2630299 100644 --- a/SunlightCentralizedControlManagement_SCCM_.csproj +++ b/SunlightCentralizedControlManagement_SCCM_.csproj @@ -142,7 +142,7 @@ EngineerSetView.xaml - + info.xaml @@ -157,7 +157,7 @@ ProgramstepsView .xaml - + RoilingTextBlock.xaml @@ -214,7 +214,7 @@ MSBuild:Compile Designer - + Designer MSBuild:Compile @@ -234,7 +234,7 @@ MSBuild:Compile Designer - + Designer MSBuild:Compile diff --git a/View/RoilingTextBlock.xaml b/UserControls/RoilingTextBlock.xaml similarity index 96% rename from View/RoilingTextBlock.xaml rename to UserControls/RoilingTextBlock.xaml index 5254a15..93a1d2b 100644 --- a/View/RoilingTextBlock.xaml +++ b/UserControls/RoilingTextBlock.xaml @@ -1,9 +1,9 @@ - diff --git a/View/RoilingTextBlock.xaml.cs b/UserControls/RoilingTextBlock.xaml.cs similarity index 98% rename from View/RoilingTextBlock.xaml.cs rename to UserControls/RoilingTextBlock.xaml.cs index 0f2efe7..da4d12e 100644 --- a/View/RoilingTextBlock.xaml.cs +++ b/UserControls/RoilingTextBlock.xaml.cs @@ -14,7 +14,7 @@ using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Threading; -namespace SunlightCentralizedControlManagement_SCCM_.View +namespace SunlightCentralizedControlManagement_SCCM_.UserControls { /// /// RoilingTextBlock.xaml 的交互逻辑 @@ -26,6 +26,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View private double offset=6;//最大的偏移量 private TextBlock currentTextBlock = null; private DispatcherTimer currentTimer = null; + public RoilingTextBlock() { InitializeComponent(); diff --git a/View/info.xaml b/UserControls/info.xaml similarity index 97% rename from View/info.xaml rename to UserControls/info.xaml index 0ff1570..0426d80 100644 --- a/View/info.xaml +++ b/UserControls/info.xaml @@ -1,9 +1,9 @@ - diff --git a/View/info.xaml.cs b/UserControls/info.xaml.cs similarity index 94% rename from View/info.xaml.cs rename to UserControls/info.xaml.cs index 21837aa..87be57e 100644 --- a/View/info.xaml.cs +++ b/UserControls/info.xaml.cs @@ -18,7 +18,7 @@ using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Threading; -namespace SunlightCentralizedControlManagement_SCCM_.View +namespace SunlightCentralizedControlManagement_SCCM_.UserControls { /// /// info.xaml 的交互逻辑 diff --git a/View/ProductionPlanningView.xaml b/View/ProductionPlanningView.xaml index eca80c6..184966f 100644 --- a/View/ProductionPlanningView.xaml +++ b/View/ProductionPlanningView.xaml @@ -16,6 +16,7 @@ + @@ -24,6 +25,7 @@ + diff --git a/View/Whole.xaml.cs b/View/Whole.xaml.cs index bc703d0..f8ebbcd 100644 --- a/View/Whole.xaml.cs +++ b/View/Whole.xaml.cs @@ -17,6 +17,7 @@ using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Threading; using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper; + namespace SunlightCentralizedControlManagement_SCCM_.View { /// @@ -28,8 +29,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View { InitializeComponent(); } - - View.info[] inf = new View.info[999]; //定义总览信息卡 + + UserControls.info[] inf = new UserControls.info[999]; //定义总览信息卡 private void UserControl_Loaded(object sender, RoutedEventArgs e) { /// @@ -38,7 +39,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View //View.info[] inf = new View.info[999]; for (int i = 0; i < MainWindowViewModel.Machines.Rows.Count; i++) { - inf[i] = new View.info(); + inf[i] = new UserControls.info(); inf[i].Margin = new Thickness(5, 5, 0, 5); inf[i].Width = 300; inf[i].Height = 400; diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 16cd94c..893b8de 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -177,7 +177,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel private SQLiteHelper SQLiteHelpers = null; //定义数据库 private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db"; //数据库路径 public static DataTable Machines = new DataTable(); //设备表缓存 - public static View.info[] inf = new View.info[999]; //定义总览信息卡 + public static UserControls.info[] inf = new UserControls.info[999]; //定义总览信息卡 public MainWindowViewModel() { SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径