diff --git a/View/ProductionPlanningView.xaml b/View/ProductionPlanningView.xaml index 27a71bf..602813f 100644 --- a/View/ProductionPlanningView.xaml +++ b/View/ProductionPlanningView.xaml @@ -21,13 +21,7 @@ - - - - - - - + diff --git a/View/ProductionPlanningView.xaml.cs b/View/ProductionPlanningView.xaml.cs index 6ed74da..c8ddecd 100644 --- a/View/ProductionPlanningView.xaml.cs +++ b/View/ProductionPlanningView.xaml.cs @@ -41,7 +41,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View public ProductionPlanningView() { InitializeComponent(); - DataContext = new ProductionPlanningModel(); } private SQLiteHelper SQLiteHelpers = null; //定义数据库 @@ -49,7 +48,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.View private void UserControl_Loaded(object sender, RoutedEventArgs e)//打开页面时的操作 { - + string html = @" + + + + + + + + "; + + webBrowser.NavigateToString(html); + + + } private void ListViewItem_Quit(object sender, System.Windows.Input.MouseButtonEventArgs e)//退出事件 diff --git a/ViewModel/ProductionPlanningModel.cs b/ViewModel/ProductionPlanningModel.cs index 247d9ed..42e1bf6 100644 --- a/ViewModel/ProductionPlanningModel.cs +++ b/ViewModel/ProductionPlanningModel.cs @@ -32,49 +32,7 @@ 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 - { - Values = new List { 3 }, - Stroke = null, - DataLabelsPaint = new SolidColorPaint(new SKColor(45, 45, 45)), - DataLabelsSize = 14, - DataLabelsPosition = DataLabelsPosition.Middle - }, - new RowSeries - { - Values = new List { 4}, - Stroke = null, - DataLabelsPaint = new SolidColorPaint(new SKColor(45, 45, 45)), - DataLabelsSize = 14, - DataLabelsPosition = DataLabelsPosition.Middle - }, - new RowSeries - { - Values = new List { -2 }, - Stroke = null, - DataLabelsPaint = new SolidColorPaint(new SKColor(45, 45, 45)), - DataLabelsSize = 14, - DataLabelsPosition = DataLabelsPosition.Middle - } }; - - - - } + } }