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

实时统计-流量统计下的统计页面 图形 查询条件等样式的修改

Browse Source
This commit is contained in:
shangguanyanfei
2019-06-12 19:33:59 +08:00
parent c8467db46b
commit 6f3647694e
20 changed files with 443 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java
View File

@@ -80,7 +80,11 @@ public class ConfigStatisticsController extends BaseController {
model.addAttribute("endDate", now); model.addAttribute("endDate", now);
} }
} }
model.addAttribute("concent", concent); if(StringUtil.isEmpty(concent)){
model.addAttribute("concent", "3");
}else{
model.addAttribute("concent", concent);
}
model.addAttribute("detail", detail); model.addAttribute("detail", detail);
model.addAttribute("dimension", dimension); model.addAttribute("dimension", dimension);
model.addAttribute("area", area); model.addAttribute("area", area);

2
src/main/resources/messages/message_en.properties
View File

@@ -1603,7 +1603,7 @@ hour=Hour
year=Year year=Year
chart_type=Chart Type chart_type=Chart Type
line_chart=Line Chart line_chart=Line Chart
bar_chart=Bar Chart column_chart=Bar Chart
pie_chart=Pie Chart pie_chart=Pie Chart
statistical_content=Statistical Content statistical_content=Statistical Content
statistical_detail=Statistical Detail statistical_detail=Statistical Detail

2
src/main/resources/messages/message_ru.properties
View File

@@ -1605,7 +1605,7 @@ hour=Hour
year=Year year=Year
chart_type=Chart Type chart_type=Chart Type
line_chart=Line Chart line_chart=Line Chart
bar_chart=Bar Chart column_chart=Bar Chart
pie_chart=Pie Chart pie_chart=Pie Chart
statistical_content=Statistical Content statistical_content=Statistical Content
statistical_detail=Statistical Detail statistical_detail=Statistical Detail

16
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1548,7 +1548,7 @@ format=\u683c\u5f0f
file_is_used=\u7b56\u7565\u88ab\u5f15\u7528 file_is_used=\u7b56\u7565\u88ab\u5f15\u7528
none_profile_tip=\u8bf7\u9009\u62e9\u6587\u4ef6! none_profile_tip=\u8bf7\u9009\u62e9\u6587\u4ef6!
#---------------------------pxy intercept------------------------------------ #---------------------------pxy intercept------------------------------------
min_should_less_than_max=\u6700\u5c0fSSL\u7248\u672c\u5e94\u5c0f\u4e8e\u6216\u7B49\u4E8E\u6700\u5927SSL\u7248\u672c min_should_less_than_max=\u6700\u5c0fSSL\u7248\u672c\u5e94\u5c0f\u4e8e\u6216\u7b49\u4e8e\u6700\u5927SSL\u7248\u672c
exclusions_ev_cert=\u6392\u9664EV\u8bc1\u4e66 exclusions_ev_cert=\u6392\u9664EV\u8bc1\u4e66
exclusions_cert_transparency=\u6392\u9664\u8bc1\u4e66\u900f\u660e exclusions_cert_transparency=\u6392\u9664\u8bc1\u4e66\u900f\u660e
exclusions_client_cert_req=\u6392\u9664\u5ba2\u6237\u7aef\u8bc1\u4e66\u8bf7\u6c42 exclusions_client_cert_req=\u6392\u9664\u5ba2\u6237\u7aef\u8bc1\u4e66\u8bf7\u6c42
@@ -1603,7 +1603,7 @@ hour=\u5c0f\u65f6
year=\u5e74 year=\u5e74
chart_type=\u56fe\u8868\u7c7b\u578b chart_type=\u56fe\u8868\u7c7b\u578b
line_chart=\u6298\u7ebf\u56fe line_chart=\u6298\u7ebf\u56fe
bar_chart=\u6761\u5f62\u56fe column_chart=\u67f1\u72b6\u56fe
pie_chart=\u997c\u56fe pie_chart=\u997c\u56fe
statistical_content=\u7edf\u8ba1\u5185\u5bb9 statistical_content=\u7edf\u8ba1\u5185\u5bb9
statistical_detail=\u7edf\u8ba1\u660e\u7ec6 statistical_detail=\u7edf\u8ba1\u660e\u7ec6
@@ -1626,12 +1626,12 @@ ssl_client_side_version=\u5ba2\u6237\u7aef\u4fa7SSL\u7248\u672c
ssl_cert_verify=\u8bc1\u4e66\u6821\u9a8c\u7ed3\u679c ssl_cert_verify=\u8bc1\u4e66\u6821\u9a8c\u7ed3\u679c
stream_trace_id=\u6d41\u7684\u8ffd\u8e2aID stream_trace_id=\u6d41\u7684\u8ffd\u8e2aID
ssl_error=SSL\u9519\u8bef\u4fe1\u606f ssl_error=SSL\u9519\u8bef\u4fe1\u606f
import_built_cert_file=\u5BFC\u5165\u5185\u7F6E\u8BC1\u4E66 import_built_cert_file=\u5bfc\u5165\u5185\u7f6e\u8bc1\u4e66
built_in=\u5185\u7F6E\u8BC1\u4E66 built_in=\u5185\u7f6e\u8bc1\u4e66
#---------------------------Object List Group Manage------------------------------------ #---------------------------Object List Group Manage------------------------------------
ip_group_configuration=IP \u5206\u7ec4\u914d\u7f6e ip_group_configuration=IP \u5206\u7ec4\u914d\u7f6e
domain_group_configuration=\u57DF\u540D\u5206\u7ec4\u914d\u7f6e domain_group_configuration=\u57df\u540d\u5206\u7ec4\u914d\u7f6e
scriberid_group_configuration=\u8D26\u53F7\u5206\u7ec4\u914d\u7f6e scriberid_group_configuration=\u8d26\u53f7\u5206\u7ec4\u914d\u7f6e
common_group_manage=\u516C\u5171\u5206\u7EC4\u7BA1\u7406 common_group_manage=\u516c\u5171\u5206\u7ec4\u7ba1\u7406
can_not_delete_issued_group=\u4E0D\u80FD\u5220\u9664\u5DF2\u7ECF\u88AB\u5F15\u7528\u7684\u5206\u7EC4 can_not_delete_issued_group=\u4e0d\u80fd\u5220\u9664\u5df2\u7ecf\u88ab\u5f15\u7528\u7684\u5206\u7ec4
#---------------------------Object List Group Manage------------------------------------ #---------------------------Object List Group Manage------------------------------------

106
src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
View File

@@ -14,7 +14,6 @@
<body> <body>
<div class="page-content"> <div class="page-content">
<h5 class="page-header"></h5>
<div class="portlet"> <div class="portlet">
<div class="portlet-body"> <div class="portlet-body">
<div class="row"> <div class="row">
@@ -138,13 +137,52 @@
</select> </select>
</div> </div>
</div> </div>
<div id="area_detail" class="pull-left" style="display: none;">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="area_id"/></span>
</div>
<select id="area_select" name="area" class="selectpicker select2 input-small">
<option value="" ><spring:message code="select"/></option>
<option value="astana">Astana</option>
<option value="almaty">Almaty</option>
</select>
</div>
</div>
<div id="operator_detail" class="pull-left" style="display: none;">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="isp"/></span>
</div>
<select id="operator_select" name="operator" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 2" multiple max-width="100px" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getIspDicList('ispCode')}" var="dict" >
<option value="${dict.ispKeyCode}"><spring:message code="${dict.ispKeyName}"></spring:message></option>
</c:forEach>
</select>
</div>
</div>
<div id="chart_detail" class="pull-left" style="display: none;">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="chart_type"/></span>
</div>
<select id="chartType" name="chartType" class="selectpicker select2 input-small">
<option value ="line"><spring:message code="line_chart"/></option>
<option value ="column"><spring:message code="column_chart"/></option>
<c:if test="${concent ne '3'}">
<option value ="pie"><spring:message code="pie_chart"/></option>
</c:if>
</select>
</div>
</div>
</div> </div>
<div class="col-md-12" style="padding-top: 6px;"> <div class="col-md-12" style="padding-top: 3px;">
<div class="form-group"> <div class="form-group">
<div class="control-label col-md-3 form-control" style="width: max-content;"> <div class="control-label col-md-3 form-control" style="width: max-content;">
<spring:message code="time_granularity" /> <spring:message code="time_granularity" />
</div> </div>
<div class="col-md-6" style="padding-left: 10px;"> <div class="col-md-4" style="padding-left: 10px;">
<div class="mt-radio-inline" style="height: 34px"> <div class="mt-radio-inline" style="height: 34px">
<label class="mt-radio"> <label class="mt-radio">
<input type="radio" class="timeSize" name="time" value="1" checked/> <input type="radio" class="timeSize" name="time" value="1" checked/>
@@ -172,20 +210,46 @@
<span></span> <span></span>
</label> </label>
</div> </div>
</div> </div>
</div>
</div>
<br>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12" style="padding-top: 6px;">
<div class="pull-left"> <div class="pull-left">
<div class="input-group beginDate"> <div class="input-group beginDate">
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control"><spring:message code="begin_date" /></span> <span class="selectpicker form-control"><spring:message code="begin_date" /></span>
</div> </div>
<!-- <input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" <!-- <input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)"/> --> value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)"/> -->
<input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" <input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/>
</div>
</div>
<div class="pull-left">
<div class="input-group endDate">
<div class="input-group-btn">
<span class="selectpicker form-control"><spring:message code="end_date" /></span>
</div>
<!-- <input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)"/> -->
<input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/>
</div>
</div>
</div>
</div>
<br>
<!-- 搜索内容与操作按钮栏 -->
<%-- <div class="col-md-12" style="padding-top: 6px;">
<div class="pull-left">
<div class="input-group beginDate">
<div class="input-group-btn">
<span class="selectpicker form-control"><spring:message code="begin_date" /></span>
</div> --%>
<!-- <input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)"/> -->
<%-- <input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/> value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/>
</div> </div>
</div> </div>
@@ -193,16 +257,16 @@
<div class="input-group endDate"> <div class="input-group endDate">
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control"><spring:message code="end_date" /></span> <span class="selectpicker form-control"><spring:message code="end_date" /></span>
</div> </div> --%>
<!-- <input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" <!-- <input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)"/> --> value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)"/> -->
<input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium" <!-- <input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/> value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/>
</div> </div>
</div> </div>
</div> </div> -->
<div class="col-md-12" style="padding-top: 6px;"> <%-- <div class="col-md-12" style="padding-top: 6px;">
<div id="area_detail" class="pull-left" style="display: none;"> <div id="area_detail" class="pull-left" style="display: none;">
<div class="input-group"> <div class="input-group">
<div class="input-group-btn"> <div class="input-group-btn">
@@ -229,21 +293,23 @@
</div> </div>
</div> </div>
</div> </div> --%>
<div class="col-md-12" style="padding-top: 6px;"> <div class="col-md-12" style="padding-top: 3px;">
<div id="chart_detail" class="pull-left" style="display: none;"> <%-- <div id="chart_detail" class="pull-left" style="display: none;">
<div class="input-group"> <div class="input-group">
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="chart_type"/></span> <span class="selectpicker form-control" ><spring:message code="chart_type"/></span>
</div> </div>
<select id="chartType" name="chartType" class="selectpicker select2 input-small"> <select id="chartType" name="chartType" class="selectpicker select2 input-small">
<option value ="line"><spring:message code="line_chart"/></option> <option value ="line"><spring:message code="line_chart"/></option>
<option value ="bar"><spring:message code="bar_chart"/></option> <option value ="column"><spring:message code="column_chart"/></option>
<option value ="pie"><spring:message code="pie_chart"/></option> <c:if test="${concent ne '3'}">
<option value ="pie"><spring:message code="pie_chart"/></option>
</c:if>
</select> </select>
</div> </div>
</div> </div> --%>
<c:if test="${empty concent or concent eq '1' }"> <c:if test="${empty concent or concent eq '1' }">
<div class="pull-left"> <div class="pull-left">
<button id="search" type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button> <button id="search" type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>

5
src/main/webapp/WEB-INF/views/dashboard/configStatisticTrans.jsp
View File

@@ -28,14 +28,13 @@
</div> </div>
<select id="chartType" class="selectpicker select2 input-small"> <select id="chartType" class="selectpicker select2 input-small">
<option value ="line" selected><spring:message code="line_chart"/></option> <option value ="line" selected><spring:message code="line_chart"/></option>
<option value ="bar"><spring:message code="bar_chart"/></option> <option value ="column"><spring:message code="column_chart"/></option>
<option value ="pie"><spring:message code="pie_chart"/></option>
</select> </select>
</div> </div>
</div> </div>
</form:form> </form:form>
</div> </div>
<div id="chart" style="width:95%;height:500px;"></div> <div id="chart" style="width:95%;height:450px;"></div>
</div> </div>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>

33
src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp
View File

@@ -143,7 +143,33 @@ function showActionTransChart(chartType,xData,series){
} }
}, },
showInLegend: true showInLegend: true
} },
column: {
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
},
line: {
allowPointSelect: true,
cursor: 'pointer',
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
}
}, },
series: series, series: series,
} }
@@ -182,6 +208,11 @@ function showActionTransChart(chartType,xData,series){
chart.tooltip.pointFormat = "{point.y}| <b>{point.percentage:.1f}%</br>"; chart.tooltip.pointFormat = "{point.y}| <b>{point.percentage:.1f}%</br>";
}else{ }else{
chart.tooltip.pointFormat = "<span style='color:{point.color}'>\u25CF</span> {series.name}: <b>{point.y}</b><br/>"; chart.tooltip.pointFormat = "<span style='color:{point.color}'>\u25CF</span> {series.name}: <b>{point.y}</b><br/>";
/* var a=JSON.parse($("#total").val())[0];
chart.tooltip.pointFormat =function(){
var b=this.y/a*100;
return "<span style='color:{point.color}'>\u25CF</span> {series.name}: <b>"+b.toFixed(2)+"%</b><br/>";
} */
} }
} }

51
src/main/webapp/WEB-INF/views/dashboard/newActiveClientIPList.jsp
View File

@@ -459,7 +459,7 @@ function clientIPChart(rs,chartType){
color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black' color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black'
} }
}, },
}, }/* ,
pie:{ pie:{
allowPointSelect: true, allowPointSelect: true,
showInLegend: true, showInLegend: true,
@@ -478,7 +478,7 @@ function clientIPChart(rs,chartType){
} }
}, },
}, },
} } */
}, },
credits:{//是否有水印 credits:{//是否有水印
enabled:false enabled:false
@@ -497,6 +497,53 @@ function clientIPChart(rs,chartType){
year: '%Y-%m-%d %H:%M:%S' year: '%Y-%m-%d %H:%M:%S'
} }
}, },
plotOptions: {
pie:{
allowPointSelect: true,
showInLegend: true,
point: {
events: {
mouseOver: function(e) {
this.slice();
},
// 鼠标移出时，收回突出显示
mouseOut: function() {
this.slice();
},
// 默认是点击突出，这里屏蔽掉
click: function() {
return false;
}
},
},
},
column: {
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
},
line: {
allowPointSelect: true,
cursor: 'pointer',
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
}
},
series: data series: data
} }
if(typeof chartType != "undefined"){ if(typeof chartType != "undefined"){

5
src/main/webapp/WEB-INF/views/dashboard/newActiveClientIPTrans.jsp
View File

@@ -30,14 +30,13 @@
</div> </div>
<select id="chartType" class="selectpicker select2 input-small"> <select id="chartType" class="selectpicker select2 input-small">
<option value ="line" selected><spring:message code="line_chart"/></option> <option value ="line" selected><spring:message code="line_chart"/></option>
<option value ="bar"><spring:message code="bar_chart"/></option> <option value ="column"><spring:message code="column_chart"/></option>
<option value ="pie"><spring:message code="pie_chart"/></option>
</select> </select>
</div> </div>
</div> </div>
</form:form> </form:form>
</div> </div>
<div id="chart" style="width:95%;height:500px;"></div> <div id="chart" style="width:95%;height:450px;"></div>
</div> </div>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>

51
src/main/webapp/WEB-INF/views/dashboard/newActiveServerIPList.jsp
View File

@@ -459,7 +459,7 @@ function serverIPChart(rs,chartType){
color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black' color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black'
} }
}, },
}, }/* ,
pie:{ pie:{
allowPointSelect: true, allowPointSelect: true,
showInLegend: true, showInLegend: true,
@@ -478,7 +478,7 @@ function serverIPChart(rs,chartType){
} }
}, },
}, },
} } */
}, },
credits:{//是否有水印 credits:{//是否有水印
enabled:false enabled:false
@@ -497,6 +497,53 @@ function serverIPChart(rs,chartType){
year: '%Y-%m-%d %H:%M:%S' year: '%Y-%m-%d %H:%M:%S'
} }
}, },
plotOptions: {
pie:{
allowPointSelect: true,
showInLegend: true,
point: {
events: {
mouseOver: function(e) {
this.slice();
},
// 鼠标移出时，收回突出显示
mouseOut: function() {
this.slice();
},
// 默认是点击突出，这里屏蔽掉
click: function() {
return false;
}
},
},
},
column: {
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
},
line: {
allowPointSelect: true,
cursor: 'pointer',
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
}
},
series: data series: data
} }
if(typeof chartType != "undefined"){ if(typeof chartType != "undefined"){

5
src/main/webapp/WEB-INF/views/dashboard/newActiveServerIPTrans.jsp
View File

@@ -30,14 +30,13 @@
</div> </div>
<select id="chartType" class="selectpicker select2 input-small"> <select id="chartType" class="selectpicker select2 input-small">
<option value ="line" selected><spring:message code="line_chart"/></option> <option value ="line" selected><spring:message code="line_chart"/></option>
<option value ="bar"><spring:message code="bar_chart"/></option> <option value ="column"><spring:message code="column_chart"/></option>
<option value ="pie"><spring:message code="pie_chart"/></option>
</select> </select>
</div> </div>
</div> </div>
</form:form> </form:form>
</div> </div>
<div id="chart" style="width:95%;height:500px;"></div> <div id="chart" style="width:95%;height:450px;"></div>
</div> </div>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>

5
src/main/webapp/WEB-INF/views/dashboard/newAppTrans.jsp
View File

@@ -31,14 +31,13 @@
</div> </div>
<select id="chartType" class="selectpicker select2 input-small"> <select id="chartType" class="selectpicker select2 input-small">
<option value ="line" selected><spring:message code="line_chart"/></option> <option value ="line" selected><spring:message code="line_chart"/></option>
<option value ="bar"><spring:message code="bar_chart"/></option> <option value ="column"><spring:message code="column_chart"/></option>
<option value ="pie"><spring:message code="pie_chart"/></option>
</select> </select>
</div> </div>
</div> </div>
</form:form> </form:form>
</div> </div>
<div id="chart" style="width:95%;height:500px;"></div> <div id="chart" style="width:95%;height:450px;"></div>
</div> </div>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>

51
src/main/webapp/WEB-INF/views/dashboard/newAppTypeList.jsp
View File

@@ -515,7 +515,7 @@ function appTypeChart(rs,chartType){
color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black' color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black'
} }
}, },
}, }/* ,
pie:{ pie:{
allowPointSelect: true, allowPointSelect: true,
showInLegend: true, showInLegend: true,
@@ -534,7 +534,7 @@ function appTypeChart(rs,chartType){
} }
}, },
}, },
} } */
}, },
credits:{//是否有水印 credits:{//是否有水印
enabled:false enabled:false
@@ -553,6 +553,53 @@ function appTypeChart(rs,chartType){
year: '%Y-%m-%d %H:%M:%S' year: '%Y-%m-%d %H:%M:%S'
} }
}, },
plotOptions: {
pie:{
allowPointSelect: true,
showInLegend: true,
point: {
events: {
mouseOver: function(e) {
this.slice();
},
// 鼠标移出时，收回突出显示
mouseOut: function() {
this.slice();
},
// 默认是点击突出，这里屏蔽掉
click: function() {
return false;
}
},
},
},
column: {
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
},
line: {
allowPointSelect: true,
cursor: 'pointer',
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
}
},
series: data series: data
} }
if(typeof chartType != "undefined"){ if(typeof chartType != "undefined"){

4
src/main/webapp/WEB-INF/views/dashboard/newConfigStatistic.jsp
View File

@@ -8,6 +8,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb"> <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead> <thead>
<tr> <tr>
<th ><spring:message code="trend"/></th>
<th column="cfg_id"><spring:message code="cfg_id"/></th> <th column="cfg_id"><spring:message code="cfg_id"/></th>
<th column="config_describe"><spring:message code="config_describe"/></th> <th column="config_describe"><spring:message code="config_describe"/></th>
<th class="sort-column sum" column="config_log_total"><spring:message code="config_log_total"/></th> <th class="sort-column sum" column="config_log_total"><spring:message code="config_log_total"/></th>
@@ -16,7 +17,8 @@
<tbody> <tbody>
<c:forEach var="log" items="${page.list }" varStatus="status"> <c:forEach var="log" items="${page.list }" varStatus="status">
<tr> <tr>
<td><a onclick="searchByConfig(${log.cfgId},${log.cfgDesc})" title="${log.cfgId}">${log.cfgId}</a></td> <td class='tc'><a href='#' onclick="searchByConfig(${log.cfgId},${log.cfgDesc})"><i class='fa fa-line-chart'></i></a></td>
<td>${log.cfgId}</td>
<td>${log.cfgDesc }</td> <td>${log.cfgDesc }</td>
<td>${log.sum }</td> <td>${log.sum }</td>
</tr> </tr>

5
src/main/webapp/WEB-INF/views/dashboard/newDomainTrans.jsp
View File

@@ -29,14 +29,13 @@
</div> </div>
<select id="chartType" class="selectpicker select2 input-small"> <select id="chartType" class="selectpicker select2 input-small">
<option value ="line" selected><spring:message code="line_chart"/></option> <option value ="line" selected><spring:message code="line_chart"/></option>
<option value ="bar"><spring:message code="bar_chart"/></option> <option value ="column"><spring:message code="column_chart"/></option>
<option value ="pie"><spring:message code="pie_chart"/></option>
</select> </select>
</div> </div>
</div> </div>
</form:form> </form:form>
</div> </div>
<div id="chart" style="width:95%;height:500px;"></div> <div id="chart" style="width:95%;height:450px;"></div>
</div> </div>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>

51
src/main/webapp/WEB-INF/views/dashboard/newDomainsList.jsp
View File

@@ -507,7 +507,7 @@ function webTypeChart(rs,chartType){
color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black' color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black'
} }
}, },
}, }/* ,
pie:{ pie:{
allowPointSelect: true, allowPointSelect: true,
showInLegend: true, showInLegend: true,
@@ -526,7 +526,7 @@ function webTypeChart(rs,chartType){
} }
}, },
}, },
} } */
}, },
credits:{//是否有highcharts水印 credits:{//是否有highcharts水印
enabled:false enabled:false
@@ -545,6 +545,53 @@ function webTypeChart(rs,chartType){
year: '%Y-%m-%d %H:%M:%S' year: '%Y-%m-%d %H:%M:%S'
} }
}, },
plotOptions: {
pie:{
allowPointSelect: true,
showInLegend: true,
point: {
events: {
mouseOver: function(e) {
this.slice();
},
// 鼠标移出时，收回突出显示
mouseOut: function() {
this.slice();
},
// 默认是点击突出，这里屏蔽掉
click: function() {
return false;
}
},
},
},
column: {
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
},
line: {
allowPointSelect: true,
cursor: 'pointer',
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
}
},
series: data series: data
} }
if(typeof chartType != "undefined"){ if(typeof chartType != "undefined"){

67
src/main/webapp/WEB-INF/views/dashboard/newProtocolTypeList.jsp
View File

@@ -511,25 +511,7 @@ function protocolTypeChart(rs,chartType){
} }
}, },
}, },
pie:{
allowPointSelect: true,
showInLegend: true,
point: {
events: {
mouseOver: function(e) {
this.slice();
},
// 鼠标移出时，收回突出显示
mouseOut: function() {
this.slice();
},
// 默认是点击突出，这里屏蔽掉
click: function() {
return false;
}
},
},
}
}, },
credits:{//是否有水印 credits:{//是否有水印
enabled:false enabled:false
@@ -549,6 +531,53 @@ function protocolTypeChart(rs,chartType){
year: '%Y-%m-%d %H:%M:%S' year: '%Y-%m-%d %H:%M:%S'
} }
}, },
plotOptions: {
pie:{
allowPointSelect: true,
showInLegend: true,
point: {
events: {
mouseOver: function(e) {
this.slice();
},
// 鼠标移出时，收回突出显示
mouseOut: function() {
this.slice();
},
// 默认是点击突出，这里屏蔽掉
click: function() {
return false;
}
},
},
},
column: {
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
},
line: {
allowPointSelect: true,
cursor: 'pointer',
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
}
},
series:data series:data
} }
if(typeof chartType != "undefined"){ if(typeof chartType != "undefined"){

5
src/main/webapp/WEB-INF/views/dashboard/newProtocolsTrans.jsp
View File

@@ -31,14 +31,13 @@
</div> </div>
<select id="chartType" class="selectpicker select2 input-small"> <select id="chartType" class="selectpicker select2 input-small">
<option value ="line" selected><spring:message code="line_chart"/></option> <option value ="line" selected><spring:message code="line_chart"/></option>
<option value ="bar"><spring:message code="bar_chart"/></option> <option value ="column"><spring:message code="column_chart"/></option>
<option value ="pie"><spring:message code="pie_chart"/></option>
</select> </select>
</div> </div>
</div> </div>
</form:form> </form:form>
</div> </div>
<div id="chart" style="width:95%;height:500px;"></div> <div id="chart" style="width:95%;height:450px;"></div>
</div> </div>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>

51
src/main/webapp/WEB-INF/views/dashboard/newSubscriberIDList.jsp
View File

@@ -459,7 +459,7 @@ function subscriberIDChart(rs,chartType){
color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black' color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black'
} }
}, },
}, }/* ,
pie:{ pie:{
allowPointSelect: true, allowPointSelect: true,
showInLegend: true, showInLegend: true,
@@ -478,7 +478,7 @@ function subscriberIDChart(rs,chartType){
} }
}, },
}, },
} } */
}, },
credits:{//是否有水印 credits:{//是否有水印
enabled:false enabled:false
@@ -497,6 +497,53 @@ function subscriberIDChart(rs,chartType){
year: '%Y-%m-%d %H:%M:%S' year: '%Y-%m-%d %H:%M:%S'
} }
}, },
plotOptions: {
pie:{
allowPointSelect: true,
showInLegend: true,
point: {
events: {
mouseOver: function(e) {
this.slice();
},
// 鼠标移出时，收回突出显示
mouseOut: function() {
this.slice();
},
// 默认是点击突出，这里屏蔽掉
click: function() {
return false;
}
},
},
},
column: {
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
},
line: {
allowPointSelect: true,
cursor: 'pointer',
dataLabels:{
enabled:true,
color: '#5B5B5B',
formatter:function () {
var total=JSON.parse($("#total").val())[0];
a = this.y/total*100;
return a.toFixed(2) + "%"
}
}
// colorByPoint: true
}
},
series: data series: data
} }
if(typeof chartType != "undefined"){ if(typeof chartType != "undefined"){

5
src/main/webapp/WEB-INF/views/dashboard/newSubscriberIDTrans.jsp
View File

@@ -30,14 +30,13 @@
</div> </div>
<select id="chartType" class="selectpicker select2 input-small"> <select id="chartType" class="selectpicker select2 input-small">
<option value ="line" selected><spring:message code="line_chart"/></option> <option value ="line" selected><spring:message code="line_chart"/></option>
<option value ="bar"><spring:message code="bar_chart"/></option> <option value ="column"><spring:message code="column_chart"/></option>
<option value ="pie"><spring:message code="pie_chart"/></option>
</select> </select>
</div> </div>
</div> </div>
</form:form> </form:form>
</div> </div>
<div id="chart" style="width:95%;height:500px;"></div> <div id="chart" style="width:95%;height:450px;"></div>
</div> </div>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>