From c7d94e56033525c99d3dec0c3c08876a900b30d5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 30 六月 2020 16:38:09 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/report/stayTime.js |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/static/js/report/stayTime.js b/src/main/webapp/static/js/report/stayTime.js
index b885d1d..5947366 100644
--- a/src/main/webapp/static/js/report/stayTime.js
+++ b/src/main/webapp/static/js/report/stayTime.js
@@ -14,23 +14,24 @@
         url: baseUrl+'/report/viewStayTimeList.action',
         page: true,
         limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
             {type: 'checkbox'}
-            ,{field: 'appe_time', title: '鍏ュ簱鏃堕棿', sort: true, align: 'center'}
+            ,{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: '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: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
-            ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID',fixed: 'right'}
+            // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
+            ,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�',fixed: 'right'}
         ]],
         request: {
             pageName: 'curr',
@@ -49,7 +50,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = baseUrl;
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -71,7 +72,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -84,7 +85,7 @@
         var checkStatus = table.checkStatus(obj.config.id);
         switch(obj.event) {
             case 'exportData':
-                layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
                     var titles=[];
                     var fields=[];
                     obj.config.cols[0].map(function (col) {
@@ -108,7 +109,7 @@
                             if (res.code === 200) {
                                 table.exportFile(titles,res.data,'xls');
                             } else if (res.code === 403) {
-                                top.location.href = baseUrl;
+                                top.location.href = baseUrl+"/";
                             } else {
                                 layer.msg(res.msg)
                             }
@@ -143,7 +144,7 @@
         },
         done: function (res, curr, count) {
             if (res.code === 403) {
-                top.location.href = baseUrl;
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             if (res.data.length === 0 && count !== 0) {

--
Gitblit v1.9.1