From 82c794aa1691821120ca4c6c8fda54a18cbb95f0 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 16 七月 2020 11:01:32 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs --- src/main/webapp/static/js/report/stayTime.js | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/static/js/report/stayTime.js b/src/main/webapp/static/js/report/stayTime.js index 961fe31..318ba8e 100644 --- a/src/main/webapp/static/js/report/stayTime.js +++ b/src/main/webapp/static/js/report/stayTime.js @@ -1,4 +1,14 @@ var pageCurr; +function getCol() { + var cols = [ + {field: 'appe_time', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200} + ,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'} + ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'} + ]; + cols.push.apply(cols, detlCols); + return cols; +} + layui.use(['table','laydate', 'form'], function(){ var table = layui.table; var $ = layui.jquery; @@ -17,22 +27,7 @@ limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, - cols: [[ - // {type: 'checkbox'} - {field: 'appe_time', title: '鍏ュ簱鏃堕棿', align: 'center'} - ,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'} - ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'} - ,{field: 'matnr', align: 'center',title: '鐗╂枡'} - ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'} - // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'} - // ,{field: 'tbnum', align: 'center',title: '璇锋眰缂栧彿'} - // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'} - // ,{field: 'werks', align: 'center',title: '宸ュ巶'} - ,{field: 'anfme', align: 'center',title: '鏁伴噺'} - ,{field: 'altme', align: 'center',title: '鍗曚綅'} - // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'} - ,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�',fixed: 'right'} - ]], + cols: [getCol()], request: { pageName: 'curr', pageSize: 'limit' -- Gitblit v1.9.1