summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortanghao <default@DESKTOP-7FEGRP2>2019-01-27 16:24:39 +0800
committertanghao <default@DESKTOP-7FEGRP2>2019-01-27 16:24:39 +0800
commit355fa8e3cba9c66b54ebcdf1acd99c2e8ac1ca67 (patch)
tree0710de29be4f564f5e952f5efa6f94f3c67783c2
parentc8c75e566eed8054bf7322a6de415c21c50c1e95 (diff)
1.首页面退出操作字体未对齐
2.基本配置-用户管理-新增用户bug 3.ASN IP配置导出bug(实际为公共界面所有超过阈值导出共性BUG) 4.ASN IP下拉框onchange事件
-rw-r--r--src/main/resources/sql/20190126/alter_table_sysuser.sql3
-rw-r--r--src/main/webapp/WEB-INF/tags/sys/delRow.tag2
-rw-r--r--src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp6
-rw-r--r--src/main/webapp/WEB-INF/views/home.jsp2
4 files changed, 9 insertions, 4 deletions
diff --git a/src/main/resources/sql/20190126/alter_table_sysuser.sql b/src/main/resources/sql/20190126/alter_table_sysuser.sql
new file mode 100644
index 000000000..da7055def
--- /dev/null
+++ b/src/main/resources/sql/20190126/alter_table_sysuser.sql
@@ -0,0 +1,3 @@
+#Remove Sysuser Index
+ALTER TABLE `sys_user`
+DROP INDEX `AK_loginid_unique`;
diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index db67b470f..95d3de5d9 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -527,6 +527,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);
@@ -540,6 +541,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');
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
index 04e2fe0fe..47c448608 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
@@ -24,9 +24,9 @@
});
//筛选功能初始化
filterActionInit();
- //$("#isAudit").change(function(){
- // page();
- //});
+ $("#isAudit").change(function(){
+ page();
+ });
//reset
$("#resetBtn").on("click",function(){
$("select.selectpicker").each(function(){
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index 28ceed752..9825f5486 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -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 -->