Skip to content

C
cmszMonitorAnalysis
Commit 6e614d12 authored by liuna's avatar liuna
Browse files
Options

2018年1月27日 --智能分析平台

--实体厅流量监测页面时间轴修改
parent d5ff60a8
Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 173 deletions
.idea/workspace.xml
View file @ 6e614d12
...@@ -6,32 +6,8 @@ ...@@ -6,32 +6,8 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2018年1月1日 --智能分析平台&#10; --修改质量规则和过滤规则全选不联动"> <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2018年1月26日 --智能分析平台&#10; --实体厅流量监测页面完成">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowAccount.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowBrowser.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowClient.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowHallBusiness.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowMonitorCator.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowServer.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FlowAccountDao.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FlowBrowserDao.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FlowClientDao.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FlowHallBusinessDao.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FlowMonitorCatonDao.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FlowMonitorDao.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FlowServerDao.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/echarts.common.min.js" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/echarts.min.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/ModelParameterDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/ModelParameterDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/FilterRuleResultController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/FilterRuleResultController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowMonitor.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowMonitor.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp" />
</list> </list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" /> <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
...@@ -62,8 +38,8 @@ ...@@ -62,8 +38,8 @@
<file leaf-file-name="FlowMonitorController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="FlowMonitorController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="346"> <state relative-caret-position="2838">
<caret line="240" column="9" lean-forward="true" selection-start-line="240" selection-start-column="9" selection-end-line="240" selection-end-column="9" /> <caret line="240" column="9" lean-forward="false" selection-start-line="240" selection-start-column="9" selection-end-line="240" selection-end-column="9" />
<folding> <folding>
<element signature="e#1874#1944#0" expanded="false" /> <element signature="e#1874#1944#0" expanded="false" />
<element signature="method#findSeatsActiveness#0;class#FlowMonitorController#0" expanded="false" /> <element signature="method#findSeatsActiveness#0;class#FlowMonitorController#0" expanded="false" />
...@@ -119,43 +95,38 @@ ...@@ -119,43 +95,38 @@
<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="99"> <state relative-caret-position="72">
<caret line="258" column="11" lean-forward="true" selection-start-line="258" selection-start-column="11" selection-end-line="258" selection-end-column="11" /> <caret line="992" column="26" lean-forward="true" selection-start-line="992" selection-start-column="26" selection-end-line="992" selection-end-column="26" />
<folding> <folding>
<element signature="e#18393#18456#0#HTML" expanded="false" /> <element signature="e#28133#30207#0#HTML" expanded="false" />
<element signature="e#18486#18553#0#HTML" expanded="false" /> <element signature="e#30282#32072#0#HTML" expanded="false" />
<element signature="e#19978#23471#0#HTML" expanded="false" /> <element signature="e#34748#37567#0#HTML" expanded="false" />
<element signature="e#23509#23582#0#HTML" expanded="false" /> <element signature="e#37665#40712#0#HTML" expanded="false" />
<element signature="e#23768#23813#0#HTML" expanded="false" /> <element signature="e#40770#42620#0#HTML" expanded="false" />
<element signature="e#23958#25427#0#HTML" expanded="false" /> <element signature="e#45420#46116#0#HTML" expanded="false" />
<element signature="e#25494#27981#0#HTML" expanded="false" /> <element signature="e#46157#46858#0#HTML" expanded="false" />
<element signature="e#28059#29786#0#HTML" expanded="false" /> <element signature="e#46899#47782#0#HTML" expanded="false" />
<element signature="e#29861#31651#0#HTML" expanded="false" /> <element signature="e#47828#48716#0#HTML" expanded="false" />
<element signature="e#33797#36272#0#HTML" expanded="false" /> <element signature="e#48746#49623#0#HTML" expanded="false" />
<element signature="e#36370#39417#0#HTML" expanded="false" /> <element signature="e#49658#50540#0#HTML" expanded="false" />
<element signature="e#39475#41325#0#HTML" expanded="false" /> <element signature="e#50576#51423#0#HTML" expanded="false" />
<element signature="e#41378#43557#0#HTML" expanded="false" /> <element signature="e#51460#52308#0#HTML" expanded="false" />
<element signature="e#43594#44290#0#HTML" expanded="false" /> <element signature="e#52343#53387#0#HTML" expanded="false" />
<element signature="e#44331#45032#0#HTML" expanded="false" /> <element signature="e#53427#54476#0#HTML" expanded="false" />
<element signature="e#45073#45956#0#HTML" expanded="false" /> <element signature="e#54515#55410#0#HTML" expanded="false" />
<element signature="e#46002#46890#0#HTML" expanded="false" /> <element signature="e#55454#56354#0#HTML" expanded="false" />
<element signature="e#46920#47797#0#HTML" expanded="false" /> <element signature="e#56381#57079#0#HTML" expanded="false" />
<element signature="e#47832#48714#0#HTML" expanded="false" /> <element signature="e#57111#57814#0#HTML" expanded="false" />
<element signature="e#48750#49597#0#HTML" expanded="false" /> <element signature="e#57845#59461#0#HTML" expanded="false" />
<element signature="e#49634#50482#0#HTML" expanded="false" /> <element signature="e#59497#61070#0#HTML" expanded="false" />
<element signature="e#52689#53584#0#HTML" expanded="false" /> <element signature="e#61098#62120#0#HTML" expanded="false" />
<element signature="e#53628#54528#0#HTML" expanded="false" /> <element signature="e#62153#63181#0#HTML" expanded="false" />
<element signature="e#54555#55253#0#HTML" expanded="false" /> <element signature="e#63215#63927#0#HTML" expanded="false" />
<element signature="e#55285#55988#0#HTML" expanded="false" /> <element signature="e#63966#64683#0#HTML" expanded="false" />
<element signature="e#56019#57587#0#HTML" expanded="false" /> <element signature="e#64723#65426#0#HTML" expanded="false" />
<element signature="e#57623#59196#0#HTML" expanded="false" /> <element signature="e#65471#66179#0#HTML" expanded="false" />
<element signature="e#60279#61307#0#HTML" expanded="false" /> <element signature="e#66215#66845#0#HTML" expanded="false" />
<element signature="e#61341#62053#0#HTML" expanded="false" /> <element signature="e#66886#67521#0#HTML" expanded="false" />
<element signature="e#62092#62809#0#HTML" expanded="false" />
<element signature="e#62849#63552#0#HTML" expanded="false" />
<element signature="e#63597#64305#0#HTML" expanded="false" />
<element signature="e#64341#64971#0#HTML" expanded="false" />
<element signature="e#65012#65647#0#HTML" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -353,6 +324,10 @@ ...@@ -353,6 +324,10 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="AndroidView" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -390,10 +365,6 @@ ...@@ -390,10 +365,6 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
<pane id="AndroidView" />
<pane id="Scope" />
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -818,14 +789,10 @@ ...@@ -818,14 +789,10 @@
<workItem from="1516842646148" duration="24790000" /> <workItem from="1516842646148" duration="24790000" />
<workItem from="1516929563514" duration="15071000" /> <workItem from="1516929563514" duration="15071000" />
<workItem from="1516945378474" duration="3969000" /> <workItem from="1516945378474" duration="3969000" />
<workItem from="1516949529833" duration="11366000" /> <workItem from="1516949529833" duration="11937000" />
</task> <workItem from="1517032917664" duration="1937000" />
<task id="LOCAL-00005" summary="2017年10月29提交内容&#10; --实现预警与隐患维护的协查单预览与下发"> <workItem from="1517035027622" duration="2087000" />
<created>1509281491763</created> <workItem from="1517037282348" duration="3496000" />
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1509281491763</updated>
</task> </task>
<task id="LOCAL-00006" summary="2017年11月02提交内容&#10; --实现自定义协查单告警描述和内部协查单页面"> <task id="LOCAL-00006" summary="2017年11月02提交内容&#10; --实现自定义协查单告警描述和内部协查单页面">
<created>1509584789104</created> <created>1509584789104</created>
...@@ -1163,11 +1130,18 @@ ...@@ -1163,11 +1130,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1516355780005</updated> <updated>1516355780005</updated>
</task> </task>
<option name="localTasksCounter" value="54" /> <task id="LOCAL-00054" summary="2018年1月26日 --智能分析平台&#10; --实体厅流量监测页面">
<created>1516962231143</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1516962231144</updated>
</task>
<option name="localTasksCounter" value="55" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="897302000" /> <option name="totallyTimeSpent" value="905393000" />
</component> </component>
<component name="TodoView" selected-index="2"> <component name="TodoView" selected-index="2">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1182,7 +1156,7 @@ ...@@ -1182,7 +1156,7 @@
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<layout> <layout>
<window_info id="Palette" 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="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41967213" sideWeight="0.5136157" order="8" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.70163935" sideWeight="0.51134646" order="8" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" 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="14" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" 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="14" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" 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="2" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" 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="2" side_tool="false" content_ui="tabs" />
...@@ -1198,8 +1172,8 @@ ...@@ -1198,8 +1172,8 @@
<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.43442622" 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.43442622" 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.70163935" sideWeight="0.49159664" 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.70163935" 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="0.32840723" 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="0.32840723" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22239032" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22239032" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
...@@ -1305,7 +1279,6 @@ ...@@ -1305,7 +1279,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="监控运营-&gt;关联配置-&gt;关联诊断明细 界面&#10;table 文本居中" />
<MESSAGE value="监控运营 -&gt;关联告警诊断 -&gt;关联诊断配置 -&gt;'修改&amp;创建关联配置' 界面&#10;解决'批量修改参数 权值和出异常'bug" /> <MESSAGE value="监控运营 -&gt;关联告警诊断 -&gt;关联诊断配置 -&gt;'修改&amp;创建关联配置' 界面&#10;解决'批量修改参数 权值和出异常'bug" />
<MESSAGE value="监控运营 -&gt;告警关联诊断-&gt;关联诊断配置 页面&#10;增加‘删除’规则 功能" /> <MESSAGE value="监控运营 -&gt;告警关联诊断-&gt;关联诊断配置 页面&#10;增加‘删除’规则 功能" />
<MESSAGE value="监控运营-&gt;告警关联诊断-&gt;关联诊断-&gt;新建&#10;'全选' 增加红色样式" /> <MESSAGE value="监控运营-&gt;告警关联诊断-&gt;关联诊断-&gt;新建&#10;'全选' 增加红色样式" />
...@@ -1330,7 +1303,8 @@ ...@@ -1330,7 +1303,8 @@
<MESSAGE value="2018年1月15日 --智能分析平台&#10; --修改质量规则和过滤规则页面标题修改" /> <MESSAGE value="2018年1月15日 --智能分析平台&#10; --修改质量规则和过滤规则页面标题修改" />
<MESSAGE value="2018年1月18日 --智能分析平台&#10; --备份" /> <MESSAGE value="2018年1月18日 --智能分析平台&#10; --备份" />
<MESSAGE value="2018年1月1日 --智能分析平台&#10; --修改质量规则和过滤规则全选不联动" /> <MESSAGE value="2018年1月1日 --智能分析平台&#10; --修改质量规则和过滤规则全选不联动" />
<option name="LAST_COMMIT_MESSAGE" value="2018年1月1日 --智能分析平台&#10; --修改质量规则和过滤规则全选不联动" /> <MESSAGE value="2018年1月26日 --智能分析平台&#10; --实体厅流量监测页面" />
<option name="LAST_COMMIT_MESSAGE" value="2018年1月26日 --智能分析平台&#10; --实体厅流量监测页面" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -1639,11 +1613,11 @@ ...@@ -1639,11 +1613,11 @@
<state relative-caret-position="-1012"> <state relative-caret-position="-1012">
<caret line="613" column="52" lean-forward="true" selection-start-line="613" selection-start-column="52" selection-end-line="613" selection-end-column="52" /> <caret line="613" column="52" lean-forward="true" selection-start-line="613" selection-start-column="52" selection-end-line="613" selection-end-column="52" />
<folding> <folding>
<marker date="1516675535946" expanded="true" signature="16744:16750" ph="&amp;nbsp;" /> <marker date="1516962439311" expanded="true" signature="16744:16750" ph="&amp;nbsp;" />
<marker date="1516675535946" expanded="true" signature="16750:16756" ph="&amp;nbsp;" /> <marker date="1516962439311" expanded="true" signature="16750:16756" ph="&amp;nbsp;" />
<marker date="1516675535946" expanded="true" signature="32469:32482" ph="..." /> <marker date="1516962439311" expanded="true" signature="32469:32482" ph="..." />
<marker date="1516675535946" expanded="true" signature="32571:32577" ph="&amp;nbsp;" /> <marker date="1516962439311" expanded="true" signature="32571:32577" ph="&amp;nbsp;" />
<marker date="1516675535946" expanded="true" signature="32577:32583" ph="&amp;nbsp;" /> <marker date="1516962439311" expanded="true" signature="32577:32583" ph="&amp;nbsp;" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -1723,21 +1697,6 @@ ...@@ -1723,21 +1697,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="42"> <state relative-caret-position="42">
<caret line="19" column="18" lean-forward="false" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="72" /> <caret line="19" column="18" lean-forward="false" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="72" />
<folding>
<marker date="1516946331829" expanded="true" signature="457:765" ph="select CITY,... TRANS_CNT" />
<marker date="1516946331829" expanded="true" signature="563:714" ph="select TRANS... app_sm_db_city_kpi_t" />
<marker date="1516946331829" expanded="true" signature="868:1076" ph="select CITY,... app_sm_db_city_kpi_t" />
<marker date="1516946331829" expanded="true" signature="1233:2545" ph="SELECT A.CIT... distinctCASE" />
<marker date="1516946331829" expanded="true" signature="1294:2202" ph="select disti... PERCENTILE_CONT" />
<marker date="1516946331829" expanded="true" signature="1439:2200" ph="SELECT \nPER... " />
<marker date="1516946331829" expanded="true" signature="2225:2501" ph="select cast TRANS_CNT" />
<marker date="1516946331829" expanded="true" signature="2342:2471" ph="select TRANS... app_sm_db_city_kpi_t" />
<marker date="1516946331829" expanded="true" signature="2472:2501" ph="select cast TRANS_CNT" />
<marker date="1516946331829" expanded="true" signature="2709:3873" ph="SELECT A.CIT... distinctCASE" />
<marker date="1516946331829" expanded="true" signature="2770:3610" ph="select disti... PERCENTILE_CONT" />
<marker date="1516946331829" expanded="true" signature="2915:3608" ph="SELECT \nPER... " />
<marker date="1516946331829" expanded="true" signature="3633:3829" ph="select cast app_sm_db_city_kpi_t" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1752,7 +1711,6 @@ ...@@ -1752,7 +1711,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44"> <state relative-caret-position="44">
<caret line="8" column="3" lean-forward="false" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="23" /> <caret line="8" column="3" lean-forward="false" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="23" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1768,7 +1726,6 @@ ...@@ -1768,7 +1726,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-585"> <state relative-caret-position="-585">
<caret line="35" column="39" lean-forward="true" selection-start-line="35" selection-start-column="39" selection-end-line="35" selection-end-column="39" /> <caret line="35" column="39" lean-forward="true" selection-start-line="35" selection-start-column="39" selection-end-line="35" selection-end-column="39" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1784,12 +1741,6 @@ ...@@ -1784,12 +1741,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154"> <state relative-caret-position="154">
<caret line="331" column="53" lean-forward="true" selection-start-line="331" selection-start-column="53" selection-end-line="331" selection-end-column="72" /> <caret line="331" column="53" lean-forward="true" selection-start-line="331" selection-start-column="53" selection-end-line="331" selection-end-column="72" />
<folding>
<marker date="1514339851630" expanded="true" signature="12315:12327" ph="..." />
<marker date="1514339851630" expanded="true" signature="17699:17709" ph="..." />
<marker date="1514339851630" expanded="true" signature="20968:21024" ph="..." />
<marker date="1514339851630" expanded="true" signature="23600:23646" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1797,26 +1748,6 @@ ...@@ -1797,26 +1748,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="303"> <state relative-caret-position="303">
<caret line="72" column="8" lean-forward="true" selection-start-line="72" selection-start-column="4" selection-end-line="72" selection-end-column="18" /> <caret line="72" column="8" lean-forward="true" selection-start-line="72" selection-start-column="4" selection-end-line="72" selection-end-column="18" />
<folding>
<marker date="1516944087071" expanded="true" signature="456:867" ph="select CLIEN... CLIENT_IP" />
<marker date="1516944087071" expanded="true" signature="633:818" ph="select CLIEN... app_sm_db_client_kpi_250_t" />
<marker date="1516944087071" expanded="true" signature="964:1244" ph="select CLIEN... app_sm_db_client_kpi_250_t" />
<marker date="1516944087071" expanded="true" signature="1341:2869" ph="SELECT \nsum... CLIENT_IP" />
<marker date="1516944087071" expanded="true" signature="2087:2826" ph="SELECT A.CLI... CLIENT_IP" />
<marker date="1516944087071" expanded="true" signature="2153:2472" ph="SELECT CLIEN... CLIENT_IP" />
<marker date="1516944087071" expanded="true" signature="2231:2406" ph="select CLIEN... app_sm_db_client_kpi_250_t" />
<marker date="1516944087071" expanded="true" signature="2493:2794" ph="SELECT CLIEN... CLIENT_IP" />
<marker date="1516944087071" expanded="true" signature="2555:2715" ph="select CLIEN... app_sm_db_client_kpi_250_t" />
<marker date="1516944087071" expanded="true" signature="2972:4380" ph="SELECT \nsum... CLIENT_IP" />
<marker date="1516944087071" expanded="true" signature="3718:4337" ph="SELECT A.CLI... CLIENT_IP" />
<marker date="1516944087071" expanded="true" signature="3784:3983" ph="SELECT CLIEN... app_sm_db_client_kpi_250_t" />
<marker date="1516944087071" expanded="true" signature="4004:4305" ph="SELECT CLIEN... CLIENT_IP" />
<marker date="1516944087071" expanded="true" signature="4066:4226" ph="select CLIEN... app_sm_db_client_kpi_250_t" />
<marker date="1516944087071" expanded="true" signature="4479:4684" ph="SELECT CLIEN... CLIENT_IP" />
<marker date="1516944087071" expanded="true" signature="4502:4682" ph="SELECT CLIEN... app_sm_db_client_kpi_250_t" />
<marker date="1516944087071" expanded="true" signature="4772:4994" ph="select sum(T... " />
<marker date="1516944087071" expanded="true" signature="5105:5309" ph="select sum(T... " />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1824,14 +1755,13 @@ ...@@ -1824,14 +1755,13 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110"> <state relative-caret-position="110">
<caret line="6" column="17" lean-forward="false" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" /> <caret line="6" column="17" lean-forward="false" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="346"> <state relative-caret-position="2838">
<caret line="240" column="9" lean-forward="true" selection-start-line="240" selection-start-column="9" selection-end-line="240" selection-end-column="9" /> <caret line="240" column="9" lean-forward="false" selection-start-line="240" selection-start-column="9" selection-end-line="240" selection-end-column="9" />
<folding> <folding>
<element signature="e#1874#1944#0" expanded="false" /> <element signature="e#1874#1944#0" expanded="false" />
<element signature="method#findSeatsActiveness#0;class#FlowMonitorController#0" expanded="false" /> <element signature="method#findSeatsActiveness#0;class#FlowMonitorController#0" expanded="false" />
...@@ -1885,43 +1815,38 @@ ...@@ -1885,43 +1815,38 @@
</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="99"> <state relative-caret-position="72">
<caret line="258" column="11" lean-forward="true" selection-start-line="258" selection-start-column="11" selection-end-line="258" selection-end-column="11" /> <caret line="992" column="26" lean-forward="true" selection-start-line="992" selection-start-column="26" selection-end-line="992" selection-end-column="26" />
<folding> <folding>
<element signature="e#18393#18456#0#HTML" expanded="false" /> <element signature="e#28133#30207#0#HTML" expanded="false" />
<element signature="e#18486#18553#0#HTML" expanded="false" /> <element signature="e#30282#32072#0#HTML" expanded="false" />
<element signature="e#19978#23471#0#HTML" expanded="false" /> <element signature="e#34748#37567#0#HTML" expanded="false" />
<element signature="e#23509#23582#0#HTML" expanded="false" /> <element signature="e#37665#40712#0#HTML" expanded="false" />
<element signature="e#23768#23813#0#HTML" expanded="false" /> <element signature="e#40770#42620#0#HTML" expanded="false" />
<element signature="e#23958#25427#0#HTML" expanded="false" /> <element signature="e#45420#46116#0#HTML" expanded="false" />
<element signature="e#25494#27981#0#HTML" expanded="false" /> <element signature="e#46157#46858#0#HTML" expanded="false" />
<element signature="e#28059#29786#0#HTML" expanded="false" /> <element signature="e#46899#47782#0#HTML" expanded="false" />
<element signature="e#29861#31651#0#HTML" expanded="false" /> <element signature="e#47828#48716#0#HTML" expanded="false" />
<element signature="e#33797#36272#0#HTML" expanded="false" /> <element signature="e#48746#49623#0#HTML" expanded="false" />
<element signature="e#36370#39417#0#HTML" expanded="false" /> <element signature="e#49658#50540#0#HTML" expanded="false" />
<element signature="e#39475#41325#0#HTML" expanded="false" /> <element signature="e#50576#51423#0#HTML" expanded="false" />
<element signature="e#41378#43557#0#HTML" expanded="false" /> <element signature="e#51460#52308#0#HTML" expanded="false" />
<element signature="e#43594#44290#0#HTML" expanded="false" /> <element signature="e#52343#53387#0#HTML" expanded="false" />
<element signature="e#44331#45032#0#HTML" expanded="false" /> <element signature="e#53427#54476#0#HTML" expanded="false" />
<element signature="e#45073#45956#0#HTML" expanded="false" /> <element signature="e#54515#55410#0#HTML" expanded="false" />
<element signature="e#46002#46890#0#HTML" expanded="false" /> <element signature="e#55454#56354#0#HTML" expanded="false" />
<element signature="e#46920#47797#0#HTML" expanded="false" /> <element signature="e#56381#57079#0#HTML" expanded="false" />
<element signature="e#47832#48714#0#HTML" expanded="false" /> <element signature="e#57111#57814#0#HTML" expanded="false" />
<element signature="e#48750#49597#0#HTML" expanded="false" /> <element signature="e#57845#59461#0#HTML" expanded="false" />
<element signature="e#49634#50482#0#HTML" expanded="false" /> <element signature="e#59497#61070#0#HTML" expanded="false" />
<element signature="e#52689#53584#0#HTML" expanded="false" /> <element signature="e#61098#62120#0#HTML" expanded="false" />
<element signature="e#53628#54528#0#HTML" expanded="false" /> <element signature="e#62153#63181#0#HTML" expanded="false" />
<element signature="e#54555#55253#0#HTML" expanded="false" /> <element signature="e#63215#63927#0#HTML" expanded="false" />
<element signature="e#55285#55988#0#HTML" expanded="false" /> <element signature="e#63966#64683#0#HTML" expanded="false" />
<element signature="e#56019#57587#0#HTML" expanded="false" /> <element signature="e#64723#65426#0#HTML" expanded="false" />
<element signature="e#57623#59196#0#HTML" expanded="false" /> <element signature="e#65471#66179#0#HTML" expanded="false" />
<element signature="e#60279#61307#0#HTML" expanded="false" /> <element signature="e#66215#66845#0#HTML" expanded="false" />
<element signature="e#61341#62053#0#HTML" expanded="false" /> <element signature="e#66886#67521#0#HTML" expanded="false" />
<element signature="e#62092#62809#0#HTML" expanded="false" />
<element signature="e#62849#63552#0#HTML" expanded="false" />
<element signature="e#63597#64305#0#HTML" expanded="false" />
<element signature="e#64341#64971#0#HTML" expanded="false" />
<element signature="e#65012#65647#0#HTML" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp
View file @ 6e614d12
...@@ -252,6 +252,7 @@ ...@@ -252,6 +252,7 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript" src="${ctx}/static/js/echarts.min.js"></script> <script type="text/javascript" src="${ctx}/static/js/echarts.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
...@@ -398,6 +399,9 @@ ...@@ -398,6 +399,9 @@
var df=new SimpleDateFormat(); var df=new SimpleDateFormat();
df.applyPattern("yyyy-MM-dd HH:mm:ss"); df.applyPattern("yyyy-MM-dd HH:mm:ss");
var sdf=new SimpleDateFormat();
sdf.applyPattern("HH");
function seatsActivenessChart(city,cityValue) { function seatsActivenessChart(city,cityValue) {
var myChart = echarts.init(document.getElementById('seatsActiveness')); var myChart = echarts.init(document.getElementById('seatsActiveness'));
var option = { var option = {
...@@ -542,10 +546,18 @@ ...@@ -542,10 +546,18 @@
}, },
xAxis:[ xAxis:[
{ {
type:'category', type: 'category',
data:time, data: time,
splitLine:{ splitLine: {
show:false show: false
},
axisLabel: {
show: true,
formatter: function (data,i) {
if(i%4==0){
return sdf.format(new Date(data));
}
},
}, },
} }
], ],
...@@ -648,6 +660,12 @@ ...@@ -648,6 +660,12 @@
tooltip : { tooltip : {
trigger: 'axis' trigger: 'axis'
}, },
grid:{
x:50,
y:20,
x2:0,
y2:20,
},
legend: { legend: {
data:['营业厅1','营业厅2','营业厅3','营业厅4','营业厅5'] data:['营业厅1','营业厅2','营业厅3','营业厅4','营业厅5']
}, },
...@@ -658,6 +676,15 @@ ...@@ -658,6 +676,15 @@
splitLine: { splitLine: {
show: false show: false
}, },
axisLabel: {
show: true,
interval:0,
formatter: function (data,i) {
if(i%4==0){
return sdf.format(new Date(data));
}
},
},
} }
], ],
yAxis:[ yAxis:[
...@@ -726,7 +753,15 @@ ...@@ -726,7 +753,15 @@
data: time, data: time,
splitLine: { splitLine: {
show: false show: false
},
axisLabel: {
show: true,
formatter: function (data,i) {
if(i%4==0){
return sdf.format(new Date(data));
} }
},
},
} }
], ],
yAxis:[ yAxis:[
...@@ -952,6 +987,12 @@ ...@@ -952,6 +987,12 @@
tooltip : { tooltip : {
trigger: 'axis' trigger: 'axis'
}, },
grid:{
x:50,
y:40,
x2:10,
y2:30,
},
legend: { legend: {
data:ipList, data:ipList,
}, },
...@@ -962,6 +1003,15 @@ ...@@ -962,6 +1003,15 @@
splitLine: { splitLine: {
show: false show: false
}, },
axisLabel: {
show: true,
interval:0,
formatter: function (data,i) {
if(i%4==0){
return sdf.format(new Date(data));
}
},
},
} }
], ],
yAxis:[ yAxis:[
...@@ -1319,6 +1369,7 @@ ...@@ -1319,6 +1369,7 @@
url: "${ctx}/MonitorOperation/FlowMonitor/ipBusiness", url: "${ctx}/MonitorOperation/FlowMonitor/ipBusiness",
async: false, async: false,
success: function(data){ success: function(data){
console.log("用户业务IP",data);
var cnt1 = new Array(); var cnt1 = new Array();
var cnt2 = new Array(); var cnt2 = new Array();
var cnt3 = new Array(); var cnt3 = new Array();
......
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