diff --git a/js/pages/video/fixed_video.js b/js/pages/video/fixed_video.js index 7f490f2..7f490b1 100644 --- a/js/pages/video/fixed_video.js +++ b/js/pages/video/fixed_video.js @@ -159,7 +159,7 @@ function moreData() { } }); */ -/* window.addEventListener('beforeunload', async function (event) { +window.addEventListener('beforeunload', async function (event) { // 阻止默认行为以延迟页面卸载 event.preventDefault(); try { @@ -183,4 +183,4 @@ async function saveImportantData() { destroyPlugin(); resolve(); }); -} */ \ No newline at end of file +} \ No newline at end of file diff --git a/js/pages/workReport/workReport.js b/js/pages/workReport/workReport.js index 50af032..61380d2 100644 --- a/js/pages/workReport/workReport.js +++ b/js/pages/workReport/workReport.js @@ -1,5 +1,5 @@ -let form, laydate, table, layer; -let pageNum = 1, pageSize = 30; // 定义分页 +let form, laydate, table, layer, tableIns; +let pageNum = 1; // 定义分页 layui.use(["form", 'laydate', 'table', 'layer'], function () { form = layui.form; laydate = layui.laydate; @@ -38,8 +38,8 @@ function reloadTable(pageNum) { } function initTable(bidCode) { - const url = commonUrl + "screen/largeScreen/dataAnalysis/getListByType"; - table.render({ + const url = commonUrl + "screen/largeScreen/workReport/getWorkLists"; + tableIns = table.render({ elem: '#demo2', id: 'currentTableId', url: url, @@ -52,25 +52,27 @@ function initTable(bidCode) { }, where: { bidCode: bidCode, - startDate: $('#startDate').val(), - endDate: $('#endDate').val(), + startTime: $('#startDate').val(), + endTime: $('#endDate').val(), }, cols: [[ { type: 'numbers', title: '序号', width: '10%' }, // 添加序号列 - { field: 'date', title: '日期', align: 'center', width: '20%' }, - { field: 'warnContent', title: '计划工作内容', align: 'center', width: '30%' }, + { field: 'workDate', title: '日期', align: 'center', width: '20%' }, + { field: 'completionStatus', title: '计划工作内容', align: 'center', width: '30%' }, { field: 'photo', title: '工作内容完成情况', align: 'center', width: '30%' }, { field: 'status', title: '操作', align: 'center', width: '10%', templet: function (d) { let html = ""; - html += "填报工作情况"; + if (d.fillStatus === '0') { + html += "填报工作情况"; + } return html; }, } ]], done: function (res, curr, count, origin) { - // console.log(res); + console.log(res); pageNum = tableIns.config.page.curr; table.resize("currentTableId"); } diff --git a/pages/workReport/workReport.html b/pages/workReport/workReport.html index 7e1a689..2bde7eb 100644 --- a/pages/workReport/workReport.html +++ b/pages/workReport/workReport.html @@ -44,13 +44,9 @@