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 daa3eabcb7
commit 0cc7484397
6 changed files with 192 additions and 104 deletions
Show Stats Download Patch File Download Diff File

4
productionboard/src/main/resources/static/js/common/scrollTable.js
Unescape Escape View File

@ -220,7 +220,7 @@ let dynamicTable = resource => {
//奇偶校验 --> 处理最后一行是奇数的问题
let oddORevenCheck = $(`${ele}>.table>.tbody>.tr`).length % 2 == 0 ? 'even' : 'odd';
//滚动动画
setInterval(function() {
var animation = () => setInterval(function() {
$(ele + '>.table>.tbody>.tr:eq(0)').slideToggle(100, function() {
switch (oddORevenCheck) {
case 'even':
@ -239,7 +239,7 @@ let dynamicTable = resource => {
// 组件销毁钩子
$(`${ele}`).bind('DOMNodeRemoved', (e) => {
if (e.target.classList[0] === 'asit-table') {
clearInterval(timer);
clearInterval(animation);
}
});
}

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

@ -4,6 +4,31 @@ $(() => {
$.getJSON('/tankShellDevice/getOeeStatistics', function (result) {
OEEStatistics(result, document.getElementById("OEEStatistics"));
});
setInterval(() => {
let result = [
{
"createTime": 1654729200000,
"yValue": "07",
"xValue": Math.random() * 3
},
{
"createTime": 1654732800000,
"yValue": "08",
"xValue": Math.random() * 3
},
{
"createTime": 1654736400000,
"yValue": "09",
"xValue": Math.random() * 3
},
{
"createTime": 1654740000000,
"yValue": "10",
"xValue": Math.random() * 3
}
]
OEEStatistics(result, document.getElementById("OEEStatistics"));
}, 1000);
//设备故障排名
$.getJSON('/tankShell/getStatisticalOutputByModel', function (result) {
@ -21,20 +46,25 @@ $(() => {
});
//生产计划
let isUpdata = false
const getTable = () => {
$.ajax({
url: '/storage/getProductionPlan',
type: 'GET',
dataType: 'JSON',
success: function (res) {
console.log('update');
let Res = res
Res.data.forEach(val => {
val[0] = 'SHEBEI452736'
val[1] = 'AGYM45HH23'
val[2] = '32'
val[2] = Math.random()*30
val[3] = '2021.01.01 10:00:00'
delete val[4]
});
Res.header = ['设备名称', '参数名称', '当前值', '时间',]
console.log(Res);
dynamicTable({
el: '#productionPlan',
rowNum: 5,
@ -54,10 +84,23 @@ $(() => {
console.log(e)
}
});
}
getTable()
setInterval(() => {
console.log(123123);
if (isUpdata) {
console.log($('#productionPlan'));
clearInterval(animation);
animation = null
$('.scrollTable').html('<div class="productionPlan" id="productionPlan"></div>')
getTable()
}
}, 2000);
setInterval(() => {
isUpdata = !isUpdata
}, 4000);
/*数据信息*/
const statusArray = [0, 0, 0, 0, 0];
// var a = () => {
$.getJSON('/tankShellDevice/getDataInformation', function (result) {
dataInformationFunction(result)
});
@ -72,7 +115,6 @@ $(() => {
$.getJSON('/tankShellDevice/getRunParameters', function (result) {
runParamStatisticsFunction(result)
});
// }
})
/*数据信息*/

2
productionboard/src/main/resources/templates/tankShell/device.html
Unescape Escape View File

@ -42,7 +42,9 @@
<div class="loss" id="loss"></div>
<!--设备信息-->
<div class="scrollTable">
<div class="productionPlan" id="productionPlan"></div>
</div>
<!--设备产量能耗对比-->
<div class="energyConsumption" id="energyConsumption"></div>

4
productionboard/target/classes/static/js/common/scrollTable.js
Unescape Escape View File

@ -220,7 +220,7 @@ let dynamicTable = resource => {
//奇偶校验 --> 处理最后一行是奇数的问题
let oddORevenCheck = $(`${ele}>.table>.tbody>.tr`).length % 2 == 0 ? 'even' : 'odd';
//滚动动画
setInterval(function() {
var animation = () => setInterval(function() {
$(ele + '>.table>.tbody>.tr:eq(0)').slideToggle(100, function() {
switch (oddORevenCheck) {
case 'even':
@ -239,7 +239,7 @@ let dynamicTable = resource => {
// 组件销毁钩子
$(`${ele}`).bind('DOMNodeRemoved', (e) => {
if (e.target.classList[0] === 'asit-table') {
clearInterval(timer);
clearInterval(animation);
}
});
}

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

@ -4,6 +4,31 @@ $(() => {
$.getJSON('/tankShellDevice/getOeeStatistics', function (result) {
OEEStatistics(result, document.getElementById("OEEStatistics"));
});
setInterval(() => {
let result = [
{
"createTime": 1654729200000,
"yValue": "07",
"xValue": Math.random() * 3
},
{
"createTime": 1654732800000,
"yValue": "08",
"xValue": Math.random() * 3
},
{
"createTime": 1654736400000,
"yValue": "09",
"xValue": Math.random() * 3
},
{
"createTime": 1654740000000,
"yValue": "10",
"xValue": Math.random() * 3
}
]
OEEStatistics(result, document.getElementById("OEEStatistics"));
}, 1000);
//设备故障排名
$.getJSON('/tankShell/getStatisticalOutputByModel', function (result) {
@ -21,20 +46,25 @@ $(() => {
});
//生产计划
let isUpdata = false
const getTable = () => {
$.ajax({
url: '/storage/getProductionPlan',
type: 'GET',
dataType: 'JSON',
success: function (res) {
console.log('update');
let Res = res
Res.data.forEach(val => {
val[0] = 'SHEBEI452736'
val[1] = 'AGYM45HH23'
val[2] = '32'
val[2] = Math.random()*30
val[3] = '2021.01.01 10:00:00'
delete val[4]
});
Res.header = ['设备名称', '参数名称', '当前值', '时间',]
console.log(Res);
dynamicTable({
el: '#productionPlan',
rowNum: 5,
@ -54,10 +84,23 @@ $(() => {
console.log(e)
}
});
}
getTable()
setInterval(() => {
console.log(123123);
if (isUpdata) {
console.log($('#productionPlan'));
clearInterval(animation);
animation = null
$('.scrollTable').html('<div class="productionPlan" id="productionPlan"></div>')
getTable()
}
}, 2000);
setInterval(() => {
isUpdata = !isUpdata
}, 10000);
/*数据信息*/
const statusArray = [0, 0, 0, 0, 0];
// var a = () => {
$.getJSON('/tankShellDevice/getDataInformation', function (result) {
dataInformationFunction(result)
});
@ -72,7 +115,6 @@ $(() => {
$.getJSON('/tankShellDevice/getRunParameters', function (result) {
runParamStatisticsFunction(result)
});
// }
})
/*数据信息*/

2
productionboard/target/classes/templates/tankShell/device.html
Unescape Escape View File

@ -42,7 +42,9 @@
<div class="loss" id="loss"></div>
<!--设备信息-->
<div class="scrollTable">
<div class="productionPlan" id="productionPlan"></div>
</div>
<!--设备产量能耗对比-->
<div class="energyConsumption" id="energyConsumption"></div>

Write Preview
Loading…
Cancel
Save