文件结构调整

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -142,7 +142,7 @@
     <Compile Include="View\EngineerSetView.xaml.cs">
       <DependentUpon>EngineerSetView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\info.xaml.cs">
+    <Compile Include="UserControls\info.xaml.cs">
       <DependentUpon>info.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\MachinesSet.xaml.cs">
@@ -157,7 +157,7 @@
     <Compile Include="View\ProgramstepsView .xaml.cs">
       <DependentUpon>ProgramstepsView .xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\RoilingTextBlock.xaml.cs">
+    <Compile Include="UserControls\RoilingTextBlock.xaml.cs">
       <DependentUpon>RoilingTextBlock.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\Whole.xaml.cs">
@@ -214,7 +214,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\info.xaml">
+    <Page Include="UserControls\info.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -234,7 +234,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="View\RoilingTextBlock.xaml">
+    <Page Include="UserControls\RoilingTextBlock.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

View/RoilingTextBlock.xaml → UserControls/RoilingTextBlock.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="SunlightCentralizedControlManagement_SCCM_.View.RoilingTextBlock"
+<UserControl x:Class="SunlightCentralizedControlManagement_SCCM_.UserControls.RoilingTextBlock"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"
+             xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.UserControls"
              mc:Ignorable="d" 
              DataContext="{Binding RelativeSource={RelativeSource Self}}"
              d:DesignWidth="300" Height="30" >

View/RoilingTextBlock.xaml.cs → 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
 {
     /// <summary>
     /// 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();

View/info.xaml → UserControls/info.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="SunlightCentralizedControlManagement_SCCM_.View.info"
+<UserControl x:Class="SunlightCentralizedControlManagement_SCCM_.UserControls.info"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"	              
+             xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.UserControls"	              
              xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties" 
              mc:Ignorable="d" 
              d:DesignHeight="400" d:DesignWidth="300" Background="White">

View/info.xaml.cs → 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
 {
     /// <summary>
     /// info.xaml 的交互逻辑

View/ProductionPlanningView.xaml

@@ -16,6 +16,7 @@
     <UserControl.Resources>
         <ConvertMoels:RowToIndexConverter x:Key="RowToIndexConverter"/>
     </UserControl.Resources>
+    
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition/>
@@ -24,6 +25,7 @@
         <Grid Grid.Row="0">
             <Ngantt:GanttControl x:Name="GanttChart"/>
         </Grid>
+      
         <StackPanel Grid.Row="1" Height="60" Background="#FF00204E" Orientation="Horizontal">
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
                 <ListViewItem Height="60" VerticalAlignment="Center">

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
 {
     /// <summary>
@@ -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)
         {
             /// <summary>
@@ -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;

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); //数据库连接路径