From 653aa18b7298cf09e74e144cc8dc093a79cfbfba Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 六月 2020 11:12:06 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/user/user.js |   43 ++++++++++++++++++++-----------------------
 1 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index cd24082..0d07fcf 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -13,21 +13,22 @@
         url: baseUrl+'/user/list/auth',
         page: true,
         limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
         toolbar: '#toolbar',
         even: true,
         cellMinWidth: 50,
         cols: [[
             {type: 'checkbox'}
-            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-            ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛',event: 'Host', style: 'text-decoration: underline;cursor:pointer'}
-            ,{field: 'username', align: 'center',title: '璐﹀彿'}
-            ,{field: 'mobile', align: 'center',title: '鎵嬫満鍙�'}
+            ,{field: 'id', title: 'ID', sort: true,align: 'center', width: 80}
+            // ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛'}
+            ,{field: 'mobile', align: 'center',title: '璐﹀彿'}
+            ,{field: 'username', align: 'center',title: '鍚嶇О'}
             ,{field: 'password', align: 'center',title: '瀵嗙爜'}
-            ,{field: 'roleName', align: 'center',title: '瑙掕壊',event: 'Role', style: 'text-decoration: underline;cursor:pointer'}
-            ,{field: 'createTime$', align: 'center',title: '娉ㄥ唽鏃堕棿'}
+            ,{field: 'roleName', align: 'center',title: '瑙掕壊'}
+            // ,{field: 'createTime$', align: 'center',title: '娉ㄥ唽鏃堕棿'}
             ,{field: 'status$', align: 'center',title: '鐘舵��'}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
         ]],
         request: {
             pageName: 'curr',
@@ -46,7 +47,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = baseUrl;
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -68,7 +69,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -86,7 +87,7 @@
                     title: '鏂板',
                     maxmin: true,
                     area: [top.detailWidth, top.detailHeight],
-                    shadeClose: false,
+                    shadeClose: true,
                     content: 'user_detail.html',
                     success: function(layero, index){
                     	clearFormVal(layer.getChildFrame('#detail', index));
@@ -123,7 +124,7 @@
                                     layer.closeAll();
                                     tableReload(false);
                                 } else if (res.code === 403){
-                                    top.location.href = baseUrl;
+                                    top.location.href = baseUrl+"/";
                                 } else {
                                     layer.msg(res.msg)
                                 }
@@ -133,7 +134,7 @@
                 }
                 break;
             case 'exportData':
-                layer.confirm('纭畾瀵煎嚭Excel鍚�', function() {
+                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function() {
                     var titles = [];
                     var fields = [];
                     obj.config.cols[0].map(function (col) {
@@ -162,7 +163,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)
                             }
@@ -202,7 +203,7 @@
                     title: '淇敼',
                     maxmin: true,
                     area: [top.detailWidth, top.detailHeight],
-                    shadeClose: false,
+                    shadeClose: true,
                     content: 'user_detail.html',
                     success: function(layero, index){
                         setFormVal(layer.getChildFrame('#detail', index), data);
@@ -315,7 +316,7 @@
                         $(this).val("");
                     });
                 } else if (res.code === 403){
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -343,14 +344,10 @@
         type: 'datetime'
     });
     layDate.render({
-        elem: '#create_time\\>',
-        type: 'datetime'
+        elem: '.layui-laydate-range'
+        ,type: 'datetime'
+        ,range: true
     });
-    layDate.render({
-        elem: '#create_time\\<',
-        type: 'datetime'
-    });
-
 });
 
 // 鍏抽棴鍔ㄤ綔
@@ -370,7 +367,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