liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://175.27.215.92:3000/liulb/AUCMA_SCADA

Browse Source
dev
wenjy 1 year ago
parent 6599168e10 24178b588f
commit 919349a20c
5 changed files with 104 additions and 58 deletions
Show Stats Download Patch File Download Diff File

34
Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs
Unescape Escape View File

@ -88,6 +88,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
{
ProductionHourList.Add(time.hourTime);
}
// 货道列表
List<BoxFoamData> list = _boxFoamDataServices.QueryAsync(x=>x.ProductLineCode.Equals("CX_02") && x.StationCode=="1005").Result;
@ -116,9 +117,22 @@ namespace Aucma.Core.BoxFoam.ViewModels
column.Title = "当日小时产量统计";
column.Values = achievement;
column.Foreground = Brushes.White;
Achievement.Add(column);
// Achievement.Add(column);
if (Achievement.Count > 0)
{
for(int i = 0; i < achievement.Count; i++)
{
Achievement.FirstOrDefault().Values[i] = achievement[i];
}
}
else
{
Achievement.Add(column);
}
#endregion
#region 按类型统计
MaterialNameList = new List<string>();
ChartValues<int> achievement2 = new ChartValues<int>();
@ -134,14 +148,24 @@ namespace Aucma.Core.BoxFoam.ViewModels
MaterialNameList.Add(item.Key);
achievement2.Add(flattenedList.Sum());
}
ModelStatistics.Clear();
// ModelStatistics.Clear();
var column2 = new ColumnSeries();
column2.DataLabels = true;
column2.Title = "当日型号产量统计";
column2.Values = achievement2;
column2.Foreground = Brushes.White;
ModelStatistics.Add(column2);
// ModelStatistics.Add(column2);
if (ModelStatistics.Count > 0)
{
for(int i=0;i< achievement2.Count; i++)
{
ModelStatistics.FirstOrDefault().Values[i] = achievement2[i];
}
}
else
{
ModelStatistics.Add(column2);
}
#endregion
}
@ -322,7 +346,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
foreach (var item in list)
{
if (item.Status == 1) StatusColor.Add("Green");
if (item.Status == 0) StatusColor.Add("Red");
if (item.Status == 2) StatusColor.Add("Red");
if (!string.IsNullOrEmpty(item.FixtureBoxType)) FixtureName.Add(item.FixtureBoxType);
if (!string.IsNullOrEmpty(item.Yield.ToString())) Production.Add(item.Yield.ToString());
// if (!string.IsNullOrEmpty(item.InternalTemperature.ToString())) InternalTemperature.Add(item.InternalTemperature.ToString());

4
Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml
Unescape Escape View File

@ -401,7 +401,7 @@
</Grid.ColumnDefinitions>
<UniformGrid Grid.Column="0">
<Grid Margin="10,10">
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}" LegendLocation="Top" Foreground="White">
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}" LegendLocation="Top" Foreground="White" DisableAnimations="True">
<lvc:CartesianChart.DataTooltip >
<lvc:DefaultTooltip SelectionMode="OnlySender" BulletSize="10" Foreground="Black"></lvc:DefaultTooltip>
</lvc:CartesianChart.DataTooltip>
@ -426,7 +426,7 @@
</UniformGrid>
<UniformGrid Grid.Column="1">
<Grid Margin="10,10">
<lvc:CartesianChart LegendLocation="Top" Series="{Binding ModelStatistics, UpdateSourceTrigger=PropertyChanged}" Foreground="White">
<lvc:CartesianChart LegendLocation="Top" Series="{Binding ModelStatistics, UpdateSourceTrigger=PropertyChanged}" Foreground="White" DisableAnimations="True">
<lvc:CartesianChart.DataTooltip>
<lvc:DefaultTooltip BulletSize="10" Foreground="Black"></lvc:DefaultTooltip>
</lvc:CartesianChart.DataTooltip>

10
Aucma.Core.BoxFoam/appsettings.json
Unescape Escape View File

@ -202,7 +202,7 @@
"EquipName": "泡前库Plc",
"PlcType": "Siemens",
"Enabled": true,
"IP": "127.0.0.1",
"IP": "10.10.93.41",
"Port": 102
},
{
@ -210,16 +210,16 @@
"EquipName": "foamLine1Plc",
"PlcType": "Siemens",
"Enabled": true,
"IP": "127.0.0.1",
"Port": 103
"IP": "10.10.93.21",
"Port": 102
},
{
"Id": 3,
"EquipName": "foamLine2Plc",
"PlcType": "Siemens",
"Enabled": true,
"IP": "127.0.0.1",
"Port": 104
"IP": "10.10.93.1",
"Port": 102
},
{
"Id": 4,

112
Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -54,6 +54,7 @@ namespace Aucma.Core.ProductOffLine.ViewModels
System.Timers.Timer timer = new System.Timers.Timer(1000 * 1);//界面刷新定时器
private readonly IBaseBomInfoServices? _baseBomInfoServices;
private OffLineBusiness offLineBusiness = OffLineBusiness.Instance;
private static double aaa = 100.0;
int a = 0;
public IndexPageViewModel()
{
@ -63,6 +64,7 @@ namespace Aucma.Core.ProductOffLine.ViewModels
InitEveryDayMethod();
// 刷新界面信息
RefreshPageListen();
}
@ -270,6 +272,9 @@ namespace Aucma.Core.ProductOffLine.ViewModels
/// <param name="e"></param>
public void RefreshPage(object source, System.Timers.ElapsedEventArgs e)
{
InitEveryDayMethod();
if (OffLineBusiness.TempOffLineInfo1.ProductRefreshFlag == true)
{
ModelToPage(OffLineBusiness.TempOffLineInfo1);
@ -308,53 +313,69 @@ namespace Aucma.Core.ProductOffLine.ViewModels
private async void InitEveryDayMethod()
{
LoadData();
List<WorkTime> listTime = await _baseBomInfoServices.getWorkTime();
if (listTime == null) return;
// var aa =_offLineInfoServices.Query(x=>x.ProductScanTime>= listTime[0].startTime && x.ProductScanTime<= listTime[11].startTime)
// List<dynamic> hourAmount = _offLineInfoServices.QueryCharts1("CX_01");
List<Admin.Core.Model.ViewModels.ChartsByTime> list = await _offLineInfoServices.QueryCharts(listTime[0].startTime, listTime[11].startTime);
if (list == null) return;
var hourList = list.Where(x => int.Parse(x.hour) >= listTime[0].startTime.Hour && int.Parse(x.hour) <= listTime[11].startTime.Hour && x.productLineCode.Equals("CX_02"));
List<string> xList = new List<string>();
ChartValues<double> achievement2 = new ChartValues<double>();
foreach (var item in hourList)
{
xList.Add(item.hour);
achievement2.Add(item.Amount);
}
//for (int i = 0; i < 12; i++)
//{
// // xList.Add(list[i].time.Substring(11, 2) + ":00");
// achievement2.Add(list[i].Amount);
//}
var column2 = new ColumnSeries();
column2.DataLabels = true;
column2.Title = "产量";
column2.Values = achievement2;
column2.Foreground = Brushes.White;
Achievement.Add(column2);
ProductionHourList = xList;
ChartValues<double> achievement = new ChartValues<double>();
Random random = new Random();
for (int i = 0; i < 5; i++)
await App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
achievement.Add(random.Next(60, 100));
}
LoadData();
List<WorkTime> listTime = _baseBomInfoServices.getWorkTime().Result;
if (listTime == null) return;
// var aa =_offLineInfoServices.Query(x=>x.ProductScanTime>= listTime[0].startTime && x.ProductScanTime<= listTime[11].startTime)
// List<dynamic> hourAmount = _offLineInfoServices.QueryCharts1("CX_01");
List<Admin.Core.Model.ViewModels.ChartsByTime> list = _offLineInfoServices.QueryCharts(listTime[0].startTime, listTime[11].startTime).Result;
if (list == null) return;
var hourList = list.Where(x => int.Parse(x.hour) >= listTime[0].startTime.Hour && int.Parse(x.hour) <= listTime[11].startTime.Hour && x.productLineCode.Equals("CX_02"));
List<string> xList = new List<string>();
ChartValues<int> achievement2 = new ChartValues<int>();
foreach (var item in hourList)
{
xList.Add(item.hour);
achievement2.Add(item.Amount);
}
var column = new ColumnSeries();
column.DataLabels = true;
column.Title = "型号";
column.Values = achievement;
column.Foreground = Brushes.White;
ModelStatistics.Add(column);
MaterialNameList = new List<string>()
var column2 = new ColumnSeries();
column2.DataLabels = true;
column2.Title = "产量";
column2.Values = achievement2;
column2.Foreground = Brushes.White;
// Achievement.Clear();
//Achievement.Add(column2);
if (Achievement.Count > 0)
{
for (int i = 0; i < hourList.Count(); i++)
{
Achievement.FirstOrDefault().Values[i] = hourList.ElementAt(i).Amount;
}
}
else
{
Achievement.Add(column2);
}
ProductionHourList = xList;
ChartValues<double> achievement = new ChartValues<double>();
Random random = new Random();
for (int i = 0; i < 5; i++)
{
achievement.Add(random.Next(60, 100));
}
var column = new ColumnSeries();
column.DataLabels = true;
column.Title = "型号";
column.Values = achievement;
column.Foreground = Brushes.White;
ModelStatistics.Clear();
MaterialNameList = null;
ModelStatistics.Add(column);
MaterialNameList = new List<string>()
{
"SC-230,11W/H成品",
"SC-439，箱体",
@ -362,9 +383,10 @@ namespace Aucma.Core.ProductOffLine.ViewModels
"SC-439，背板",
"SC-439VAM,元气森林,C",
};
}
}));
}
//private async void InitEveryDayMethod()
//{
// LoadData();

2
Aucma.Core.ProductOffLine/Views/IndexPageView.xaml
Unescape Escape View File

@ -244,7 +244,7 @@
<TextBlock Text="当日小时产量统计" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" >
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}" >
<lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}" DisableAnimations="True">
<lvc:CartesianChart.AxisX>
<lvc:Axis Labels="{Binding ProductionHourList}" FontSize="15">

Write Preview
Loading…
Cancel
Save