master
夜笙歌 3 years ago
parent ed83662cc5
commit 5ab62ad776

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>箱壳可视化看板</title>
</head>
<body>
HelloWorld !!!
</body>
</html>

@ -0,0 +1,3 @@
artifactId=deviceboard
groupId=com.scada
version=0.0.1-SNAPSHOT

@ -0,0 +1,2 @@
com\deviceboard\DeviceBoardApplication.class
com\deviceboard\controller\TestController.class

@ -0,0 +1,2 @@
C:\Users\ADMIN\Desktop\visualboard\deviceboard\src\main\java\com\deviceboard\DeviceBoardApplication.java
C:\Users\ADMIN\Desktop\visualboard\deviceboard\src\main\java\com\deviceboard\controller\TestController.java

@ -21,8 +21,10 @@ $(() => {
});
//设备OEE统计
OEEStatistics(null, document.getElementById("OEEStatistics"));
//设备OEE统计
$.getJSON('/aluminumLiner/getOeeStatistics', function (result) {
OEEStatistics(result, document.getElementById("OEEStatistics"));
});
//库存情况
$.getJSON('/tankShell/getInventoryStatistics', function (result) {

@ -1529,7 +1529,16 @@ const multipleThreeDimensionalCylindrical = (res, ids) => {
//设备OEE统计
const OEEStatistics = (res, ids) => {
console.log(res);
let mycharts = echarts.init(ids);
let xAxisData = []
let yAxisData = []
res.forEach((item) => {
xAxisData.push(item.yValue);
yAxisData.push(item.xValue);
});
console.log(xAxisData);
console.log(yAxisData);
let option = {
tooltip: {},
@ -1552,14 +1561,7 @@ const OEEStatistics = (res, ids) => {
{
type: "category",
boundaryGap: false,
data: [
"11.01",
"11.02",
"11.03",
"11.04",
"11.05",
"11.06",
],
data: xAxisData,
min: 0,
splitNumber: 4,
splitLine: {
@ -1595,8 +1597,6 @@ const OEEStatistics = (res, ids) => {
{
type: "value",
min: 0,
max: 60,
interval: 20,
splitLine: {
show: true,
lineStyle: {
@ -1682,7 +1682,7 @@ const OEEStatistics = (res, ids) => {
shadowBlur: 20, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
},
},
data: [28, 39, 24, 45, 39, 42],
data:yAxisData,
}
],
};

@ -16,28 +16,28 @@ const dataInformationFunction = (statusArray) => {
const synthetic = (statusArray) => {
let info = `<table style="position: absolute;top: 9%;left: 30%;width: 40%;height:7%;">
<tr style="width: 100%; height: 50%;">
<td style="border:0px solid red;font-size:175%;text-align:center;width: 23%;color: #99C4EF;">${statusArray.yesterdayEnergy || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 27%;color: #7CED92;">${statusArray.thisMonthProuction || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 27%;color: #99C4EF;">${statusArray.yesterdayProuction || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 19%;color: #7CED92;">${statusArray.thisMonthEnergy || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 23%;color: #99C4EF;">${statusArray[0] || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 27%;color: #7CED92;">${statusArray[1] || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 27%;color: #99C4EF;">${statusArray[2] || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 19%;color: #7CED92;">${statusArray[3] || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 15%;"></td>
</tr>
</table>
<table style="position: absolute;top: 24%;left: 30%;width: 42%;height:10%;">
<tr style="width: 100%; height: 50%;">
<td style="border:0px solid red;text-align:center;width: 7%;"></td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 13%;color: #70C0EC;">${statusArray.yesterdayEnergy || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 13%;color: #70C0EC;">${statusArray[0] || 0}</td>
<td style="border:0px solid red;text-align:center;width: 13%;"></td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 14%;color: #DB718D;">${statusArray.yesterdayEnergy || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 14%;color: #DB718D;">${statusArray[0] || 0}</td>
<td style="border:0px solid red;text-align:center;width: 12%;"></td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 13%;color: #8CEF92;">${statusArray.yesterdayEnergy || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 13%;color: #8CEF92;">${statusArray[0] || 0}</td>
<td style="border:0px solid red;text-align:center;width: 13%;"></td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 14%;color: #ECE790;">${statusArray.yesterdayEnergy || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 14%;color: #ECE790;">${statusArray[0] || 0}</td>
<td style="border:0px solid red;text-align:center;width: 0%;"></td>
</tr>
</table>
<span style="position: absolute;font-size:175%;top: 12%;left: 85%;width: 15%;height:10%;text-align:left;background: linear-gradient(to bottom, #D2E5F7, #8CBAE4);color: transparent;display:inline-block;-webkit-background-clip: text;">${statusArray.yesterdayEnergy || 0}</span>
<span style="position: absolute;font-size:175%;top: 26.7%;left: 85%;width: 15%;height:10%;text-align:left;background: linear-gradient(to bottom, #F1FFFF, #7FE782);color: transparent;display:inline-block;-webkit-background-clip: text;">${statusArray.yesterdayEnergy || 0}</span>
<span style="position: absolute;font-size:175%;top: 12%;left: 85%;width: 15%;height:10%;text-align:left;background: linear-gradient(to bottom, #D2E5F7, #8CBAE4);color: transparent;display:inline-block;-webkit-background-clip: text;">${statusArray[0] || 0}</span>
<span style="position: absolute;font-size:175%;top: 26.7%;left: 85%;width: 15%;height:10%;text-align:left;background: linear-gradient(to bottom, #F1FFFF, #7FE782);color: transparent;display:inline-block;-webkit-background-clip: text;">${statusArray[0] || 0}</span>
`;
$("#synthetic").append(info);

@ -10,8 +10,7 @@ $(() => {
}
dataInformationFunction(statusArray);
});
$.getJSON('10.41.9.111:6069/aluminumLiner/getEnergyProductStatistics', function (result) {
debugger
$.getJSON('/aluminumLiner/getEnergyProductStatistics', function (result) {
synthetic(result)
});
@ -22,8 +21,10 @@ $(() => {
});
//设备OEE统计
OEEStatistics(null, document.getElementById("OEEStatistics"));
//设备OEE统计
$.getJSON('/aluminumLiner/getOeeStatistics', function (result) {
OEEStatistics(result, document.getElementById("OEEStatistics"));
});
//库存情况
$.getJSON('/tankShell/getInventoryStatistics', function (result) {

@ -1529,7 +1529,16 @@ const multipleThreeDimensionalCylindrical = (res, ids) => {
//设备OEE统计
const OEEStatistics = (res, ids) => {
console.log(res);
let mycharts = echarts.init(ids);
let xAxisData = []
let yAxisData = []
res.forEach((item) => {
xAxisData.push(item.yValue);
yAxisData.push(item.xValue);
});
console.log(xAxisData);
console.log(yAxisData);
let option = {
tooltip: {},
@ -1552,14 +1561,7 @@ const OEEStatistics = (res, ids) => {
{
type: "category",
boundaryGap: false,
data: [
"11.01",
"11.02",
"11.03",
"11.04",
"11.05",
"11.06",
],
data: xAxisData,
min: 0,
splitNumber: 4,
splitLine: {
@ -1595,8 +1597,6 @@ const OEEStatistics = (res, ids) => {
{
type: "value",
min: 0,
max: 60,
interval: 20,
splitLine: {
show: true,
lineStyle: {
@ -1682,7 +1682,7 @@ const OEEStatistics = (res, ids) => {
shadowBlur: 20, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
},
},
data: [28, 39, 24, 45, 39, 42],
data:yAxisData,
}
],
};

@ -16,28 +16,28 @@ const dataInformationFunction = (statusArray) => {
const synthetic = (statusArray) => {
let info = `<table style="position: absolute;top: 9%;left: 30%;width: 40%;height:7%;">
<tr style="width: 100%; height: 50%;">
<td style="border:0px solid red;font-size:175%;text-align:center;width: 23%;color: #99C4EF;">${statusArray.yesterdayEnergy || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 27%;color: #7CED92;">${statusArray.thisMonthProuction || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 27%;color: #99C4EF;">${statusArray.yesterdayProuction || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 19%;color: #7CED92;">${statusArray.thisMonthEnergy || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 23%;color: #99C4EF;">${statusArray[0] || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 27%;color: #7CED92;">${statusArray[1] || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 27%;color: #99C4EF;">${statusArray[2] || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 19%;color: #7CED92;">${statusArray[3] || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 15%;"></td>
</tr>
</table>
<table style="position: absolute;top: 24%;left: 30%;width: 42%;height:10%;">
<tr style="width: 100%; height: 50%;">
<td style="border:0px solid red;text-align:center;width: 7%;"></td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 13%;color: #70C0EC;">${statusArray.yesterdayEnergy || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 13%;color: #70C0EC;">${statusArray[0] || 0}</td>
<td style="border:0px solid red;text-align:center;width: 13%;"></td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 14%;color: #DB718D;">${statusArray.yesterdayEnergy || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 14%;color: #DB718D;">${statusArray[0] || 0}</td>
<td style="border:0px solid red;text-align:center;width: 12%;"></td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 13%;color: #8CEF92;">${statusArray.yesterdayEnergy || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 13%;color: #8CEF92;">${statusArray[0] || 0}</td>
<td style="border:0px solid red;text-align:center;width: 13%;"></td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 14%;color: #ECE790;">${statusArray.yesterdayEnergy || 0}</td>
<td style="border:0px solid red;font-size:175%;text-align:center;width: 14%;color: #ECE790;">${statusArray[0] || 0}</td>
<td style="border:0px solid red;text-align:center;width: 0%;"></td>
</tr>
</table>
<span style="position: absolute;font-size:175%;top: 12%;left: 85%;width: 15%;height:10%;text-align:left;background: linear-gradient(to bottom, #D2E5F7, #8CBAE4);color: transparent;display:inline-block;-webkit-background-clip: text;">${statusArray.yesterdayEnergy || 0}</span>
<span style="position: absolute;font-size:175%;top: 26.7%;left: 85%;width: 15%;height:10%;text-align:left;background: linear-gradient(to bottom, #F1FFFF, #7FE782);color: transparent;display:inline-block;-webkit-background-clip: text;">${statusArray.yesterdayEnergy || 0}</span>
<span style="position: absolute;font-size:175%;top: 12%;left: 85%;width: 15%;height:10%;text-align:left;background: linear-gradient(to bottom, #D2E5F7, #8CBAE4);color: transparent;display:inline-block;-webkit-background-clip: text;">${statusArray[0] || 0}</span>
<span style="position: absolute;font-size:175%;top: 26.7%;left: 85%;width: 15%;height:10%;text-align:left;background: linear-gradient(to bottom, #F1FFFF, #7FE782);color: transparent;display:inline-block;-webkit-background-clip: text;">${statusArray[0] || 0}</span>
`;
$("#synthetic").append(info);

@ -1,6 +1,5 @@
com\productionboard\mapper\AluminumLossStatisticsMapper.class
com\productionboard\common\CodeGenerator.class
com\productionboard\entity\AluminumDevice\AluminumEnergyProduction.class
com\productionboard\common\CodeGenerator$1.class
com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.class
com\productionboard\entity\BasicScadaDeviceinfo.class
@ -8,16 +7,22 @@ com\productionboard\controller\FoamBoxController.class
com\productionboard\service\IAluminumDeviceInfoService.class
com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.class
com\productionboard\controller\StorageController.class
com\productionboard\mapper\AluminumYesterdayEnergyMapper.class
com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.class
com\productionboard\common\CodeGenerator$2.class
com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.class
com\productionboard\mapper\BasicScadaDeviceinfoMapper.class
com\productionboard\controller\TankShellDeviceController.class
com\productionboard\config\MybatisPlusConfig.class
com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.class
com\productionboard\controller\AluminumLinerkController.class
com\productionboard\controller\PreassembleController.class
com\productionboard\service\BasicScadaDeviceinfoService.class
com\productionboard\mapper\AluminumDeviceDataInformationMapper.class
com\productionboard\ProductionBoardApplication.class
com\productionboard\mapper\AluminumThisMonthEnergyMapper.class
com\productionboard\mapper\AluminumOeeStatisticsMapper.class
com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.class
com\productionboard\controller\TankShellController.class
com\productionboard\entity\AluminumDevice\AluminumLossStatistics.class
com\productionboard\controller\AluminumTtankController.class

@ -1,22 +1,27 @@
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumEnergyProduction.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellController.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\StorageController.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java
E:\桌面\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\TankShellController.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\controller\StorageController.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java
C:\Users\ADMIN\Desktop\visualboard\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.java

Loading…
Cancel
Save