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

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

Browse Source
This commit is contained in:
leijun
2018-10-18 11:15:35 +08:00
parent 5cb07b724c 8c96e21a27
commit 6d3fcbf8be
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1166,7 +1166,7 @@ ASN_POLICY_MONIT=ASN Policy Monitor
p2p_monit=P2P Monitor
av_content_url_whitelist=Multimedia Content Url White List
av_content_ip_whitelist=Multimedia Content IP White List
active_port=Active Port
active_port=Traffic Port
visits=Visits
percentage=Percentage
APP_SSL=APP SSL Feature

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

@@ -1168,7 +1168,7 @@ ASN_POLICY_MONIT=ASN Policy Monitor
p2p_monit=P2P Monitor
av_content_url_whitelist=Multimedia Content Url White List
av_content_ip_whitelist=Multimedia Content IP White List
active_port=\u0410\u043a\u0442\u0438\u0432\u043d\u044b\u0439 \u041f\u043e\u0440\u0442 \u0422\u041e\u041f 10
active_port=Traffic Port
visits=\u041f\u043e\u0441\u0435\u0449\u0430\u0435\u043c\u043e\u0441\u0442\u044c
percentage=\u041f\u0440\u043e\u0446\u0435\u043d\u0442
APP_SSL=APP SSL Feature

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

@@ -1162,7 +1162,7 @@ ASN_POLICY_MONIT=ASN\u7B56\u7565\u76D1\u6D4B
p2p_monit=P2P\u76D1\u6D4B
av_content_url_whitelist=\u591A\u5A92\u4F53\u5185\u5BB9URL\u914D\u7F6E\u767D\u540D\u5355
av_content_ip_whitelist=\u591A\u5A92\u4F53\u5185\u5BB9IP\u914D\u7F6E\u767D\u540D\u5355
active_port=\u6D3B\u8DC3\u7AEF\u53E3
active_port=\u7AEF\u53E3\u6D41\u91CF
visits=\u8BBF\u95EE\u6B21\u6570
percentage=\u767E\u5206\u6BD4
APP_SSL=APP SSL\u7279\u5F81

14
src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
View File

@@ -197,7 +197,7 @@
<spring:message code="traffic_app_chart"/>&nbsp;&nbsp;<!-- <a href="#"><i class="fa fa-list-ul"></i></a> -->
<a href="javascipt:void(0)" onclick="appTypeList();return false;"><i class="fa fa-refresh"></i></a>
</div>
<!--app应用图 --><div id="chart_3" class="" style="width:100%;height: 400px;"></div>
<!--app应用图 --><div id="chart_3" class="" style="width:100%;height: 420px;"></div>
</div>
</div>
@@ -637,7 +637,7 @@ function systemList(){
$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
}
//终端图-操作系统
echart_2(rs);
echart_2(rs.reverse());
}
},
});
@@ -655,7 +655,7 @@ function osClick(osType,obj){
dataType:"json",
cache:false,async:true,
success:function (rs) {
echart_5(rs);
echart_5(rs.reverse());
},
});
}
@@ -670,7 +670,7 @@ function bsClick(bsType,obj){
dataType:"json",
cache:false,async:true,
success:function (rs) {
echart_2(rs);
echart_2(rs.reverse());
},
});
}
@@ -728,7 +728,7 @@ function browserList() {
$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
}
//终端图-浏览器
echart_5(rs);
echart_5(rs.reverse());
}
},
});
@@ -782,7 +782,7 @@ function websiteList() {
$("#tbodyData2").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
}
//网站统计图
echart_4(rs);
echart_4(rs.reverse());
}
},
});
@@ -800,7 +800,7 @@ function webClick(websiteServiceId,obj){
dataType:"json",
cache:false,async:true,
success:function (rs) {
echart_6(rs);
echart_6(rs.reverse());
},
});
}