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

This commit is contained in:
wangxin
2019-01-15 17:48:47 +08:00
3 changed files with 19 additions and 2 deletions

View File

@@ -355,7 +355,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th column="cfg_id" class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th column="config_describe" class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="action" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="ignore_query_string" ><spring:message code="ignore_query_string"/></th>
<th column="include_cookie" ><spring:message code="include_cookie"/></th>
<th column="no_revalidate" ><spring:message code="no_revalidate"/></th>

View File

@@ -1377,6 +1377,11 @@ function echart_topic_domain(rs){
marginTop:50,
marginBottom:10
},
noData:{
style: {//设置字体颜色
color: '#fff',
},
},
exporting: {
allowHTML:true,
filename:'Service'+addDateName(),