Merge branch 'bugfix-2019012720-del-css修改delete按钮字体' into 'develop'
修改界面delete按钮样式 See merge request K18_NTCS_WEB/NTC!29
This commit is contained in:
@@ -8,7 +8,7 @@
|
|||||||
<c:choose>
|
<c:choose>
|
||||||
<c:when test="${label eq 'delete'}">
|
<c:when test="${label eq 'delete'}">
|
||||||
<a href="javascript:void(0);" class="btn btn-default" onclick="del('${url}')" data-toggle="tooltip" data-placement="top">
|
<a href="javascript:void(0);" class="btn btn-default" onclick="del('${url}')" data-toggle="tooltip" data-placement="top">
|
||||||
<i class="fa fa-trash"> <spring:message code="delete"/></i>
|
<i class="fa fa-trash"></i> <spring:message code="delete"/>
|
||||||
</a>
|
</a>
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:when test="${label eq 'update'}">
|
<c:when test="${label eq 'update'}">
|
||||||
@@ -27,27 +27,27 @@
|
|||||||
</c:when>
|
</c:when>
|
||||||
<c:when test="${label eq 'cfg_excel'}">
|
<c:when test="${label eq 'cfg_excel'}">
|
||||||
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
|
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
|
||||||
<i class="fa fa-download"> <spring:message code="Excel"/></i>
|
<i class="fa fa-download"></i> <spring:message code="Excel"/>
|
||||||
</a>
|
</a>
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:when test="${label eq 'export'}">
|
<c:when test="${label eq 'export'}">
|
||||||
<a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
|
<a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
|
||||||
<i class="fa fa-download"> <spring:message code="Excel"/></i>
|
<i class="fa fa-download"></i> <spring:message code="Excel"/>
|
||||||
</a>
|
</a>
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:when test="${label eq 'cfg_csv'}">
|
<c:when test="${label eq 'cfg_csv'}">
|
||||||
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
|
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
|
||||||
<i class="fa fa-download"> <spring:message code="CSV"/></i>
|
<i class="fa fa-download"></i> <spring:message code="CSV"/>
|
||||||
</a>
|
</a>
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:when test="${label eq 'excel'}">
|
<c:when test="${label eq 'excel'}">
|
||||||
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}','log')" data-toggle="tooltip" data-placement="top">
|
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}','log')" data-toggle="tooltip" data-placement="top">
|
||||||
<i class="fa fa-download"> <spring:message code="Excel"/></i>
|
<i class="fa fa-download"></i> <spring:message code="Excel"/>
|
||||||
</a>
|
</a>
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:when test="${label eq 'csv'}">
|
<c:when test="${label eq 'csv'}">
|
||||||
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}','log')" data-toggle="tooltip" data-placement="top">
|
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}','log')" data-toggle="tooltip" data-placement="top">
|
||||||
<i class="fa fa-download"> <spring:message code="CSV"/></i>
|
<i class="fa fa-download"></i> <spring:message code="CSV"/>
|
||||||
</a>
|
</a>
|
||||||
</c:when>
|
</c:when>
|
||||||
</c:choose>
|
</c:choose>
|
||||||
@@ -548,7 +548,6 @@ function cancelPassOpt(url){
|
|||||||
url+="&hColumns="+hColumn.toString();
|
url+="&hColumns="+hColumn.toString();
|
||||||
}
|
}
|
||||||
var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
|
var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
|
||||||
|
|
||||||
//导出选中数据
|
//导出选中数据
|
||||||
if($(checkboxes).filter(":checked").length>0){
|
if($(checkboxes).filter(":checked").length>0){
|
||||||
doAll(checkboxes,url);
|
doAll(checkboxes,url);
|
||||||
@@ -562,7 +561,6 @@ function cancelPassOpt(url){
|
|||||||
$("#searchForm").attr("action",url);
|
$("#searchForm").attr("action",url);
|
||||||
$("#searchForm").submit();
|
$("#searchForm").submit();
|
||||||
closeTip();
|
closeTip();
|
||||||
$("#searchForm").attr("action",searchUrl);
|
|
||||||
}
|
}
|
||||||
},{buttonsFocus:1});
|
},{buttonsFocus:1});
|
||||||
top.$('.jbox-body .jbox-icon').css('top','55px');
|
top.$('.jbox-body .jbox-icon').css('top','55px');
|
||||||
|
|||||||
Reference in New Issue
Block a user