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

Properties/Resources.Designer.cs

@@ -2013,6 +2013,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Search 的本地化字符串。
+        /// </summary>
+        public static string Search {
+            get {
+                return ResourceManager.GetString("Search", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 SelectDate 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -909,4 +909,7 @@
   <data name="SelectDate" xml:space="preserve">
     <value>Select Date</value>
   </data>
+  <data name="Search" xml:space="preserve">
+    <value>Search</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -909,4 +909,7 @@
   <data name="SelectDate" xml:space="preserve">
     <value>SelectDate</value>
   </data>
+  <data name="Search" xml:space="preserve">
+    <value>Search</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -909,4 +909,7 @@
   <data name="SelectDate" xml:space="preserve">
     <value>选择日期</value>
   </data>
+  <data name="Search" xml:space="preserve">
+    <value>搜索</value>
+  </data>
 </root>

View/CurveView.xaml

@@ -62,6 +62,7 @@
                 </Style>
             </lvc:CartesianChart.Style>
         </lvc:CartesianChart>
+
         <StackPanel x:Name="s1cr" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0">
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
                 <ListViewItem Height="60" MouseLeftButtonUp="DatePicker_Today" VerticalAlignment="Center">
@@ -76,16 +77,16 @@
                 </ListViewItem>
             </ListView>
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
-                <ListViewItem Height="60" x:Name="Resume">
+                <ListViewItem Height="60" x:Name="WNumder">
                     <StackPanel Orientation="Horizontal" >
                         <materialDesign:PackIcon Kind="Number0CircleOutline" Width="40" Height="30" VerticalAlignment="Center"/>
-                        <TextBlock Text="{x:Static lang:Resources.Dyelot}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
+                        <TextBlock Text="{x:Static lang:Resources.WorkOrderNumder}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
-                        <TextBox x:Name="Select_Dyelot" Width="300" Background="White" FontSize="20" />
+                        <TextBox x:Name="Select_WorkOrderNumder" Width="300" Background="White" FontSize="20" VerticalAlignment="Center" Height="40" />
-                    </StackPanel>                    
+                        <Button Width="80" Height="40" VerticalAlignment="Center" Click="WorkOrderNumder_Click" Content="{x:Static lang:Resources.Search}"/>
+                    </StackPanel>
                 </ListViewItem>
             </ListView>
-            
+
-            
 
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
                 <ListViewItem Width="150" MouseLeftButtonUp="Paused_MouseLeftButtonUp"  IsEnabled="False" x:Name="Paused">

View/CurveView.xaml.cs

@@ -40,11 +40,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
         }
 
-        private void Resume_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-
-        }
-
         private void Paused_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
 
@@ -54,5 +49,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         {
 
         }
+
+
+
+        private void WorkOrderNumder_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }