gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
tanghao
2018-12-25 09:47:55 +08:00
parent 9a79026802 8f84b7b6e9
commit b889cb1ccb
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/views/home.jsp
View File

@@ -342,7 +342,7 @@ background:#3d3d3d;
</div>
<!-- END MEGA MENU -->
<input type="hidden" id="tb_custom" value="<spring:message code='cfg_custom'/>"/>
<!-- BEGIN TOP NAVIGATION MENU -->
<div class="top-menu">
<ul class="nav navbar-nav pull-right">

4
src/main/webapp/static/global/scripts/jeesite.js
View File

@@ -397,8 +397,8 @@ function customColumnClick(){
html+="<div class='col-md-6'><label>"+ckbox_html+" "+$(this).html()+"</label></div>";
})
html +="</div>";
top.$.jBox(html,{title:"<i class='fa fa-wrench'></i> Custom Columns",showIcon:false,opacity:0.3,submit:submit});
var cus=$("#tb_custom",parent.document).val();
top.$.jBox(html,{title:"<i class='fa fa-wrench'></i>"+cus ,showIcon:false,opacity:0.3,submit:submit});
}