Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
guns-vip
Commits
77b40116
Commit
77b40116
authored
May 31, 2017
by
fsn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改日志排序无效的列
parent
a6c9a8b8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
6 deletions
+51
-6
src/main/webapp/static/modular/system/log/log.js
+2
-1
src/main/webapp/static/modular/system/log/login_log.js
+49
-5
No files found.
src/main/webapp/static/modular/system/log/log.js
View file @
77b40116
...
@@ -17,7 +17,8 @@ OptLog.initColumn = function () {
...
@@ -17,7 +17,8 @@ OptLog.initColumn = function () {
{
title
:
'id'
,
field
:
'id'
,
visible
:
false
,
align
:
'center'
,
valign
:
'middle'
},
{
title
:
'id'
,
field
:
'id'
,
visible
:
false
,
align
:
'center'
,
valign
:
'middle'
},
{
title
:
'日志类型'
,
field
:
'logtype'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'日志类型'
,
field
:
'logtype'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'日志名称'
,
field
:
'logname'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'日志名称'
,
field
:
'logname'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'用户名称'
,
field
:
'userName'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
// {title: '用户名称', field: 'userName', align: 'center', valign: 'middle', sortable: true, sortName: 'userid'},
{
title
:
'用户名称'
,
field
:
'userName'
,
align
:
'center'
,
valign
:
'middle'
},
{
title
:
'类名'
,
field
:
'classname'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'类名'
,
field
:
'classname'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'方法名'
,
field
:
'method'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'方法名'
,
field
:
'method'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'时间'
,
field
:
'createtime'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'时间'
,
field
:
'createtime'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
...
...
src/main/webapp/static/modular/system/log/login_log.js
View file @
77b40116
...
@@ -16,7 +16,7 @@ LoginLog.initColumn = function () {
...
@@ -16,7 +16,7 @@ LoginLog.initColumn = function () {
{
field
:
'selectItem'
,
radio
:
true
},
{
field
:
'selectItem'
,
radio
:
true
},
{
title
:
'id'
,
field
:
'id'
,
visible
:
false
,
align
:
'center'
,
valign
:
'middle'
},
{
title
:
'id'
,
field
:
'id'
,
visible
:
false
,
align
:
'center'
,
valign
:
'middle'
},
{
title
:
'日志名称'
,
field
:
'logname'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'日志名称'
,
field
:
'logname'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'用户名称'
,
field
:
'userName'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'用户名称'
,
field
:
'userName'
,
align
:
'center'
,
valign
:
'middle'
},
{
title
:
'时间'
,
field
:
'createtime'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'时间'
,
field
:
'createtime'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'具体消息'
,
field
:
'message'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'具体消息'
,
field
:
'message'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
},
{
title
:
'ip'
,
field
:
'ip'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
}];
{
title
:
'ip'
,
field
:
'ip'
,
align
:
'center'
,
valign
:
'middle'
,
sortable
:
true
}];
...
@@ -27,10 +27,10 @@ LoginLog.initColumn = function () {
...
@@ -27,10 +27,10 @@ LoginLog.initColumn = function () {
*/
*/
LoginLog
.
check
=
function
()
{
LoginLog
.
check
=
function
()
{
var
selected
=
$
(
'#'
+
this
.
id
).
bootstrapTable
(
'getSelections'
);
var
selected
=
$
(
'#'
+
this
.
id
).
bootstrapTable
(
'getSelections'
);
if
(
selected
.
length
==
0
)
{
if
(
selected
.
length
==
0
)
{
Feng
.
info
(
"请先选中表格中的某一记录!"
);
Feng
.
info
(
"请先选中表格中的某一记录!"
);
return
false
;
return
false
;
}
else
{
}
else
{
LoginLog
.
seItem
=
selected
[
0
];
LoginLog
.
seItem
=
selected
[
0
];
return
true
;
return
true
;
}
}
...
@@ -41,8 +41,8 @@ LoginLog.check = function () {
...
@@ -41,8 +41,8 @@ LoginLog.check = function () {
* 清空日志
* 清空日志
*/
*/
LoginLog
.
delLog
=
function
()
{
LoginLog
.
delLog
=
function
()
{
Feng
.
confirm
(
"是否清空所有日志?"
,
function
()
{
Feng
.
confirm
(
"是否清空所有日志?"
,
function
()
{
var
ajax
=
Feng
.
baseAjax
(
"/loginLog/delLoginLog"
,
"清空日志"
);
var
ajax
=
Feng
.
baseAjax
(
"/loginLog/delLoginLog"
,
"清空日志"
);
ajax
.
start
();
ajax
.
start
();
LoginLog
.
table
.
refresh
();
LoginLog
.
table
.
refresh
();
});
});
...
@@ -62,8 +62,52 @@ LoginLog.search = function () {
...
@@ -62,8 +62,52 @@ LoginLog.search = function () {
};
};
$
(
function
()
{
$
(
function
()
{
init
();
var
defaultColunms
=
LoginLog
.
initColumn
();
var
defaultColunms
=
LoginLog
.
initColumn
();
var
table
=
new
BSTable
(
LoginLog
.
id
,
"/loginLog/list"
,
defaultColunms
);
var
table
=
new
BSTable
(
LoginLog
.
id
,
"/loginLog/list"
,
defaultColunms
);
table
.
setPaginationType
(
"server"
);
table
.
setPaginationType
(
"server"
);
LoginLog
.
table
=
table
.
init
();
LoginLog
.
table
=
table
.
init
();
});
});
function
init
()
{
var
BootstrapTable
=
$
.
fn
.
bootstrapTable
.
Constructor
;
BootstrapTable
.
prototype
.
onSort
=
function
(
event
)
{
var
$this
=
event
.
type
===
"keypress"
?
$
(
event
.
currentTarget
)
:
$
(
event
.
currentTarget
).
parent
(),
$this_
=
this
.
$header
.
find
(
'th'
).
eq
(
$this
.
index
()),
sortName
=
this
.
header
.
sortNames
[
$this
.
index
()];
this
.
$header
.
add
(
this
.
$header_
).
find
(
'span.order'
).
remove
();
if
(
this
.
options
.
sortName
===
$this
.
data
(
'field'
))
{
this
.
options
.
sortOrder
=
this
.
options
.
sortOrder
===
'asc'
?
'desc'
:
'asc'
;
}
else
{
this
.
options
.
sortName
=
sortName
||
$this
.
data
(
'field'
);
this
.
options
.
sortOrder
=
$this
.
data
(
'order'
)
===
'asc'
?
'desc'
:
'asc'
;
}
this
.
trigger
(
'sort'
,
this
.
options
.
sortName
,
this
.
options
.
sortOrder
);
$this
.
add
(
$this_
).
data
(
'order'
,
this
.
options
.
sortOrder
);
// Assign the correct sortable arrow
this
.
getCaret
();
if
(
this
.
options
.
sidePagination
===
'server'
)
{
this
.
initServer
(
this
.
options
.
silentSort
);
return
;
}
this
.
initSort
();
this
.
initBody
();
};
BootstrapTable
.
prototype
.
getCaret
=
function
()
{
var
that
=
this
;
$
.
each
(
this
.
$header
.
find
(
'th'
),
function
(
i
,
th
)
{
var
sortName
=
that
.
header
.
sortNames
[
i
];
$
(
th
).
find
(
'.sortable'
).
removeClass
(
'desc asc'
).
addClass
((
sortName
||
$
(
th
).
data
(
'field'
))
===
that
.
options
.
sortName
?
that
.
options
.
sortOrder
:
'both'
);
});
};
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment