From e4c065d96a605cd8f60103b31dfbe4d1fe34aae8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 11 七月 2025 08:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/srjtasrs' into srjtasrs
---
src/main/webapp/static/js/operateLog/operateLog.js | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/static/js/operateLog/operateLog.js b/src/main/webapp/static/js/operateLog/operateLog.js
index bf74466..50032c4 100644
--- a/src/main/webapp/static/js/operateLog/operateLog.js
+++ b/src/main/webapp/static/js/operateLog/operateLog.js
@@ -13,20 +13,21 @@
url: baseUrl+'/operateLog/list/auth',
page: true,
limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', title: 'ID', sort: true,align: 'center', width: 80}
- ,{field: 'action', align: 'center',title: '璁块棶鍦板潃'}
- ,{field: 'userId$', align: 'center',title: '鐢ㄦ埛',event: 'userId'}
- ,{field: 'ip', edit:'text', align: 'center',title: '瀹㈡埛绔疘P'}
- ,{field: 'request', align: 'center',title: '璇锋眰鏁版嵁'}
- ,{field: 'response', align: 'center',title: '鍝嶅簲鏁版嵁'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ // {type: 'checkbox'}
+ {field: 'id', title: 'ID', sort: true,align: 'center', width: 80,hide : true}
+ ,{field: 'userId$', align: 'center',title: '鐢ㄦ埛',hide : false}
+ ,{field: 'action', align: 'center',title: '鎿嶄綔鍐呭',hide : false}
+ ,{field: 'ip', align: 'center',title: '瀹㈡埛绔疘P',hide : true}
+ ,{field: 'request', align: 'center',title: '璇锋眰鏁版嵁',hide : true}
+ ,{field: 'response', align: 'center',title: '鍝嶅簲鏁版嵁',hide : false}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿',hide : false}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
request: {
pageName: 'curr',
@@ -142,7 +143,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) {
@@ -315,7 +316,11 @@
elem: '#createTime\\$',
type: 'datetime'
});
-
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
});
// 鍏抽棴鍔ㄤ綔
--
Gitblit v1.9.1