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

View/ProductionPlanningView.xaml

@@ -6,10 +6,12 @@
              xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"
              xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties" 
              xmlns:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" 
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"  
-             xmlns:planner="http://mindfusion.eu/scheduling/wpf" 
+             xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"    
-             mc:Ignorable="d" Loaded="UserControl_Loaded"
+             xmlns:viewmodel="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ViewModel" 
-            d:DesignHeight="630" d:DesignWidth="1280">
+             d:DataContext="{d:DesignInstance Type=viewmodel:ProductionPlanningModel}"
+             mc:Ignorable="d" Loaded="UserControl_Loaded"  
+             d:DesignHeight="630" d:DesignWidth="1280"> 
     <UserControl.Resources>
         <ConvertMoels:RowToIndexConverter x:Key="RowToIndexConverter"/>
     </UserControl.Resources>
@@ -18,10 +20,14 @@
             <RowDefinition/>
             <RowDefinition Height="60"/>
         </Grid.RowDefinitions>
-        <Grid Grid.Row="0"> 
+        <Grid Grid.Row="0">
-            
+
-            
+
-            
+            <lvc:CartesianChart Series="{Binding Series}" XAxes="{Binding XAxes}" TooltipPosition="Hidden">
+                
+            </lvc:CartesianChart>
+
+
         </Grid>
         <StackPanel x:Name="scr" Grid.Row="1" Height="60" Background="#FF00204E" Orientation="Horizontal">            
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">

View/ProductionPlanningView.xaml.cs

@@ -29,6 +29,7 @@ using System.Xml.Linq;
 using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper;
 using static SunlightCentralizedControlManagement_SCCM_.WindowsView.ViewStep;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+using SunlightCentralizedControlManagement_SCCM_.ViewModel;
 
 namespace SunlightCentralizedControlManagement_SCCM_.View
 {
@@ -40,6 +41,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         public ProductionPlanningView()
         {
             InitializeComponent();
+            DataContext = new ProductionPlanningModel();
         }
 
         private SQLiteHelper SQLiteHelpers = null;  //定义数据库
@@ -47,15 +49,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
       
         private void UserControl_Loaded(object sender, RoutedEventArgs e)//打开页面时的操作
         {
-
+                         
-
-
-
-            
-
-
-
-
         }
 
         private void ListViewItem_Quit(object sender, System.Windows.Input.MouseButtonEventArgs e)//退出事件

ViewModel/CurveDiagramViewModel.cs

@@ -199,8 +199,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                 }
 
                 Series = new ISeries[]
-                {
+                {                     
-                     new LineSeries<DateTimePoint>
+                    new LineSeries<DateTimePoint>
                     {
                         Name = Properties.Resources.MasterCylinder +"PH",
                         Values = MTH_values,

ViewModel/ProductionPlanningModel.cs

@@ -31,7 +31,50 @@ using SunlightCentralizedControlManagement_SCCM_.View;
 namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
 {   
     public partial class ProductionPlanningModel : ObservableObject//ViewModelBase
-    {      
+    {
-      
+        public ISeries[] Series { get; set; }
+        public Axis[] XAxes { get; set; } =
+       {
+            new DateTimeAxis(TimeSpan.FromSeconds(5) , date => date.ToString("yyyy-MM-dd HH:mm"))
+            {
+                CrosshairLabelsBackground = SKColors.DarkGray.AsLvcColor(),
+                CrosshairLabelsPaint = new SolidColorPaint(SKColors.DarkSlateBlue, 1),
+                CrosshairPaint = new SolidColorPaint(SKColors.DarkSlateGray, 1),
+            },
+         };
+
+        public ProductionPlanningModel()
+        {
+            Series = new ISeries[]
+                {
+                new RowSeries<int>
+                {
+                    Values = new List<int> { 3 },
+                    Stroke = null,
+                    DataLabelsPaint = new SolidColorPaint(new SKColor(45, 45, 45)),
+                    DataLabelsSize = 14,
+                    DataLabelsPosition = DataLabelsPosition.Middle
+                },
+        new RowSeries<int>
+        {
+            Values = new List<int> { 4},
+            Stroke = null,
+            DataLabelsPaint = new SolidColorPaint(new SKColor(45, 45, 45)),
+            DataLabelsSize = 14,
+            DataLabelsPosition = DataLabelsPosition.Middle
+        },
+        new RowSeries<int>
+        {
+            Values = new List<int> { -2 },
+            Stroke = null,
+            DataLabelsPaint = new SolidColorPaint(new SKColor(45, 45, 45)),
+            DataLabelsSize = 14,
+            DataLabelsPosition = DataLabelsPosition.Middle
+        } };
+        
+        
+        
+        }
+
     }
 }