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

修改

Browse Source
master
夜笙歌 2 years ago
parent 53c14d8ee2
commit 1e1de43812
15 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File

4
productionboard/src/main/resources/static/css/adsorptionTank/style.css
Unescape Escape View File

@ -32,4 +32,8 @@ body {
height: 32%;
top: 23%;
left: 3.5%;
}
.span_c{
margin-left: 5%;
margin-right: 10% !important;
}

4
productionboard/src/main/resources/static/css/aluminumTank/style.css
Unescape Escape View File

@ -32,4 +32,8 @@ body {
height: 32%;
bottom: 4.5%;
left: 3.5%;
}
.span_c{
margin-left: 5%;
margin-right: 10% !important;
}

4
productionboard/src/main/resources/static/css/preassemble/style.css
Unescape Escape View File

@ -32,4 +32,8 @@ body {
height: 32%;
top: 23%;
left: 3.5%;
}
.span_c{
margin-left: 5%;
margin-right: 10% !important;
}

5
productionboard/src/main/resources/static/css/tankShell/style.css
Unescape Escape View File

@ -32,4 +32,9 @@ body {
height: 32%;
bottom: 4.5%;
left: 3.5%;
}
.span_c{
margin-left: 5%;
margin-right: 10% !important;
}

2
productionboard/src/main/resources/static/js/common/ondutyplan.js
Unescape Escape View File

@ -3,7 +3,7 @@ $(() =>{
let html = `<div id="theCurrentTeam" class="onDutyPlan display-blocks theCurrentTeam">
<span>-</span>
<span>-</span>
<span style='margin-left: 5%;margin-right: 10%;'>-</span>
<span class="span_c" >-</span>
<span>-</span>
</div>

12
productionboard/src/main/resources/static/js/foamBox/index.js
Unescape Escape View File

@ -1,4 +1,5 @@
$(() => {
//班组计划统计
// onDutyPlan(1234, 1202, 33);
$.getJSON('/foamBox/getTeamStatisticsJson', function (result) {
@ -6,11 +7,13 @@ $(() => {
});
//设备运行状态
let statusArray = [0, 0, 0, 0, 1, 0];
deviceStatus(statusArray);
$.getJSON(`/foamBox/getRunStatusJson?ids=${ids}`, function (result) {
deviceStatus(result);
});
//库存统计
$.getJSON('/foamBox/getMaterialStoreJson', function (result) {
$.getJSON(`/foamBox/getMaterialStoreJson`, function (result) {
threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics"));
});
@ -141,4 +144,5 @@ const deviceStatus = (statusArray) => {
$(".foamingLineRunStatus table tr").append(info);
}
}

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

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<meta charset="UTF-8">
@ -67,6 +67,8 @@
disableOnInteraction: false,
},
});
const ids = [[${positionId}]];
// 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>

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

Binary file not shown.

4
productionboard/target/classes/static/css/adsorptionTank/style.css
Unescape Escape View File

@ -32,4 +32,8 @@ body {
height: 32%;
top: 23%;
left: 3.5%;
}
.span_c{
margin-left: 5%;
margin-right: 10% !important;
}

4
productionboard/target/classes/static/css/aluminumTank/style.css
Unescape Escape View File

@ -32,4 +32,8 @@ body {
height: 32%;
bottom: 4.5%;
left: 3.5%;
}
.span_c{
margin-left: 5%;
margin-right: 10% !important;
}

4
productionboard/target/classes/static/css/preassemble/style.css
Unescape Escape View File

@ -32,4 +32,8 @@ body {
height: 32%;
top: 23%;
left: 3.5%;
}
.span_c{
margin-left: 5%;
margin-right: 10% !important;
}

5
productionboard/target/classes/static/css/tankShell/style.css
Unescape Escape View File

@ -32,4 +32,9 @@ body {
height: 32%;
bottom: 4.5%;
left: 3.5%;
}
.span_c{
margin-left: 5%;
margin-right: 10% !important;
}

2
productionboard/target/classes/static/js/common/ondutyplan.js
Unescape Escape View File

@ -3,7 +3,7 @@ $(() =>{
let html = `<div id="theCurrentTeam" class="onDutyPlan display-blocks theCurrentTeam">
<span>-</span>
<span>-</span>
<span style='margin-left: 5%;margin-right: 10%;'>-</span>
<span class="span_c" >-</span>
<span>-</span>
</div>

12
productionboard/target/classes/static/js/foamBox/index.js
Unescape Escape View File

@ -1,4 +1,5 @@
$(() => {
//班组计划统计
// onDutyPlan(1234, 1202, 33);
$.getJSON('/foamBox/getTeamStatisticsJson', function (result) {
@ -6,11 +7,13 @@ $(() => {
});
//设备运行状态
let statusArray = [0, 0, 0, 0, 1, 0];
deviceStatus(statusArray);
$.getJSON(`/foamBox/getRunStatusJson?id=${ids}`, function (result) {
deviceStatus(result);
});
//库存统计
$.getJSON('/foamBox/getMaterialStoreJson', function (result) {
$.getJSON(`/foamBox/getMaterialStoreJson`, function (result) {
threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics"));
});
@ -141,4 +144,5 @@ const deviceStatus = (statusArray) => {
$(".foamingLineRunStatus table tr").append(info);
}
}

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

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<meta charset="UTF-8">
@ -67,6 +67,8 @@
disableOnInteraction: false,
},
});
const ids = [[${positionId}]];
// 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>

Write Preview
Loading…
Cancel
Save