Skip to content

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

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

--修改质量规则和过滤规则页面标题修改
parent 370d3da1
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 34 deletions
.idea/workspace.xml
View file @ f52649fe
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2018年1月15日 --智能分析平台&#10; --修改过滤规则验收新问题"> <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2018年1月15日 --智能分析平台&#10; --修改过滤规则验收新问题">
<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/FilterRuleResultController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/FilterRuleResultController.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/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/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/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/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/QualityRuleMaintain.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
</list> </list>
...@@ -74,21 +72,31 @@ ...@@ -74,21 +72,31 @@
<file leaf-file-name="QualityRuleMaintain.jsp" pinned="false" current-in-tab="false"> <file leaf-file-name="QualityRuleMaintain.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132"> <state relative-caret-position="176">
<caret line="36" column="1" lean-forward="true" selection-start-line="25" selection-start-column="0" selection-end-line="36" selection-end-column="1" /> <caret line="56" column="66" lean-forward="false" selection-start-line="56" selection-start-column="66" selection-end-line="56" selection-end-column="66" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="QualityRuleConfiguration.jsp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="86" column="20" lean-forward="false" selection-start-line="86" selection-start-column="20" selection-end-line="86" selection-end-column="20" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="FilterRuleMaintain.jsp" pinned="false" current-in-tab="true"> <file leaf-file-name="FilterRuleMaintain.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146"> <state relative-caret-position="58">
<caret line="102" column="64" lean-forward="false" selection-start-line="102" selection-start-column="64" selection-end-line="102" selection-end-column="64" /> <caret line="62" column="64" lean-forward="false" selection-start-line="62" selection-start-column="64" selection-end-line="62" selection-end-column="64" />
<folding> <folding>
<marker date="1516158222118" expanded="true" signature="7290:7300" ph="..." /> <marker date="1516158845145" expanded="true" signature="7290:7300" ph="..." />
<marker date="1516158222118" expanded="true" signature="17653:17663" ph="..." /> <marker date="1516158845145" expanded="true" signature="17653:17663" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -229,8 +237,8 @@ ...@@ -229,8 +237,8 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
</list> </list>
</option> </option>
</component> </component>
...@@ -761,14 +769,7 @@ ...@@ -761,14 +769,7 @@
<workItem from="1515566044813" duration="22405000" /> <workItem from="1515566044813" duration="22405000" />
<workItem from="1515979833834" duration="7707000" /> <workItem from="1515979833834" duration="7707000" />
<workItem from="1516064938318" duration="12183000" /> <workItem from="1516064938318" duration="12183000" />
<workItem from="1516152453873" duration="5711000" /> <workItem from="1516152453873" duration="6398000" />
</task>
<task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1507828551888</updated>
</task> </task>
<task id="LOCAL-00002" summary="first commit"> <task id="LOCAL-00002" summary="first commit">
<created>1507830038347</created> <created>1507830038347</created>
...@@ -1106,11 +1107,18 @@ ...@@ -1106,11 +1107,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1515997876828</updated> <updated>1515997876828</updated>
</task> </task>
<option name="localTasksCounter" value="50" /> <task id="LOCAL-00050" summary="2018年1月17日 --智能分析平台&#10; --修改质量规则和过滤规则的指标布局">
<created>1516158371083</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1516158371084</updated>
</task>
<option name="localTasksCounter" value="51" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="734829000" /> <option name="totallyTimeSpent" value="735516000" />
</component> </component>
<component name="TodoView" selected-index="2"> <component name="TodoView" selected-index="2">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1141,7 +1149,7 @@ ...@@ -1141,7 +1149,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="true" show_stripe_button="true" weight="0.447541" sideWeight="0.48907563" 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.447541" sideWeight="0.48907563" 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.33934426" 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.33934426" sideWeight="0.49159664" 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" />
...@@ -1248,7 +1256,6 @@ ...@@ -1248,7 +1256,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="修改bug ." />
<MESSAGE value="验证判断" /> <MESSAGE value="验证判断" />
<MESSAGE value="'指标告警明细 悬浮框' 功能" /> <MESSAGE value="'指标告警明细 悬浮框' 功能" />
<MESSAGE value="监控运营-&gt;告警关联诊断-&gt;关联诊断明细 界面&#10;默认最近一个月 数据" /> <MESSAGE value="监控运营-&gt;告警关联诊断-&gt;关联诊断明细 界面&#10;默认最近一个月 数据" />
...@@ -1273,7 +1280,8 @@ ...@@ -1273,7 +1280,8 @@
<MESSAGE value="2017年12月27日 --智能分析平台&#10; --删除规则改为物理删除、质量报告时间精确到日" /> <MESSAGE value="2017年12月27日 --智能分析平台&#10; --删除规则改为物理删除、质量报告时间精确到日" />
<MESSAGE value="2017年12月27日 --智能分析平台&#10; --质量运营时间展示修改" /> <MESSAGE value="2017年12月27日 --智能分析平台&#10; --质量运营时间展示修改" />
<MESSAGE value="2018年1月15日 --智能分析平台&#10; --修改过滤规则验收新问题" /> <MESSAGE value="2018年1月15日 --智能分析平台&#10; --修改过滤规则验收新问题" />
<option name="LAST_COMMIT_MESSAGE" value="2018年1月15日 --智能分析平台&#10; --修改过滤规则验收新问题" /> <MESSAGE value="2018年1月17日 --智能分析平台&#10; --修改质量规则和过滤规则的指标布局" />
<option name="LAST_COMMIT_MESSAGE" value="2018年1月17日 --智能分析平台&#10; --修改质量规则和过滤规则的指标布局" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -1622,22 +1630,30 @@ ...@@ -1622,22 +1630,30 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="58">
<caret line="62" column="64" lean-forward="false" selection-start-line="62" selection-start-column="64" selection-end-line="62" selection-end-column="64" />
<folding>
<marker date="1516158845145" expanded="true" signature="7290:7300" ph="..." />
<marker date="1516158845145" expanded="true" signature="17653:17663" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132"> <state relative-caret-position="176">
<caret line="36" column="1" lean-forward="true" selection-start-line="25" selection-start-column="0" selection-end-line="36" selection-end-column="1" /> <caret line="56" column="66" lean-forward="false" selection-start-line="56" selection-start-column="66" selection-end-line="56" selection-end-column="66" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146"> <state relative-caret-position="44">
<caret line="102" column="64" lean-forward="false" selection-start-line="102" selection-start-column="64" selection-end-line="102" selection-end-column="64" /> <caret line="86" column="20" lean-forward="false" selection-start-line="86" selection-start-column="20" selection-end-line="86" selection-end-column="20" />
<folding> <folding />
<marker date="1516158222118" expanded="true" signature="7290:7300" ph="..." />
<marker date="1516158222118" expanded="true" signature="17653:17663" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp
View file @ f52649fe
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<div class="tab-pane fade in active" id="home"> <div class="tab-pane fade in active" id="home">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="table-header">过滤规则上传</div> <div class="table-header">过滤规则维护</div>
<form action="#" class="form-horizontal" id="filterMaintainForm" method="post" enctype="multipart/form-data"> <form action="#" class="form-horizontal" id="filterMaintainForm" method="post" enctype="multipart/form-data">
<table id="filterMaintainTable" class="table-null"> <table id="filterMaintainTable" class="table-null">
<tr><td>省份（<font color="red">必填</font>）：</td> <tr><td>省份（<font color="red">必填</font>）：</td>
......
src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp
View file @ f52649fe
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<div class="tab-pane fade in active" id="home"> <div class="tab-pane fade in active" id="home">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="table-header">数据质量规则上传</div> <div class="table-header">数据质量规则维护</div>
<form action="#" class="form-horizontal" id="ruleMaintainForm" method="post"> <form action="#" class="form-horizontal" id="ruleMaintainForm" method="post">
<table id="ruleMaintainTable" class="table-null"> <table id="ruleMaintainTable" class="table-null">
<tr><td>省份（<font color="red">必填</font>）：</td> <tr><td>省份（<font color="red">必填</font>）：</td>
......
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