Merge branch '20190126bugth' into 'develop'

1.首页面退出操作字体未对齐

See merge request K18_NTCS_WEB/NTC!25
This commit is contained in:
方顺健
2019-01-27 19:46:35 +08:00
4 changed files with 9 additions and 4 deletions

View File

@@ -0,0 +1,3 @@
#Remove Sysuser Index
ALTER TABLE `sys_user`
DROP INDEX `AK_loginid_unique`;

View File

@@ -548,6 +548,7 @@ function cancelPassOpt(url){
url+="&hColumns="+hColumn.toString();
}
var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
//导出选中数据
if($(checkboxes).filter(":checked").length>0){
doAll(checkboxes,url);
@@ -561,6 +562,7 @@ function cancelPassOpt(url){
$("#searchForm").attr("action",url);
$("#searchForm").submit();
closeTip();
$("#searchForm").attr("action",searchUrl);
}
},{buttonsFocus:1});
top.$('.jbox-body .jbox-icon').css('top','55px');

View File

@@ -24,9 +24,9 @@
});
//筛选功能初始化
filterActionInit();
//$("#isAudit").change(function(){
// page();
//});
$("#isAudit").change(function(){
page();
});
//reset
$("#resetBtn").on("click",function(){
$("select.selectpicker").each(function(){

View File

@@ -415,7 +415,7 @@ background:#3d3d3d;
<li><a href="${ctx}/sys/user/info" target="mainFrame"><i class="icon-user"></i>&nbsp; <spring:message code="userInfo"></spring:message></a></li>
<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; <spring:message code="updatePwd"></spring:message></a></li>
<li><a href="${pageContext.request.contextPath }/logout" >
<i class="icon-key"></i> <spring:message code="exit"></spring:message></a></li>
<i class="icon-key"></i>&nbsp; <spring:message code="exit"></spring:message></a></li>
</ul></li>
<!-- END USER LOGIN DROPDOWN -->