测试问题修复
This commit is contained in:
parent
3095177ba8
commit
516b83f1dd
|
|
@ -36,10 +36,11 @@
|
||||||
sl.operation_function,
|
sl.operation_function,
|
||||||
sl.operation_record,
|
sl.operation_record,
|
||||||
sl.operation_status,
|
sl.operation_status,
|
||||||
sl.createTime
|
sl.createTime,
|
||||||
|
su.username
|
||||||
FROM
|
FROM
|
||||||
sys_logs sl
|
sys_logs sl
|
||||||
|
LEFT JOIN sys_user su ON sl.userId = su.id
|
||||||
<where>
|
<where>
|
||||||
<if test="user.username != null and user.username != ''">
|
<if test="user.username != null and user.username != ''">
|
||||||
and (
|
and (
|
||||||
|
|
|
||||||
|
|
@ -100,6 +100,7 @@
|
||||||
uploadInst.config.elem.next()[0].value = '';
|
uploadInst.config.elem.next()[0].value = '';
|
||||||
|
|
||||||
obj.preview(function(index, file, result){
|
obj.preview(function(index, file, result){
|
||||||
|
$('#fileName').html(file.name);
|
||||||
i++;
|
i++;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -81,13 +81,16 @@
|
||||||
{field:'ano', width:80, title: '序号' ,templet:function(res){
|
{field:'ano', width:80, title: '序号' ,templet:function(res){
|
||||||
return res.LAY_INDEX;
|
return res.LAY_INDEX;
|
||||||
}}
|
}}
|
||||||
,{field: 'userid', width: 190, title: '用户名'}
|
,{field: 'username', width: 190, title: '用户名'}
|
||||||
,{field: 'isApp', title: '操作子系统'}
|
,{field: 'isApp', title: '操作子系统'}
|
||||||
,{field: 'module', width:190, title: '操作模块'}
|
,{field: 'module', width:190, title: '操作模块'}
|
||||||
,{field: 'operationFunction', title: '操作功能'}
|
// ,{field: 'operationFunction', title: '操作功能'}
|
||||||
,{field: 'operationRecord', title: '操作记录'}
|
// ,{field: 'operationRecord', title: '操作记录'}
|
||||||
,{field: 'createtime', title: '操作时间'}
|
,{field: 'createtime', title: '操作时间'}
|
||||||
,{field: 'operationStatus', title: '操作状态'}
|
,{field: 'operationStatus', title: '操作状态',
|
||||||
|
templet: function (d) {
|
||||||
|
return '成功';
|
||||||
|
}}
|
||||||
]],
|
]],
|
||||||
id : 'menuTable'
|
id : 'menuTable'
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue