Commit ff55f8c8 authored by liuna's avatar liuna

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

--实体厅流量监测:业务量占比当月图表城市显示
parent b3375a17
...@@ -113,55 +113,28 @@ ...@@ -113,55 +113,28 @@
<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="271"> <state relative-caret-position="1269">
<caret line="907" column="9" lean-forward="true" selection-start-line="907" selection-start-column="9" selection-end-line="907" selection-end-column="9" /> <caret line="1606" column="40" lean-forward="false" selection-start-line="1606" selection-start-column="40" selection-end-line="1606" selection-end-column="40" />
<folding> <folding>
<element signature="n#script#1;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#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="e#53248#54845#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#13;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#13;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#14;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#15;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#15;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ModelResultController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelResultController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179">
<caret line="73" column="16" lean-forward="false" selection-start-line="73" selection-start-column="16" selection-end-line="73" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DataModelDao.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DataModelDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="113">
<caret line="18" column="68" lean-forward="true" selection-start-line="18" selection-start-column="68" selection-end-line="18" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DataModel.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="91">
<caret line="20" column="37" lean-forward="false" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FlowClientDao.java" pinned="false" current-in-tab="false"> <file leaf-file-name="FlowClientDao.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FlowClientDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FlowClientDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -903,14 +876,7 @@ ...@@ -903,14 +876,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="13443000" /> <workItem from="1517533567114" duration="16768000" />
</task>
<task id="LOCAL-00013" summary="把servlet-api包放到默认lib下">
<created>1512189296579</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1512189296579</updated>
</task> </task>
<task id="LOCAL-00014" summary="过滤规则维护页面编写"> <task id="LOCAL-00014" summary="过滤规则维护页面编写">
<created>1512306987199</created> <created>1512306987199</created>
...@@ -1248,11 +1214,18 @@ ...@@ -1248,11 +1214,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1517557698455</updated> <updated>1517557698455</updated>
</task> </task>
<option name="localTasksCounter" value="62" /> <task id="LOCAL-00062" summary="2018年2月2日 --智能分析平台&#10; --实体厅流量监测:图表格式调整对齐">
<created>1517559666824</created>
<option name="number" value="00062" />
<option name="presentableId" value="LOCAL-00062" />
<option name="project" value="LOCAL" />
<updated>1517559666824</updated>
</task>
<option name="localTasksCounter" value="63" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="968600000" /> <option name="totallyTimeSpent" value="971925000" />
</component> </component>
<component name="TodoView" selected-index="2"> <component name="TodoView" selected-index="2">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1283,7 +1256,7 @@ ...@@ -1283,7 +1256,7 @@
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32459018" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32459018" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3967213" sideWeight="0.48638427" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3967213" sideWeight="0.48638427" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262295" sideWeight="0.48865354" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262295" sideWeight="0.48865354" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="1.0" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="1.0" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
...@@ -1390,7 +1363,6 @@ ...@@ -1390,7 +1363,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="监控运营 -&gt;告警关联诊断 -&gt;关联诊断明细 界面&#10;更换 SQL语句" /> <MESSAGE value="监控运营 -&gt;告警关联诊断 -&gt;关联诊断明细 界面&#10;更换 SQL语句" />
<MESSAGE value="‘c’代表 业务 &#10;&#10;‘y’代表 渠道" /> <MESSAGE value="‘c’代表 业务 &#10;&#10;‘y’代表 渠道" />
<MESSAGE value="2017年12月24日 --智能分析平台&#10; --数据质量规则筛选项增加,插入返回弹出框提示" /> <MESSAGE value="2017年12月24日 --智能分析平台&#10; --数据质量规则筛选项增加,插入返回弹出框提示" />
...@@ -1415,7 +1387,8 @@ ...@@ -1415,7 +1387,8 @@
<MESSAGE value="2018年2月2日 --智能分析平台&#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; --实体厅流量监测:营业厅业务量、用户趋势图时间调整" /> <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>
...@@ -1459,7 +1432,7 @@ ...@@ -1459,7 +1432,7 @@
<option name="timeStamp" value="58" /> <option name="timeStamp" value="58" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
<option name="time" value="108" /> <option name="time" value="110" />
</breakpoint-manager> </breakpoint-manager>
<watches-manager> <watches-manager>
<configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory"> <configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
...@@ -1899,10 +1872,10 @@ ...@@ -1899,10 +1872,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelResultController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModel.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179"> <state relative-caret-position="91">
<caret line="73" column="16" lean-forward="false" selection-start-line="73" selection-start-column="16" selection-end-line="73" selection-end-column="16" /> <caret line="20" column="37" lean-forward="false" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="37" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1915,29 +1888,32 @@ ...@@ -1915,29 +1888,32 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModel.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelResultController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="91"> <state relative-caret-position="179">
<caret line="20" column="37" lean-forward="false" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="37" /> <caret line="73" column="16" lean-forward="false" selection-start-line="73" selection-start-column="16" selection-end-line="73" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</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="271"> <state relative-caret-position="1269">
<caret line="907" column="9" lean-forward="true" selection-start-line="907" selection-start-column="9" selection-end-line="907" selection-end-column="9" /> <caret line="1606" column="40" lean-forward="false" selection-start-line="1606" selection-start-column="40" selection-end-line="1606" selection-end-column="40" />
<folding> <folding>
<element signature="n#script#1;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#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="e#53248#54845#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#13;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#13;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#14;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#script#15;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#script#15;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding> </folding>
</state> </state>
......
...@@ -581,7 +581,7 @@ ...@@ -581,7 +581,7 @@
city.reverse(); city.reverse();
cityValue.reverse(); cityValue.reverse();
option1.series[0].data=cityValue; option1.series[0].data=cityValue;
option1.yAxis.data=city; option1.yAxis[0].data=city;
myChartSeatsActiveness.setOption(option1); myChartSeatsActiveness.setOption(option1);
} }
}); });
...@@ -1385,7 +1385,6 @@ ...@@ -1385,7 +1385,6 @@
seatsReceptionUser() seatsReceptionUser()
</script> </script>
<script> <script>
var myChartSeatsReceptionUserMonth = echarts.init(document.getElementById('seatsReceptionUser')); var myChartSeatsReceptionUserMonth = echarts.init(document.getElementById('seatsReceptionUser'));
var option9 = { var option9 = {
...@@ -1500,7 +1499,6 @@ ...@@ -1500,7 +1499,6 @@
} }
</script> </script>
<script> <script>
var myChartIpBusiness = echarts.init(document.getElementById('ipBusiness')); var myChartIpBusiness = echarts.init(document.getElementById('ipBusiness'));
var option10 = { var option10 = {
...@@ -1607,7 +1605,6 @@ ...@@ -1607,7 +1605,6 @@
url: "${ctx}/MonitorOperation/FlowMonitor/ipBusinessMonth", url: "${ctx}/MonitorOperation/FlowMonitor/ipBusinessMonth",
async: false, async: false,
success: function(data){ success: function(data){
data[i].sort(function(t1,t2){return t1[2]-t2[2]});
console.log("用户IP业务当月",data); console.log("用户IP业务当月",data);
var cnt1 = new Array(); var cnt1 = new Array();
var cnt2 = new Array(); var cnt2 = new Array();
...@@ -1622,6 +1619,7 @@ ...@@ -1622,6 +1619,7 @@
var clientIp = new Array(); var clientIp = new Array();
var cnt = new Array(); var cnt = new Array();
for(var i=0; i<data.length; i++){ for(var i=0; i<data.length; i++){
data[i].sort(function(t1,t2){return t1[2]-t2[2]});
cnt1.push(data[i][0]); cnt1.push(data[i][0]);
cnt2.push(data[i][1]); cnt2.push(data[i][1]);
cnt3.push(data[i][2]); cnt3.push(data[i][2]);
...@@ -1673,7 +1671,6 @@ ...@@ -1673,7 +1671,6 @@
var cnt = new Array(); var cnt = new Array();
for(var i=0; i<data.length; i++){ for(var i=0; i<data.length; i++){
data[i].sort(function(t1,t2){return t1[2]-t2[2]}); data[i].sort(function(t1,t2){return t1[2]-t2[2]});
cnt1.push(data[i][0]); cnt1.push(data[i][0]);
cnt2.push(data[i][1]); cnt2.push(data[i][1]);
cnt3.push(data[i][2]); cnt3.push(data[i][2]);
...@@ -1705,7 +1702,6 @@ ...@@ -1705,7 +1702,6 @@
ipBusiness() ipBusiness()
</script> </script>
<script> <script>
var myChartHttpInformation = echarts.init(document.getElementById('httpState')); var myChartHttpInformation = echarts.init(document.getElementById('httpState'));
var option11 = { var option11 = {
...@@ -1998,7 +1994,6 @@ ...@@ -1998,7 +1994,6 @@
ipTrend() ipTrend()
</script> </script>
<script> <script>
var myChartIpTrendMonth = echarts.init(document.getElementById('ipTrend')); var myChartIpTrendMonth = echarts.init(document.getElementById('ipTrend'));
var option13 = { var option13 = {
......
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