|
|
@@ -228,27 +228,30 @@
|
|
|
|
|
|
$('#mTable').animate({ scrollTop: 0 }, 1000);
|
|
|
|
|
|
- loadTable('#报表', 'rpt.ashx?m=master&procedureid=7&p=' + request('p') + '&r=' + Math.random(), function (jsonData) {
|
|
|
-
|
|
|
- //for (var i = 0; i < jsonData.length; i++) {
|
|
|
- // for (var key in jsonData[i]) {
|
|
|
- // if (jsonData[i][key] == null) jsonData[i][key] = 0;
|
|
|
- // }
|
|
|
- //}
|
|
|
-
|
|
|
- //加载数据
|
|
|
- $('#报表').bootstrapTable('refreshOptions', { data: jsonData });
|
|
|
- //设置固定表头
|
|
|
- $('#表头').html($('#报表表头').html());
|
|
|
-
|
|
|
- refreshTime1 = Math.round((tableHeight - frameHeight) / offsetHeight / 2 + 5) * 1000;
|
|
|
- currentTime1 = refreshTime1;
|
|
|
-
|
|
|
- if (refreshTime1 < 10000) {
|
|
|
- refreshTime1 = 10000;
|
|
|
- currentTime1 = 10000;
|
|
|
- }
|
|
|
+ setTimeout(() => {
|
|
|
+ loadTable('#报表', 'rpt.ashx?m=master&procedureid=7&p=' + request('p') + '&r=' + Math.random(), function (jsonData) {
|
|
|
+
|
|
|
+ //for (var i = 0; i < jsonData.length; i++) {
|
|
|
+ // for (var key in jsonData[i]) {
|
|
|
+ // if (jsonData[i][key] == null) jsonData[i][key] = 0;
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+
|
|
|
+ //加载数据
|
|
|
+ $('#报表').bootstrapTable('refreshOptions', { data: jsonData });
|
|
|
+ //设置固定表头
|
|
|
+ $('#表头').html($('#报表表头').html());
|
|
|
+
|
|
|
+ refreshTime1 = Math.round((tableHeight - frameHeight) / offsetHeight / 2 + 5) * 1000 + 10000;
|
|
|
+ currentTime1 = refreshTime1;
|
|
|
+ console.log(refreshTime1);
|
|
|
+
|
|
|
+ if (refreshTime1 < 10000) {
|
|
|
+ refreshTime1 = 10000;
|
|
|
+ currentTime1 = 10000;
|
|
|
+ }
|
|
|
|
|
|
+ }, 8000)
|
|
|
});
|
|
|
}
|
|
|
else {
|
|
|
@@ -269,7 +272,7 @@
|
|
|
currentTime2 = -1000;
|
|
|
|
|
|
$('#mTable2').animate({ scrollTop: 0 }, 1000);
|
|
|
-
|
|
|
+ setTimeout(() => {
|
|
|
loadTable2('#报表2', 'rpt.ashx?m=detail&procedureid=8&p=' + request('p') + '&r=' + Math.random(), function (jsonData) {
|
|
|
|
|
|
//for (var i = 0; i < jsonData.length; i++) {
|
|
|
@@ -283,14 +286,14 @@
|
|
|
//设置固定表头
|
|
|
$('#表头2').html($('#报表表头2').html());
|
|
|
|
|
|
- refreshTime2 = Math.round((tableHeight2 - frameHeight2) / offsetHeight2 + 2) * 1000;
|
|
|
+ refreshTime2 = Math.round((tableHeight2 - frameHeight2) / offsetHeight2 + 2) * 1000 + 10000;
|
|
|
currentTime2 = refreshTime2;
|
|
|
|
|
|
if (refreshTime2 < 60000) {
|
|
|
refreshTime2 = 60000;
|
|
|
currentTime2 = 60000;
|
|
|
}
|
|
|
-
|
|
|
+ }, 8000)
|
|
|
});
|
|
|
}
|
|
|
else {
|