From f8bdc51fe4c57a250fb1240056d767883b7d6739 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 12 十二月 2023 16:49:17 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/static/js/operateLog/operateLog.js | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/static/js/operateLog/operateLog.js b/src/main/webapp/static/js/operateLog/operateLog.js
index 87a1545..d8c9acf 100644
--- a/src/main/webapp/static/js/operateLog/operateLog.js
+++ b/src/main/webapp/static/js/operateLog/operateLog.js
@@ -10,23 +10,24 @@
tableIns = table.render({
elem: '#operateLog',
headers: {token: localStorage.getItem('token')},
- url: '/operateLog/list/auth',
+ url: baseUrl+'/operateLog/list/auth',
page: true,
limit: 16,
- // even: true,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox', fixed: 'left'}
- ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'action', align: 'center',title: '璁块棶鍦板潃'}
- ,{field: 'userId$', align: 'center',title: '鐢ㄦ埛',event: 'userId', style: 'text-decoration: underline;cursor:pointer'}
- ,{field: 'ip', edit:'text', align: 'center',title: '瀹㈡埛绔疘P'}
+ // {type: 'checkbox'}
+ {field: 'id', title: 'ID', sort: true,align: 'center', width: 80}
+ ,{field: 'userId$', align: 'center',title: '鐢ㄦ埛'}
+ ,{field: 'action', align: 'center',title: '鎿嶄綔鍐呭'}
+ ,{field: 'ip', align: 'center',title: '瀹㈡埛绔疘P'}
,{field: 'request', align: 'center',title: '璇锋眰鏁版嵁'}
,{field: 'response', align: 'center',title: '鍝嶅簲鏁版嵁'}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
request: {
pageName: 'curr',
@@ -45,7 +46,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -77,7 +78,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -122,7 +123,7 @@
} else {
layer.confirm('纭畾鍒犻櫎'+(ids.length===1?'姝�':ids.length)+'鏉℃暟鎹悧', function(){
$.ajax({
- url: "/operateLog/delete/auth",
+ url: baseUrl+"/operateLog/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {ids: ids},
method: 'POST',
@@ -132,7 +133,7 @@
layer.closeAll();
tableReload(false);
} else if (res.code === 403){
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -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) {
@@ -160,7 +161,7 @@
'fields': fields
};
$.ajax({
- url: "/operateLog/export/auth",
+ url: baseUrl+"/operateLog/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
@@ -171,7 +172,7 @@
if (res.code === 200) {
table.exportFile(titles,res.data,'xls');
} else if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -235,7 +236,7 @@
content: '../user/user_detail.html',
success: function(layero, index){
$.ajax({
- url: "/user/"+ param +"/auth",
+ url: baseUrl+"/user/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -276,7 +277,7 @@
};
$.ajax({
- url: "/operateLog/edit/auth",
+ url: baseUrl+"/operateLog/edit/auth",
headers: {'token': localStorage.getItem('token')},
data: top.reObject(data),
method: 'POST',
@@ -288,7 +289,7 @@
$(this).val("");
});
} else if (res.code === 403){
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}else {
layer.msg(res.msg)
}
@@ -315,7 +316,11 @@
elem: '#createTime\\$',
type: 'datetime'
});
-
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
});
// 鍏抽棴鍔ㄤ綔
@@ -335,7 +340,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
if (res.data.length === 0 && count !== 0) {
--
Gitblit v1.9.1