Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement
This commit is contained in:
commit
6fbee6ed43
3 files changed
+52
-9
No files matched your search
@@ -7,7 +7,9 @@
|
||||
xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"
|
||||
xmlns:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels"
|
||||
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"
|
||||
xmlns:viewmodel="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ViewModel"
|
||||
d:DataContext="{d:DesignInstance Type=viewmodel:ProductionPlanningModel}"
|
||||
mc:Ignorable="d" Loaded="UserControl_Loaded"
|
||||
d:DesignHeight="630" d:DesignWidth="1280">
|
||||
<UserControl.Resources>
|
||||
@@ -21,6 +23,10 @@
|
||||
<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">
|
||||
|
||||
@@ -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; //定义数据库
|
||||
@@ -48,14 +50,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
||||
private void UserControl_Loaded(object sender, RoutedEventArgs e)//打开页面时的操作
|
||||
{
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void ListViewItem_Quit(object sender, System.Windows.Input.MouseButtonEventArgs e)//退出事件
|
||||
|
||||
@@ -32,6 +32,49 @@ 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
|
||||
} };
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user