Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
zhangwei
2018-10-30 09:29:20 +08:00

View File

@@ -142,7 +142,7 @@
<div class="main_left fl"> <div class="main_left fl">
<div class="left_1"> <div class="left_1">
<div class="main_title"> <div class="main_title">
<spring:message code="traffic_ipactive_chart"/>&nbsp;&nbsp;<a href="${ctx}/report/test/list"><i class="fa fa-line-chart"></i></a> <a href="javascipt:void(0)" onclick="ipActiveList();return false;"><i class="fa fa-refresh"></i></a> <spring:message code="traffic_ipactive_chart"/>&nbsp;&nbsp;<a href="${ctx}/dashboard/ipActiveList"><i class="fa fa-line-chart"></i></a> <a href="javascipt:void(0)" onclick="ipActiveList();return false;"><i class="fa fa-refresh"></i></a>
</div> </div>
<!-- 活跃IP图 --> <div id="chart_main" style="width:100%;height:400px;"></div> <!-- 活跃IP图 --> <div id="chart_main" style="width:100%;height:400px;"></div>
</div> </div>