Skip to content

C
cmszMonitorAnalysis
Commit bbb45284 authored by 胡斌's avatar 胡斌
Browse files
Options

过滤规则维护页面编写

parent 9fe6b58d
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 24 deletions
.idea/workspace.xml
View file @ bbb45284
...@@ -7,21 +7,7 @@ ...@@ -7,21 +7,7 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment=""> <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.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/FilterRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FilterRule.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/BusinessDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/BusinessDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/FilterRuleService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/FilterRuleService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ChannelTag.tag" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ChannelTag.tag" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ProvinceTag.tag" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ProvinceTag.tag" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js" />
</list> </list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" /> <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
...@@ -40,8 +26,8 @@ ...@@ -40,8 +26,8 @@
<file leaf-file-name="FilterRuleResult.jsp" pinned="false" current-in-tab="true"> <file leaf-file-name="FilterRuleResult.jsp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="159"> <state relative-caret-position="327">
<caret line="245" column="28" lean-forward="true" selection-start-line="245" selection-start-column="28" selection-end-line="245" selection-end-column="28" /> <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
<folding> <folding>
<element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#2;n#jsp:root#0;n#!!top" expanded="false" /> <element signature="n#c:forEach#2;n#jsp:root#0;n#!!top" expanded="false" />
...@@ -562,7 +548,7 @@ ...@@ -562,7 +548,7 @@
<workItem from="1512188402032" duration="982000" /> <workItem from="1512188402032" duration="982000" />
<workItem from="1512189513405" duration="1759000" /> <workItem from="1512189513405" duration="1759000" />
<workItem from="1512192653380" duration="2572000" /> <workItem from="1512192653380" duration="2572000" />
<workItem from="1512205059832" duration="47144000" /> <workItem from="1512205059832" duration="47415000" />
</task> </task>
<task id="LOCAL-00001" summary="first commit"> <task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created> <created>1507828551888</created>
...@@ -655,11 +641,18 @@ ...@@ -655,11 +641,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1512189296579</updated> <updated>1512189296579</updated>
</task> </task>
<option name="localTasksCounter" value="14" /> <task id="LOCAL-00014" summary="过滤规则维护页面编写">
<created>1512306987199</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1512306987236</updated>
</task>
<option name="localTasksCounter" value="15" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="348130000" /> <option name="totallyTimeSpent" value="348401000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -691,10 +684,10 @@ ...@@ -691,10 +684,10 @@
<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.32840723" 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.32840723" 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.53858024" sideWeight="0.4939394" 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="false" show_stripe_button="true" weight="0.53858024" sideWeight="0.4939394" 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.27314815" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27314815" sideWeight="0.49545455" 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="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="13" 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="14" 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="14" 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.2677761" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2677761" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" 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="7" side_tool="false" content_ui="tabs" /> <window_info id="Bean Validation" 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="7" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" 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="8" side_tool="false" content_ui="tabs" /> <window_info id="Theme Preview" 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="8" side_tool="false" content_ui="tabs" />
...@@ -801,7 +794,8 @@ ...@@ -801,7 +794,8 @@
<MESSAGE value="模型监控增加字段，增加添加修改模型参数&#10;模型预览完成" /> <MESSAGE value="模型监控增加字段，增加添加修改模型参数&#10;模型预览完成" />
<MESSAGE value="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" /> <MESSAGE value="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" />
<MESSAGE value="把servlet-api包放到默认lib下" /> <MESSAGE value="把servlet-api包放到默认lib下" />
<option name="LAST_COMMIT_MESSAGE" value="把servlet-api包放到默认lib下" /> <MESSAGE value="过滤规则维护页面编写" />
<option name="LAST_COMMIT_MESSAGE" value="过滤规则维护页面编写" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -1260,8 +1254,8 @@ ...@@ -1260,8 +1254,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="159"> <state relative-caret-position="327">
<caret line="245" column="28" lean-forward="true" selection-start-line="245" selection-start-column="28" selection-end-line="245" selection-end-column="28" /> <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
<folding> <folding>
<element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" /> <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#2;n#jsp:root#0;n#!!top" expanded="false" /> <element signature="n#c:forEach#2;n#jsp:root#0;n#!!top" expanded="false" />
......
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