wenjy
/
aucma-scada-visual-board-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
master
夜笙歌 3 years ago
parent cfbf1221b2
commit f3f104e066
15 changed files with 38 additions and 76 deletions
Show Stats Download Patch File Download Diff File

BIN
deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar
View File

Binary file not shown.

BIN
deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original
View File

Binary file not shown.

35
productionboard/src/main/resources/static/js/common/echarts.common.js
Unescape Escape View File

@ -1191,7 +1191,6 @@ const bluePolygonHistogram = (res, ids) => {
//多个立体柱状图
const multipleThreeDimensionalCylindrical = (res, ids) => {
let mycharts = echarts.init(ids);
console.log(res);
const xValue = res.map(val => val.materialName)
const lineStoreAmount = res.map(val => val.lineStoreAmount)
const hullStoreAmount = res.map(val => val.hullStoreAmount)
@ -1980,10 +1979,8 @@ const inventory = (res, ids) => {
//loss
const loss = (res, ids) => {
let mycharts = echarts.init(ids);
let xAxisData = [];
let seriesData1 = [];
let sum = 0;
const xValue = res.map(val => val.name)
const yValue = res.map(val => val.value)
let barTopColor = [
"#55F675",
@ -1991,29 +1988,7 @@ const loss = (res, ids) => {
let barBottomColor = [
"#55F675",
];
let Res =
{
datas:res.length > 0 ? res : [
{
name: '>30分钟',
value: 2
},
{
name: '3-10分钟',
value: 6
},
{
name: '0-3分钟',
value: 9
},
],
}
Res.datas.forEach((item) => {
xAxisData.push(item.name);
seriesData1.push(item.value);
sum += item.value;
});
let option = {
grid: {
@ -2025,7 +2000,7 @@ const loss = (res, ids) => {
axisTick: {
show: false,
},
data: xAxisData,
data: xValue,
axisLine: {
show: true,
},
@ -2103,7 +2078,7 @@ const loss = (res, ids) => {
},
},
symbolPosition: "end",
data: seriesData1,
data: yValue,
},
{
@ -2129,7 +2104,7 @@ const loss = (res, ids) => {
silent: true,
barWidth: 35,
barGap: "-100%", // Make series be overlap
data: seriesData1,
data: yValue,
},
],
};

2
productionboard/src/main/resources/static/js/tankShell/device.js
Unescape Escape View File

@ -14,7 +14,7 @@ $(() => {
});
//loss
$.getJSON('/tankShell/getInventoryStatistics', function (result) {
$.getJSON('/tankShellDevice/getLossStatistics', function (result) {
loss(result, document.getElementById("loss"));
});

16
productionboard/src/main/resources/templates/foamBox/index.html
Unescape Escape View File

@ -33,12 +33,6 @@
<div class="foamingLineRunStatus">
<table style="width: 100%;height:100%;">
<tr style="width: 100%;">
<td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
</tr>
</table>
</div>
@ -73,6 +67,16 @@
disableOnInteraction: false,
},
});
let info = `
<td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:right;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
`;
$(".foamingLineRunStatus table tr").append(info);
</script>
</html>

BIN
productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class
View File

Binary file not shown.

BIN
productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellLossStatistics.class
View File

Binary file not shown.

BIN
productionboard/target/classes/com/productionboard/mapper/TankShellLossStatisticsMapper.class
View File

Binary file not shown.

35
productionboard/target/classes/static/js/common/echarts.common.js
Unescape Escape View File

@ -1191,7 +1191,6 @@ const bluePolygonHistogram = (res, ids) => {
//多个立体柱状图
const multipleThreeDimensionalCylindrical = (res, ids) => {
let mycharts = echarts.init(ids);
console.log(res);
const xValue = res.map(val => val.materialName)
const lineStoreAmount = res.map(val => val.lineStoreAmount)
const hullStoreAmount = res.map(val => val.hullStoreAmount)
@ -1980,10 +1979,8 @@ const inventory = (res, ids) => {
//loss
const loss = (res, ids) => {
let mycharts = echarts.init(ids);
let xAxisData = [];
let seriesData1 = [];
let sum = 0;
const xValue = res.map(val => val.name)
const yValue = res.map(val => val.value)
let barTopColor = [
"#55F675",
@ -1991,29 +1988,7 @@ const loss = (res, ids) => {
let barBottomColor = [
"#55F675",
];
let Res =
{
datas:res.length > 0 ? res : [
{
name: '>30分钟',
value: 2
},
{
name: '3-10分钟',
value: 6
},
{
name: '0-3分钟',
value: 9
},
],
}
Res.datas.forEach((item) => {
xAxisData.push(item.name);
seriesData1.push(item.value);
sum += item.value;
});
let option = {
grid: {
@ -2025,7 +2000,7 @@ const loss = (res, ids) => {
axisTick: {
show: false,
},
data: xAxisData,
data: xValue,
axisLine: {
show: true,
},
@ -2103,7 +2078,7 @@ const loss = (res, ids) => {
},
},
symbolPosition: "end",
data: seriesData1,
data: yValue,
},
{
@ -2129,7 +2104,7 @@ const loss = (res, ids) => {
silent: true,
barWidth: 35,
barGap: "-100%", // Make series be overlap
data: seriesData1,
data: yValue,
},
],
};

2
productionboard/target/classes/static/js/tankShell/device.js
Unescape Escape View File

@ -14,7 +14,7 @@ $(() => {
});
//loss
$.getJSON('/tankShell/getInventoryStatistics', function (result) {
$.getJSON('/tankShellDevice/getLossStatistics', function (result) {
loss(result, document.getElementById("loss"));
});

16
productionboard/target/classes/templates/foamBox/index.html
Unescape Escape View File

@ -33,12 +33,6 @@
<div class="foamingLineRunStatus">
<table style="width: 100%;height:100%;">
<tr style="width: 100%;">
<td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
</tr>
</table>
</div>
@ -73,6 +67,16 @@
disableOnInteraction: false,
},
});
let info = `
<td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
<td style="border:0px solid red;text-align:right;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
`;
$(".foamingLineRunStatus table tr").append(info);
</script>
</html>

2
productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
Unescape Escape View File

@ -15,6 +15,7 @@ com\productionboard\config\MybatisPlusConfig.class
com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.class
com\productionboard\controller\AluminumLinerkController.class
com\productionboard\controller\PreassembleController.class
com\productionboard\entity\TankShellDevice\TankShellLossStatistics.class
com\productionboard\ProductionBoardApplication.class
com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.class
com\productionboard\mapper\AluminumThisMonthEnergyMapper.class
@ -24,6 +25,7 @@ com\productionboard\mapper\TankShellDevicePrameterValueMapper.class
com\productionboard\mapper\TankShellThisMonthEnergyMapper.class
com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.class
com\productionboard\service\impl\MesProductionDataServiceImpl.class
com\productionboard\mapper\TankShellLossStatisticsMapper.class
com\productionboard\controller\AluminumTtankController.class
com\productionboard\mapper\AluminumLossStatisticsMapper.class
com\productionboard\mapper\MesMaterialStoreStatisticsMapper.class

2
productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
Unescape Escape View File

@ -44,6 +44,8 @@ C:\Users\ADMIN\Desktop\
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\TankShellDevice\TankShellLossStatistics.java
C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.java

BIN
productionboard/target/productionboard-0.0.1-SNAPSHOT.jar
View File

Binary file not shown.

BIN
productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save