修改曲线图表显示逻辑，修改历史曲线查询

View/CurveView.xaml

@@ -153,6 +153,17 @@
                 </ListViewItem>
             </ListView>
         </StackPanel>
+        <StackPanel VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0" Width="400" HorizontalAlignment="Right">
+            <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
+                <ListViewItem>
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="ChatProcessing" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
+                        <TextBlock Text="{x:Static lang:Resources.Machine}" FontSize="20" VerticalAlignment="Center" Margin="20 10" Foreground="White" />
+                        <TextBlock x:Name="mac" FontSize="20" VerticalAlignment="Center" Margin="20 10" Foreground="White" FontWeight="Bold" />
+                    </StackPanel>
+                </ListViewItem>
+            </ListView>
+        </StackPanel>
 
         <Grid Background="White"  Margin="0,500,300,60">
             <ContentControl x:Name="Picture"/>

View/CurveView.xaml.cs

@@ -66,7 +66,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
             Sdatepicker.Text = DateTime.Now.ToString("yyyy/MM/dd");
 
-            Picture.Content = new View.CurveDiagram(true,"","","", CurveDiagram);
+            Picture.Content = new View.CurveDiagram(false,"","","", CurveDiagram);
         }
 
         private void WorkOrderNumder_Click(object sender, RoutedEventArgs e)
@@ -78,19 +78,94 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         private void ListViewItem_Before(object sender, MouseButtonEventArgs e)//前一天
         {
             Sdatepicker.Text = DateTime.Parse(Sdatepicker.Text).AddDays(-1).ToString("yyyy/MM/dd");
-            if (!string.IsNullOrEmpty(SYS_machines)) { }
+            if (!string.IsNullOrEmpty(SYS_machines)) 
+            {
+                Picture.Content = new View.CurveDiagram(false, SYS_machines, DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd"),
+                DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd"), CurveDiagram);
+
+                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+                SQLiteHelpers.Open();  //打开数据库
+                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+               DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +
+               DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'and Machines='" +
+               SYS_machines + "'", null).Tables[0];  //读取表写入缓存
+                SQLiteHelpers.Close();
+
+                GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
+            }
+            else
+            {
+                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+                SQLiteHelpers.Open();  //打开数据库
+                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+                      DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +
+                      DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'", null).Tables[0];  //读取表写入缓存
+                SQLiteHelpers.Close();
+
+                GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
+            }
         }
 
         private void ListViewItem_Today(object sender, MouseButtonEventArgs e)//今天
         {
             Sdatepicker.Text = DateTime.Now.ToString("yyyy/MM/dd");
-            if (!string.IsNullOrEmpty(SYS_machines)) { }
+            if (!string.IsNullOrEmpty(SYS_machines)) 
+            {
+                Picture.Content = new View.CurveDiagram(false, SYS_machines, DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd"),
+                DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd"), CurveDiagram);//刷新图表
+
+                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+                SQLiteHelpers.Open();  //打开数据库
+                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+               DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +
+               DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'and Machines='" +
+               SYS_machines + "'", null).Tables[0];  //读取表写入缓存
+                SQLiteHelpers.Close();
+
+                GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
+            }
+            else
+            {
+                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+                SQLiteHelpers.Open();  //打开数据库
+                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+                      DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +
+                      DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'", null).Tables[0];  //读取表写入缓存
+                SQLiteHelpers.Close();
+
+                GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
+            }
         }
 
         private void ListViewItem_DayAfter(object sender, MouseButtonEventArgs e)//后一天
         {
             Sdatepicker.Text = DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd");
-            if (!string.IsNullOrEmpty(SYS_machines)) { }
+            if (!string.IsNullOrEmpty(SYS_machines)) 
+            {
+                Picture.Content = new View.CurveDiagram(false, SYS_machines, DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd"),
+                DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd"), CurveDiagram);
+
+                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+                SQLiteHelpers.Open();  //打开数据库
+                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+               DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +
+               DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'and Machines='" +
+               SYS_machines + "'", null).Tables[0];  //读取表写入缓存
+                SQLiteHelpers.Close();
+
+                GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
+            }
+            else
+            {
+                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+                SQLiteHelpers.Open();  //打开数据库
+                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+                      DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +
+                      DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'", null).Tables[0];  //读取表写入缓存
+                SQLiteHelpers.Close();
+
+                GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
+            }
         }
 
         private void Griddata_MouseDoubleClick(object sender, MouseButtonEventArgs e)//选择机台
@@ -99,6 +174,19 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             if (rownum != -1)//判断鼠标定位是否有效
             {
                 SYS_machines = (Griddata.Columns[1].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第1列，
+                mac.Text = SYS_machines;
+
+                SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+                SQLiteHelpers.Open();  //打开数据库
+                WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from WorkOrder where StartTime<='" +
+                     DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd") + "' and StartTime>='" +                    
+                     DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd") + "'and Machines='" +                    
+                     SYS_machines + "'", null).Tables[0];  //读取表写入缓存
+                SQLiteHelpers.Close();
+
+                GridWorkOrder.ItemsSource = WorkOrder.DefaultView;
+                Picture.Content = new View.CurveDiagram(false, SYS_machines, DateTime.Parse(Sdatepicker.Text).ToString("yyyy/MM/dd"),
+                     DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd"), CurveDiagram);
             }
         }
 
@@ -106,9 +194,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         {
             int rownum = Griddata.SelectedIndex;//获取鼠标选中行并定义变量
             if (rownum != -1)//判断鼠标定位是否有效
-            {
-                SYS_machines = (Griddata.Columns[1].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第1列，
-            }
+            {              
+                string  Cd = (Griddata.Columns[1].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第1列，
+                Select_WorkOrderNumder.Text = Cd;
+                Picture.Content = new View.CurveDiagram(true, "", "", "", Cd);
+            }            
         }
 
         private void Sdatepicker_SelectedDateChanged(object sender, SelectionChangedEventArgs e)//

View/MonitorView.xaml.cs

@@ -288,7 +288,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         {
             DispatcherTimer timer1s = new DispatcherTimer//初始化循环，每1秒调用一次Tick
             {
-                Interval = TimeSpan.FromSeconds(1.5)//秒
+                Interval = TimeSpan.FromSeconds(2)//秒
             };
             timer1s.Tick += Tick_Event_1S;
             timer1s.Start();