diff --git a/WebRoot/i18n/globalMessages_en_US.properties b/WebRoot/i18n/globalMessages_en_US.properties index bfbafa1..5917cc8 100644 --- a/WebRoot/i18n/globalMessages_en_US.properties +++ b/WebRoot/i18n/globalMessages_en_US.properties @@ -5201,7 +5201,7 @@ xt_js_jbxx.regionRole.jsms=Sub-central user role authorization with data display #Tue Apr 17 18:20:41 CST 2018 xt_mk_jbxx.361.mkmc=Port State Configuration xt_mk_jbxx.303.mkmc=Task Duplicating -xt_mk_jbxx.381.mkmc=Network Element +xt_mk_jbxx.381.mkmc=Network Devices xt_mk_jbxx.313.mkmc=Setting Alarms xt_mk_jbxx.543.mkms=Add New Plugin xt_mk_jbxx.12.mkms=New Fault Library @@ -5212,7 +5212,7 @@ xt_mk_jbxx.421.mkmc=Monitoring Alarm Setting xt_mk_jbxx.307.mkmc=Enabled xt_mk_jbxx.14.mkms=New Module Management xt_mk_jbxx.279.mkmc=Permissions -xt_mk_jbxx.441.mkmc=3D Room +xt_mk_jbxx.441.mkmc=3D Datacenter xt_mk_jbxx.461.mkmc=Brand Management xt_mk_jbxx.309.mkmc=Edit xt_mk_jbxx.501.mkmc=Alarm Information @@ -5229,14 +5229,14 @@ xt_mk_jbxx.270.mkmc=Monitoring Category xt_mk_jbxx.1.mkms=System Module Management, Etc. xt_mk_jbxx.280.mkmc=Department Configuration xt_mk_jbxx.272.mkmc=Exclusive Device Setting -xt_mk_jbxx.262.mkmc=Server Monitoring +xt_mk_jbxx.262.mkmc=Servers xt_mk_jbxx.282.mkmc=User Management xt_mk_jbxx.274.mkmc=Node Setting #xt_mk_jbxx.264.mkmc=Special Monitoring -xt_mk_jbxx.264.mkmc=Exclusive Device +xt_mk_jbxx.264.mkmc=Specialized Devices xt_mk_jbxx.310.mkmc=Delete -xt_mk_jbxx.284.mkmc=Data Display -xt_mk_jbxx.266.mkmc=Task Status +xt_mk_jbxx.284.mkmc=Monitoring +xt_mk_jbxx.266.mkmc=Mantainance Tasks xt_mk_jbxx.542.mkms=Add, Delete, Check, And Download Plug-ins xt_mk_jbxx.276.mkmc=DC Range Setting xt_mk_jbxx.11.mkms=System Fault Library @@ -5260,7 +5260,7 @@ xt_mk_jbxx.267.mkms=Configuration Management xt_mk_jbxx.269.mkms=Configure Monitoring Settings Information xt_mk_jbxx.289.mkms=Add User Group xt_mk_jbxx.271.mkmc=Task Management -xt_mk_jbxx.261.mkmc=Abnormal Server +xt_mk_jbxx.261.mkmc=Servers with Warings xt_mk_jbxx.281.mkmc=Actor Configuration xt_mk_jbxx.273.mkmc=Room Setting xt_mk_jbxx.263.mkmc=Abnormal Network Element @@ -5270,7 +5270,7 @@ xt_mk_jbxx.275.mkmc=View Configuration xt_mk_jbxx.501.mkms=Display configuration level alarm information, including server and network element xt_mk_jbxx.521.mkms=Set filtering conditions (alarm level, emergency) for the business logic topology, alarm information, abnormal server, abnormal network element, and system warning information menu xt_mk_jbxx.541.mkms=Upload And Download Management Plugins -xt_mk_jbxx.285.mkmc=Business Logic Topology +xt_mk_jbxx.285.mkmc=Topology xt_mk_jbxx.602.mkmc=Configure The Diffusion xt_mk_jbxx.603.mkmc=Topo Setting #xt_yh_jbxx @@ -7404,4 +7404,5 @@ topoManage.cancel=Cancel topoManage.TopoNameSetting=Topo Picture Name xt_mk_jbxx.604.mkmc=Advanced xt_mk_jbxx.604.mkms=Advanced configuration function menu -pidFile.keyword.allblank=PID file and keyword can not all blank \ No newline at end of file +pidFile.keyword.allblank=PID file and keyword can not all blank +network.throughput=Network Throughput diff --git a/WebRoot/i18n/globalMessages_ru_RU.properties b/WebRoot/i18n/globalMessages_ru_RU.properties index 43367a7..3ee03dc 100644 --- a/WebRoot/i18n/globalMessages_ru_RU.properties +++ b/WebRoot/i18n/globalMessages_ru_RU.properties @@ -6531,4 +6531,5 @@ topoManage.cancel=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c topoManage.TopoNameSetting=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043d\u043e\u0432\u043e\u0439 \u0442\u043e\u043f\u043e\u043b\u043e\u0433\u0438\u0438 xt_mk_jbxx.604.mkmc=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u0430\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 xt_mk_jbxx.604.mkms=\u041c\u0435\u043d\u044e \u0444\u0443\u043d\u043a\u0446\u0438\u0439 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u0439 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 -pidFile.keyword.allblank=Процесс файл PID и процесс поиска ключевых слов не могут быть пустыми одновременно \ No newline at end of file +pidFile.keyword.allblank=Процесс файл PID и процесс поиска ключевых слов не могут быть пустыми одновременно +network.throughput=Network Throughput \ No newline at end of file diff --git a/WebRoot/i18n/globalMessages_zh_CN.properties b/WebRoot/i18n/globalMessages_zh_CN.properties index 1a060ce..cb784c4 100644 --- a/WebRoot/i18n/globalMessages_zh_CN.properties +++ b/WebRoot/i18n/globalMessages_zh_CN.properties @@ -7416,4 +7416,5 @@ topoManage.cancel=\u53d6\u6d88 topoManage.TopoNameSetting=\u62d3\u6251\u56fe\u540d\u79f0 xt_mk_jbxx.604.mkmc=\u9ad8\u7ea7\u914d\u7f6e xt_mk_jbxx.604.mkms=\u9ad8\u7ea7\u914d\u7f6e\u529f\u80fd\u83dc\u5355 -pidFile.keyword.allblank=PID文件和进程关键字不能同时为空 \ No newline at end of file +pidFile.keyword.allblank=PID文件和进程关键字不能同时为空 +network.throughput=流量展示 \ No newline at end of file diff --git a/WebRoot/page/detection/checkType/addCheckTypeSetInfo.jsp b/WebRoot/page/detection/checkType/addCheckTypeSetInfo.jsp index 369085a..2bf9d1e 100644 --- a/WebRoot/page/detection/checkType/addCheckTypeSetInfo.jsp +++ b/WebRoot/page/detection/checkType/addCheckTypeSetInfo.jsp @@ -254,7 +254,7 @@ SNMP4J - ObjectSNMP + i18n_actsi.text.NO_n81i diff --git a/WebRoot/page/detection/monitorData/grafana.jsp b/WebRoot/page/detection/monitorData/grafana.jsp index 591b1ce..d2a7146 100644 --- a/WebRoot/page/detection/monitorData/grafana.jsp +++ b/WebRoot/page/detection/monitorData/grafana.jsp @@ -66,7 +66,7 @@ //配置查询相关信息 var queryInfo = { traffic : { - title:'traffic', + title:'Intercept Traffic', yAxisName:'packet/s', data: { legend:['Raw Input'], @@ -75,7 +75,7 @@ } }, connections :{ - title:'connections', + title:'Intercept Connections', yAxisName:'conn/s', data:{ legend:['Pending','Unknown','Asymmetric','Intercept','Whitelist','Not HIT'], @@ -84,7 +84,7 @@ } }, connect_client_latency : { - title:'connect client latency', + title:'Connect Client Latency', data:{ legend:['50%','60%','90%','mean','upper'], db:'proxy_stat', @@ -92,7 +92,7 @@ } }, connect_server_latency :{ - title:'connect server latency', + title:'Connect Server Latency', data:{ legend:['50%','60%','90%','99%','mean','upper'], db:'proxy_stat', @@ -190,13 +190,11 @@ }, dataType : "json", success : function(data) { - console.log(data); var results = data.results;//返回的result为json格式的数据 var series = []; $.each(results, function(index, result) { var s = result["series"]; var values = s ? s[0].values : []; - console.log(values); series.push({ name: legengData[index], type: 'line', @@ -206,7 +204,6 @@ var Chart=echarts.getInstanceByDom($part[0]);//获取echarts实例 Chart.showLoading({text : "loading..."}); var option = { series: series }; - console.log(option); Chart.setOption(option); Chart.hideLoading(); }