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:
tanghao
2019-01-03 14:43:34 +08:00
parent aabaf6b5dd
commit 3fb9b5b159
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
View File

@@ -32,8 +32,10 @@
<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 id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium" <!-- <input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/> value="" onclick="WdatePicker({onpicked:setTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/> -->
<input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({el:'beginDate',onpicked:setTime(1),dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'#F{$dp.$D(\'endDate\')||currentTime()}' })" />
</div> </div>
</div> </div>
<div class="pull-left"> <div class="pull-left">
@@ -41,8 +43,10 @@
<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 id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium" <!-- <input id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'#F{$dp.$D(\'beginDate\',{H:24})}'});"/> value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'#F{$dp.$D(\'beginDate\',{H:24})}'});"/> -->
<input id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({el:'endDate',dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:getMaxDate(1) })"/>
</div> </div>
</div> </div>
@@ -260,6 +264,7 @@ function changeBandwidth(unitType,beginDate,endDate){
/* 网络带宽时间维度趋势图 */ /* 网络带宽时间维度趋势图 */
function showBandwidthChart(id,unitType,xdata,ydata,title){ function showBandwidthChart(id,unitType,xdata,ydata,title){
var nowDate=new Date(); var nowDate=new Date();
Highcharts.setOptions({ global: { useUTC: false } });
var chart = Highcharts.chart(id, { var chart = Highcharts.chart(id, {
chart:{ chart:{
type: 'area', type: 'area',
@@ -382,7 +387,6 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
}, */ }, */
series:ydata series:ydata
}); });
Highcharts.setOptions({ global: { useUTC: false } });
} }
(function(H) { (function(H) {
H.Chart.prototype.downloadXLS = function() { H.Chart.prototype.downloadXLS = function() {
@@ -446,12 +450,12 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
}; };
}(Highcharts)); }(Highcharts));
function setTime(){ /* function setTime(){
var chooseDate=new Date($('#beginDate').val()); var chooseDate=new Date($('#beginDate').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+1); chooseDate=chooseDate.setDate(chooseDate.getDate()+1);
var modifyTime=new Date(chooseDate); var modifyTime=new Date(chooseDate);
$('#endDate').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds())); $('#endDate').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
} } */
(function(H) { (function(H) {
H.Chart.prototype.downloadCSV = function() { H.Chart.prototype.downloadCSV = function() {
var rows = this.getDataRows(true); var rows = this.getDataRows(true);