Merge remote-tracking branch 'origin/master'
# Conflicts: # productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.classmaster
commit
6be714218d
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,149 @@
|
||||
$(() => {
|
||||
|
||||
//班组计划统计
|
||||
$.getJSON('/foamBox/getTeamStatisticsJson', function (result) {
|
||||
onDutyPlan(result.planAmount, result.actualAmount, result.differenceAmount,)
|
||||
});
|
||||
|
||||
//设备运行状态
|
||||
$.getJSON(`/foamBox/getRunStatusJson?ids=${ids}`, function (result) {
|
||||
deviceStatus(result);
|
||||
});
|
||||
|
||||
|
||||
//库存统计
|
||||
$.getJSON(`/foamBox/getMaterialStoreJson`, function (result) {
|
||||
threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics"));
|
||||
});
|
||||
|
||||
//按型号统计产量
|
||||
$.getJSON('/foamBox/getMaterialProdutionJson', function (result) {
|
||||
horizontalBarChart(result, document.getElementById("statisticalOutputByModel"));
|
||||
});
|
||||
|
||||
//小时产量
|
||||
$.getJSON('/foamBox/getHourProdutionJson', function (result) {
|
||||
brokenLineAreaDiagram(result, document.getElementById("hourlyOutputStatistics"));
|
||||
});
|
||||
|
||||
//发泡参数
|
||||
$.getJSON(`/foamBox/getParamTemperature?ids=${ids}`, function (result) {
|
||||
multipleBrokenLineAreaDiagram(result, document.getElementById("foamingParameters"));
|
||||
});
|
||||
|
||||
// 模具温度1
|
||||
|
||||
const temperature = (res, ids) => {
|
||||
let mycharts = echarts.init(ids);
|
||||
|
||||
|
||||
let option = {
|
||||
grid: {
|
||||
top: '10%',
|
||||
left: '6%',
|
||||
right: '6%',
|
||||
bottom: '0',
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: [
|
||||
{
|
||||
interval: 0,
|
||||
type: 'category',
|
||||
data: ['066', '066', '066', '066', '066'],
|
||||
axisPointer: {
|
||||
type: 'shadow'
|
||||
}
|
||||
}
|
||||
],
|
||||
yAxis: [
|
||||
{
|
||||
splitLine: {
|
||||
show: false,
|
||||
},
|
||||
type: 'value',
|
||||
name: 'Precipitation',
|
||||
min: 0,
|
||||
max: 50,
|
||||
interval: 10,
|
||||
axisLabel: {
|
||||
formatter: '{value} ml'
|
||||
}
|
||||
},
|
||||
{
|
||||
splitLine: {
|
||||
show: false,
|
||||
},
|
||||
type: 'value',
|
||||
name: 'Temperature',
|
||||
min: 0,
|
||||
max: 5,
|
||||
interval: 1,
|
||||
axisLabel: {
|
||||
formatter: '{value} °C'
|
||||
}
|
||||
}
|
||||
],
|
||||
series: [
|
||||
{
|
||||
name: 'Evaporation',
|
||||
type: 'bar',
|
||||
tooltip: {
|
||||
valueFormatter: function (value) {
|
||||
return value + ' ml';
|
||||
}
|
||||
},
|
||||
data: [
|
||||
2.0, 4.9, 7.0, 23.2, 25.6
|
||||
]
|
||||
},
|
||||
{
|
||||
name: 'Precipitation',
|
||||
type: 'bar',
|
||||
tooltip: {
|
||||
valueFormatter: function (value) {
|
||||
return value + ' ml';
|
||||
}
|
||||
},
|
||||
data: [
|
||||
2.6, 5.9, 9.0, 26.4, 28.7
|
||||
]
|
||||
},
|
||||
]
|
||||
};
|
||||
|
||||
mycharts.setOption(option);
|
||||
$(window).resize(mycharts.resize);
|
||||
}
|
||||
|
||||
$.getJSON('/foamBox/getStatisticalOutputByModel', function (result) {
|
||||
temperature(result, document.getElementById("temperatureOne"));
|
||||
});
|
||||
$.getJSON('/foamBox/getStatisticalOutputByModel', function (result) {
|
||||
temperature(result, document.getElementById("temperatureTwo"));
|
||||
});
|
||||
$.getJSON('/foamBox/getStatisticalOutputByModel', function (result) {
|
||||
temperature(result, document.getElementById("temperatureThree"));
|
||||
});
|
||||
$.getJSON('/foamBox/getStatisticalOutputByModel', function (result) {
|
||||
temperature(result, document.getElementById("temperatureFour"));
|
||||
});
|
||||
|
||||
|
||||
})
|
||||
|
||||
const deviceStatus = (statusArray) => {
|
||||
let info = `<table style="width: 100%;height:100%;">
|
||||
<tr style="width: 100%;">
|
||||
<td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[0] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
|
||||
<td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[1] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
|
||||
<td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[2] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
|
||||
<td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[3] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
|
||||
<td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="../../img/foamBox/${statusArray[4] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
|
||||
<td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/${statusArray[5] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
|
||||
</tr>
|
||||
</table>`;
|
||||
|
||||
$(".foamingLineRunStatus table tr").append(info);
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
artifactId=productionboard
|
||||
groupId=com.scada
|
||||
version=0.0.1-SNAPSHOT
|
||||
@ -0,0 +1,59 @@
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesTeamStatisticsMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\FoamBoxMachineRunStatusMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesMaterialProductionStatisticsMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\FoamBoxDevice\FoamBoxLineRunStatus.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellDevicePrameterValueMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellDeviceDataInformationMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IFoamBoxDeviceInfoService.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\StorageController.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\FoamBoxDeviceInfoServiceImpl.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellOeeStatisticsMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesMaterialStoreStatisticsMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesMaterialStoreStatistics.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellEnergyConsumptionMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\FoamBoxDevice\FoamBoxParamTemperature.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellThisMonthEnergyMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IMesProductionDataService.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesHourProdutionStatistics.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\MesProductionDataServiceImpl.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\FoamBoxLineRunStatusMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesMaterialProductionStatistics.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesTeamStatistics.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellLossStatisticsMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesHourProdutionStatisticsMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellController.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\FoamBoxDevice\FoamBoxMachineRunStatus.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellLossStatistics.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\FoamBoxParamTemperatureMapper.java
|
||||
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.java
|
||||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue