Commit b3375a17 authored by liuna's avatar liuna

2018年2月2日 --智能分析平台

--实体厅流量监测:图表格式调整对齐
parent 8762fff3
...@@ -113,17 +113,14 @@ ...@@ -113,17 +113,14 @@
<file leaf-file-name="FlowMonitor.jsp" pinned="false" current-in-tab="true"> <file leaf-file-name="FlowMonitor.jsp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="301"> <state relative-caret-position="271">
<caret line="1820" column="11" lean-forward="false" selection-start-line="1820" selection-start-column="11" selection-end-line="1820" selection-end-column="11" /> <caret line="907" column="9" lean-forward="true" selection-start-line="907" selection-start-column="9" selection-end-line="907" selection-end-column="9" />
<folding> <folding>
<element signature="n#script#2;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#2;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#3;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#3;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#4;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#5;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#6;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#7;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#8;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#8;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#9;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#9;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="e#53245#54842#0#HTML" expanded="false" />
<element signature="n#script#10;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#10;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#11;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#11;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#12;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#12;n#body#0;n#html#0;n#!!top" expanded="false" />
...@@ -906,14 +903,7 @@ ...@@ -906,14 +903,7 @@
<workItem from="1517447273996" duration="9081000" /> <workItem from="1517447273996" duration="9081000" />
<workItem from="1517479609342" duration="586000" /> <workItem from="1517479609342" duration="586000" />
<workItem from="1517480698534" duration="23404000" /> <workItem from="1517480698534" duration="23404000" />
<workItem from="1517533567114" duration="11543000" /> <workItem from="1517533567114" duration="13443000" />
</task>
<task id="LOCAL-00012" summary="Merge remote-tracking branch 'monitorAnalysis/liuna'&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class">
<created>1511852114921</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1511852114921</updated>
</task> </task>
<task id="LOCAL-00013" summary="把servlet-api包放到默认lib下"> <task id="LOCAL-00013" summary="把servlet-api包放到默认lib下">
<created>1512189296579</created> <created>1512189296579</created>
...@@ -1251,11 +1241,18 @@ ...@@ -1251,11 +1241,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1517539065672</updated> <updated>1517539065672</updated>
</task> </task>
<option name="localTasksCounter" value="61" /> <task id="LOCAL-00061" summary="2018年2月2日 --智能分析平台&#10; --实体厅流量监测:营业厅业务量、用户趋势图时间调整">
<created>1517557698455</created>
<option name="number" value="00061" />
<option name="presentableId" value="LOCAL-00061" />
<option name="project" value="LOCAL" />
<updated>1517557698455</updated>
</task>
<option name="localTasksCounter" value="62" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="966700000" /> <option name="totallyTimeSpent" value="968600000" />
</component> </component>
<component name="TodoView" selected-index="2"> <component name="TodoView" selected-index="2">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1393,7 +1390,6 @@ ...@@ -1393,7 +1390,6 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" /> <option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="修改" />
<MESSAGE value="增加 ‘全国’,修改 对话框" /> <MESSAGE value="增加 ‘全国’,修改 对话框" />
<MESSAGE value="监控运营 -&gt;告警关联诊断 -&gt;关联诊断明细 界面&#10;更换 SQL语句" /> <MESSAGE value="监控运营 -&gt;告警关联诊断 -&gt;关联诊断明细 界面&#10;更换 SQL语句" />
<MESSAGE value="‘c’代表 业务 &#10;&#10;‘y’代表 渠道" /> <MESSAGE value="‘c’代表 业务 &#10;&#10;‘y’代表 渠道" />
...@@ -1418,7 +1414,8 @@ ...@@ -1418,7 +1414,8 @@
<MESSAGE value="2018年2月1日 --智能分析平台&#10; --实体厅流量监测:页面性能调整" /> <MESSAGE value="2018年2月1日 --智能分析平台&#10; --实体厅流量监测:页面性能调整" />
<MESSAGE value="2018年2月2日 --智能分析平台&#10; --实体厅流量监测:页面性能调整" /> <MESSAGE value="2018年2月2日 --智能分析平台&#10; --实体厅流量监测:页面性能调整" />
<MESSAGE value="2018年2月2日 --智能分析平台&#10; --实体厅流量监测:页面调整参数" /> <MESSAGE value="2018年2月2日 --智能分析平台&#10; --实体厅流量监测:页面调整参数" />
<option name="LAST_COMMIT_MESSAGE" value="2018年2月2日 --智能分析平台&#10; --实体厅流量监测:页面调整参数" /> <MESSAGE value="2018年2月2日 --智能分析平台&#10; --实体厅流量监测:营业厅业务量、用户趋势图时间调整" />
<option name="LAST_COMMIT_MESSAGE" value="2018年2月2日 --智能分析平台&#10; --实体厅流量监测:营业厅业务量、用户趋势图时间调整" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -1928,17 +1925,14 @@ ...@@ -1928,17 +1925,14 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="301"> <state relative-caret-position="271">
<caret line="1820" column="11" lean-forward="false" selection-start-line="1820" selection-start-column="11" selection-end-line="1820" selection-end-column="11" /> <caret line="907" column="9" lean-forward="true" selection-start-line="907" selection-start-column="9" selection-end-line="907" selection-end-column="9" />
<folding> <folding>
<element signature="n#script#2;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#2;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#3;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#3;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#4;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#5;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#6;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#7;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#8;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#8;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#9;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#9;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="e#53245#54842#0#HTML" expanded="false" />
<element signature="n#script#10;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#10;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#11;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#11;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#12;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#12;n#body#0;n#html#0;n#!!top" expanded="false" />
......
...@@ -689,6 +689,32 @@ ...@@ -689,6 +689,32 @@
} }
}); });
} }
function performanceStabilityMonth() {
$.ajax({
type : "GET",
contentType : "application/json",
url: "${ctx}/MonitorOperation/FlowMonitor/performanceStabilityMonth",
async: false,
success: function(data){
console.log("地市性能稳定性当月",data);
var city = new Array();
var boxValue = [];
var percent = new Array();
for(var i=0; i<data.length; i++){
city.push(data[i][0]);
percent.push(data[i][6]);
boxValue.push([data[i][1],data[i][2],data[i][3],data[i][4],data[i][5]]);
}
city.reverse();
percent.reverse();
boxValue.reverse();
option2.yAxis.data=city;
option2.series[0].data=boxValue;
option2.series[1].data=percent;
myChartPerformanceStability.setOption(option2);
}
});
}
performanceStability(); performanceStability();
</script> </script>
...@@ -702,13 +728,12 @@ ...@@ -702,13 +728,12 @@
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
}, },
grid:{ legend: {grid:{
x:80, x:80,
y:40, y:40,
x2:80, x2:40,
y2:40, y2:50,
}, },
legend: {
data:['无法使用','可容忍','不满意'] data:['无法使用','可容忍','不满意']
}, },
xAxis:[ xAxis:[
...@@ -758,33 +783,33 @@ ...@@ -758,33 +783,33 @@
], ],
}; };
myChartCatonUser.setOption(option3); myChartCatonUser.setOption(option3);
function performanceStabilityMonth() { function catonUser() {
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", contentType : "application/json",
url: "${ctx}/MonitorOperation/FlowMonitor/performanceStabilityMonth", url: "${ctx}/MonitorOperation/FlowMonitor/catonUser",
async: false, async: false,
success: function(data){ success: function(data){
console.log("地市性能稳定性当月",data); console.log("卡顿用户实时",data);
var city = new Array(); var time = new Array();
var boxValue = []; var time1Account = new Array();
var percent = new Array(); var time2Account = new Array();
var time3Account = new Array();
for(var i=0; i<data.length; i++){ for(var i=0; i<data.length; i++){
city.push(data[i][0]); time.push(df.format(new Date(data[i][0])));
percent.push(data[i][6]); time1Account.push(data[i][1]);
boxValue.push([data[i][1],data[i][2],data[i][3],data[i][4],data[i][5]]); time2Account.push(data[i][2]);
time3Account.push(data[i][3]);
} }
city.reverse(); option3.xAxis[0].data=time;
percent.reverse(); option3.series[0].data=time1Account;
boxValue.reverse(); option3.series[1].data=time2Account;
option2.yAxis.data=city; option3.series[2].data=time3Account;
option2.series[0].data=boxValue; myChartCatonUser.setOption(option3);
option2.series[1].data=percent;
myChartPerformanceStability.setOption(option2);
} }
}); });
} }
// performanceStabilityMonth()
</script> </script>
...@@ -801,8 +826,8 @@ ...@@ -801,8 +826,8 @@
grid:{ grid:{
x:80, x:80,
y:40, y:40,
x2:80, x2:40,
y2:40, y2:50,
}, },
legend: { legend: {
data:['无法使用','可容忍','不满意'] data:['无法使用','可容忍','不满意']
...@@ -854,32 +879,7 @@ ...@@ -854,32 +879,7 @@
], ],
} }
myChartCatonUserMonth.setOption(option4); myChartCatonUserMonth.setOption(option4);
function catonUser() {
$.ajax({
type : "GET",
contentType : "application/json",
url: "${ctx}/MonitorOperation/FlowMonitor/catonUser",
async: false,
success: function(data){
console.log("卡顿用户实时",data);
var time = new Array();
var time1Account = new Array();
var time2Account = new Array();
var time3Account = new Array();
for(var i=0; i<data.length; i++){
time.push(df.format(new Date(data[i][0])));
time1Account.push(data[i][1]);
time2Account.push(data[i][2]);
time3Account.push(data[i][3]);
}
option3.xAxis[0].data=time;
option3.series[0].data=time1Account;
option3.series[1].data=time2Account;
option3.series[2].data=time3Account;
myChartCatonUser.setOption(option3);
}
});
}
function catonUserMonth() { function catonUserMonth() {
$.ajax({ $.ajax({
type : "GET", type : "GET",
...@@ -907,6 +907,7 @@ ...@@ -907,6 +907,7 @@
}); });
} }
catonUser() catonUser()
</script> </script>
<script> <script>
...@@ -919,6 +920,12 @@ ...@@ -919,6 +920,12 @@
tooltip : { tooltip : {
trigger: 'axis' trigger: 'axis'
}, },
grid:{
x:80,
y:40,
x2:40,
y2:50,
},
legend: { legend: {
data:['业务量','成功量','均时长'] data:['业务量','成功量','均时长']
}, },
...@@ -1032,9 +1039,9 @@ ...@@ -1032,9 +1039,9 @@
}, },
grid:{ grid:{
x:80, x:80,
y:20, y:40,
x2:20, x2:40,
y2:20, y2:50,
}, },
legend: { legend: {
data:['营业厅1','营业厅2','营业厅3','营业厅4','营业厅5'] data:['营业厅1','营业厅2','营业厅3','营业厅4','营业厅5']
...@@ -1154,9 +1161,9 @@ ...@@ -1154,9 +1161,9 @@
}, },
grid:{ grid:{
x:80, x:80,
y:20, y:40,
x2:20, x2:40,
y2:20, y2:50,
}, },
legend: { legend: {
data:['营业厅1','营业厅2','营业厅3','营业厅4','营业厅5'] data:['营业厅1','营业厅2','营业厅3','营业厅4','营业厅5']
...@@ -1275,7 +1282,9 @@ ...@@ -1275,7 +1282,9 @@
}, },
grid:{ grid:{
x:80, x:80,
x2:20, y:40,
x2:40,
y2:50,
}, },
legend: { legend: {
data:['无法使用','可容忍','不满意'] data:['无法使用','可容忍','不满意']
...@@ -1389,7 +1398,9 @@ ...@@ -1389,7 +1398,9 @@
}, },
grid:{ grid:{
x:80, x:80,
x2:80, y:40,
x2:40,
y2:50,
}, },
legend: { legend: {
data:['无法使用','可容忍','不满意'] data:['无法使用','可容忍','不满意']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment