Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

MainWindow.xaml

@@ -68,8 +68,8 @@
                     </Button>
                 </Grid>
                 <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_MouseLeftButtonUp">
+                    <ListViewItem Height="60" MouseLeftButtonUp="ListViewItem_Whole">
-                        <StackPanel Orientation="Horizontal">
+                        <StackPanel Orientation="Horizontal" >
                             <materialDesign:PackIcon Kind="ListBox" Width="25" Height="25" Margin="10" VerticalAlignment="Center" />
                             <TextBlock Text="{x:Static lang:Resources.Whole}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
                         </StackPanel>

MainWindow.xaml.cs

@@ -78,11 +78,17 @@ namespace SunlightCentralizedControlManagement_SCCM_
         {
 
         }
+        private void ListViewItem_Whole(object sender, MouseButtonEventArgs e)
+        {
+            Picture.Content = new View.Whole();
+        }
 
         private void Buttonhelp_Click(object sender, RoutedEventArgs e)
         {
             WindowsView.Help help_page = new WindowsView.Help();
             help_page.Show();  
         }
+
+        
     }
 }

Properties/Resources.Designer.cs

@@ -222,15 +222,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Bottom 的本地化字符串。
-        /// </summary>
-        public static string Bottom1 {
-            get {
-                return ResourceManager.GetString("Bottom1", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 CallDistribution 的本地化字符串。
         /// </summary>
@@ -600,15 +591,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Dyelot 的本地化字符串。
-        /// </summary>
-        public static string Dyelot1 {
-            get {
-                return ResourceManager.GetString("Dyelot1", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 edit 的本地化字符串。
         /// </summary>
@@ -1158,6 +1140,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 message 的本地化字符串。
+        /// </summary>
+        public static string message {
+            get {
+                return ResourceManager.GetString("message", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Mid-waterlevel 的本地化字符串。
         /// </summary>
@@ -1329,6 +1320,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 orders 的本地化字符串。
+        /// </summary>
+        public static string orders {
+            get {
+                return ResourceManager.GetString("orders", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 OutTheCloth 的本地化字符串。
         /// </summary>
@@ -1554,6 +1554,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 process 的本地化字符串。
+        /// </summary>
+        public static string process {
+            get {
+                return ResourceManager.GetString("process", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 The process does not exist 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -840,15 +840,9 @@
   <data name="Dyelot" xml:space="preserve">
     <value>Dyelot</value>
   </data>
-  <data name="Dyelot1" xml:space="preserve">
-    <value>Dyelot</value>
-  </data>
   <data name="Bottom" xml:space="preserve">
     <value>Bottom</value>
   </data>
-  <data name="Bottom1" xml:space="preserve">
-    <value>Bottom</value>
-  </data>
   <data name="Minimize" xml:space="preserve">
     <value>MINIMIZED</value>
   </data>
@@ -864,4 +858,10 @@
   <data name="Whole" xml:space="preserve">
     <value>Whole</value>
   </data>
+  <data name="process" xml:space="preserve">
+    <value>Process</value>
+  </data>
+  <data name="message" xml:space="preserve">
+    <value>Message</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -840,15 +840,9 @@
   <data name="Dyelot" xml:space="preserve">
     <value>Dyelot</value>
   </data>
-  <data name="Dyelot1" xml:space="preserve">
-    <value>Dyelot</value>
-  </data>
   <data name="Bottom" xml:space="preserve">
     <value>Bottom</value>
   </data>
-  <data name="Bottom1" xml:space="preserve">
-    <value>Bottom</value>
-  </data>
   <data name="Minimize" xml:space="preserve">
     <value>Minimize</value>
   </data>
@@ -864,4 +858,13 @@
   <data name="Whole" xml:space="preserve">
     <value>Whole</value>
   </data>
+  <data name="process" xml:space="preserve">
+    <value>process</value>
+  </data>
+  <data name="message" xml:space="preserve">
+    <value>message</value>
+  </data>
+  <data name="orders" xml:space="preserve">
+    <value>orders</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -840,15 +840,9 @@
   <data name="Dyelot" xml:space="preserve">
     <value>领料单</value>
   </data>
-  <data name="Dyelot1" xml:space="preserve">
-    <value>领料单</value>
-  </data>
   <data name="Bottom" xml:space="preserve">
     <value>底</value>
   </data>
-  <data name="Bottom1" xml:space="preserve">
-    <value>底</value>
-  </data>
   <data name="Minimize" xml:space="preserve">
     <value>最小化</value>
   </data>
@@ -864,4 +858,13 @@
   <data name="Whole" xml:space="preserve">
     <value>全局</value>
   </data>
+  <data name="process" xml:space="preserve">
+    <value>工艺</value>
+  </data>
+  <data name="message" xml:space="preserve">
+    <value>信息</value>
+  </data>
+  <data name="orders" xml:space="preserve">
+    <value>工单</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -840,15 +840,9 @@
   <data name="Dyelot" xml:space="preserve">
     <value>領料單</value>
   </data>
-  <data name="Dyelot1" xml:space="preserve">
-    <value>領料單</value>
-  </data>
   <data name="Bottom" xml:space="preserve">
     <value>底</value>
   </data>
-  <data name="Bottom1" xml:space="preserve">
-    <value>底</value>
-  </data>
   <data name="Minimize" xml:space="preserve">
     <value>最小化</value>
   </data>
@@ -864,4 +858,10 @@
   <data name="Help" xml:space="preserve">
     <value>幫助</value>
   </data>
+  <data name="process" xml:space="preserve">
+    <value>工藝</value>
+  </data>
+  <data name="message" xml:space="preserve">
+    <value>訊息</value>
+  </data>
 </root>

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -96,6 +96,9 @@
     <Compile Include="UserClass\UserControlMenuItem.cs" />
     <Compile Include="ViewModel\MainWindowViewModel.cs" />
     <Compile Include="ViewModel\ViewModelLocator.cs" />
+    <Compile Include="View\info.xaml.cs">
+      <DependentUpon>info.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Whole.xaml.cs">
       <DependentUpon>Whole.xaml</DependentUpon>
     </Compile>
@@ -120,6 +123,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="View\info.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\Whole.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

View/Whole.xaml

@@ -4,9 +4,13 @@
              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"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"  Loaded="UserControl_Loaded"
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
-            
+        <ScrollViewer x:Name="scr" Margin="0" VerticalScrollBarVisibility="Auto">
+            <WrapPanel Orientation="Horizontal" x:Name="WholeView" Background="White">
+
+            </WrapPanel>
+        </ScrollViewer>
     </Grid>
 </UserControl>

View/Whole.xaml.cs

@@ -24,5 +24,44 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         {
             InitializeComponent();
         }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+             TextBox textBox = new TextBox();
+            textBox.Text = "12431414";
+         //   textBox.HorizontalAlignment = HorizontalAlignment.Left;
+         //   textBox.VerticalAlignment = VerticalAlignment.Top;
+            textBox.Background =new SolidColorBrush( Color.FromRgb(100,100,100));
+            textBox.Width = 100;
+            textBox.Height = 200;
+            textBox.Margin = new Thickness( 5,5,0,0);
+            WholeView.Children.Add(textBox);
+
+            TextBox textBox1 = new TextBox();
+            textBox1.Text = "12431414";
+            textBox1.Margin = new Thickness(5,5,0,0);
+            //   textBox1.HorizontalAlignment = HorizontalAlignment.Left;
+            //    textBox1.VerticalAlignment = VerticalAlignment.Top;
+            textBox1.Background = new SolidColorBrush(Color.FromRgb(100, 100, 100));
+            textBox1.Width = 100;
+            textBox1.Height = 100;
+            WholeView.Children.Add(textBox1);
+
+
+
+
+
+            View.info[] inf = new View.info[60];
+            for (int i=1;  i<50; i++) 
+            {
+                inf[i] = new View.info();
+                inf[i].Margin = new Thickness(5, 5, 0, 5);
+                inf[i].Width = 300;
+                inf[i].Height = 400;
+                inf[i].name.Text = i.ToString();
+                inf[i].temp.Text = "123c";
+                WholeView.Children.Add(inf[i]);
+            }
+        }
     }
 }

View/info.xaml

@@ -0,0 +1,24 @@
+<UserControl x:Class="SunlightCentralizedControlManagement_SCCM_.View.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:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"	
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300" Background="White">
+    <Grid>
+        <TextBlock x:Name="name" VerticalAlignment="Top" Height="50" Background="Red"  Text="Machine" FontWeight="Bold" FontSize="36" />
+        <TextBlock x:Name="temp" VerticalAlignment="Top" Height="50" Text="000.0°C" FontWeight="Bold" FontSize="36" HorizontalAlignment="Right" Padding="5,0,5,0"/>
+
+        <TextBlock Text="{x:Static lang:Resources.process}" Height="30" FontWeight="Bold" FontSize="24" Margin="5,50,5,0" VerticalAlignment="Top" Focusable="False"/>
+        <TextBlock x:Name="Process" Text="NO Information" Height="30" FontWeight="Bold" FontSize="24" Margin="120,50,5,0" VerticalAlignment="Top" Focusable="False"/>
+        <TextBlock Text="{x:Static lang:Resources.Step}" Height="30" FontWeight="Bold" FontSize="24" Margin="5,100,5,0" VerticalAlignment="Top" Focusable="False"/>
+        <TextBlock x:Name="Step" Text="NO Information" Height="30" FontWeight="Bold" FontSize="24" Margin="120,100,5,0" VerticalAlignment="Top" Focusable="False"/>
+        <TextBlock Text="{x:Static lang:Resources.message}" Height="30" FontWeight="Bold" FontSize="24" Margin="5,150,5,0" VerticalAlignment="Top" Focusable="False"/>
+        <TextBlock x:Name="Message" Text="NO Information" Height="30" FontWeight="Bold" FontSize="24" Margin="120,150,5,0" VerticalAlignment="Top" Focusable="False"/>
+        <TextBlock Text="{x:Static lang:Resources.orders}" Height="30" FontWeight="Bold" FontSize="24" Margin="5,200,5,0" VerticalAlignment="Top" Focusable="False"/>
+        <TextBlock x:Name="Orders" Text="NO Information" Height="30" FontWeight="Bold" FontSize="24" Margin="120,200,5,0" VerticalAlignment="Top" Focusable="False"/>
+        <TextBlock x:Name="time" Text="" Height="30" FontWeight="Bold" FontSize="24" Margin="5,250,5,0" VerticalAlignment="Top" Focusable="False"/>
+    </Grid>
+</UserControl>

View/info.xaml.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace SunlightCentralizedControlManagement_SCCM_.View
+{
+    /// <summary>
+    /// info.xaml 的交互逻辑
+    /// </summary>
+    public partial class info : UserControl
+    {
+        public info()
+        {
+            InitializeComponent();
+            
+        }
+    }
+}