Commit 370d3da1 authored by liuna's avatar liuna

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

--修改质量规则和过滤规则的指标布局
parent 73a3469e
......@@ -6,55 +6,13 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2017年12月27日 --智能分析平台&#10; --">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/entity/APPEWarningDetail.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/entity/APPEWarningDetail.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/entity/AccuracyRule.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/entity/AccuracyRule.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/entity/QualityRuleReport.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/entity/QualityRuleReport.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/AccuracyRuleDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/AccuracyRuleDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/BusinessDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/BusinessDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/DimAssociationAnaInfoDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/DimAssociationAnaInfoDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/KpiDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/KpiDao.class" />
<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/repository/ProvinceDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/ProvinceDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/QualityRuleDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/QualityRuleDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/QualityRuleReportDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/QualityRuleReportDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/QualityRuleReportInfoDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/QualityRuleReportInfoDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/QualityRuleViewDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/QualityRuleViewDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/XcdChangeOrderDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/XcdChangeOrderDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/XcdWorkingOrderInfoDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/XcdWorkingOrderInfoDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/BusinessService.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/BusinessService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/AccuracyRuleService.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/AccuracyRuleService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/QualityRuleReportService.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/QualityRuleReportService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/QualityRuleService.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/QualityRuleService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/QualityRuleViewService.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/QualityRuleViewService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/monitoroperation/AssociateDiagosisConfigurationService.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/monitoroperation/AssociateDiagosisConfigurationService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/monitoroperation/AssociateDiagosisDetailService.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/monitoroperation/AssociateDiagosisDetailService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/PageURLController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/PageURLController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/FilterRuleConfigurationController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/FilterRuleConfigurationController.class" />
<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/QualityRuleConfigurationController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.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/analysissupport/QualityRuleReportController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/QualityRuleReportController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/QualityRuleResultController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/QualityRuleResultController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/monitoroperation/AssociateDiagosisConfigurationController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/monitoroperation/AssociateDiagosisConfigurationController.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$/CmszMonitorAnalysis.iml" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PageURLController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PageURLController.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/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.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/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/AnalysisSupport/QualityRuleResult.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/ReportOperationTable.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/ReportOperationTable.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/KeyLinkProcessAnalysis.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/KeyLinkProcessAnalysis.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/RegularityAnalysis.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/RegularityAnalysis.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>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
<ignored path="$PROJECT_DIR$/target/" />
......@@ -84,33 +42,13 @@
<file leaf-file-name="PzxAnalysisController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<state relative-caret-position="528">
<caret line="80" column="16" lean-forward="false" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="QualityRuleResultController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="968">
<caret line="164" column="31" lean-forward="true" selection-start-line="164" selection-start-column="31" selection-end-line="164" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FilterRuleResultController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-843">
<caret line="105" column="15" lean-forward="false" selection-start-line="105" selection-start-column="15" selection-end-line="105" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PzxAnalysis.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/PzxAnalysis.jsp">
<provider selected="true" editor-type-id="text-editor">
......@@ -126,63 +64,51 @@
<file leaf-file-name="FlowMonitor.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="11" column="163" lean-forward="false" selection-start-line="11" selection-start-column="163" selection-end-line="11" selection-end-column="163" />
<state relative-caret-position="154">
<caret line="7" column="6" lean-forward="false" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
</file>
<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">
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="74">
<caret line="22" column="36" lean-forward="true" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<state relative-caret-position="132">
<caret line="36" column="1" lean-forward="true" selection-start-line="25" selection-start-column="0" selection-end-line="36" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="KeyLinkProcessAnalysisController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="102" column="87" lean-forward="false" selection-start-line="102" selection-start-column="87" selection-end-line="102" selection-end-column="87" />
<folding />
</state>
</provider>
</entry>
</file>
<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">
<file leaf-file-name="FilterRuleMaintain.jsp" pinned="false" current-in-tab="true">
<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="286">
<caret line="235" column="58" lean-forward="false" selection-start-line="235" selection-start-column="58" selection-end-line="235" selection-end-column="58" />
<state relative-caret-position="146">
<caret line="102" column="64" lean-forward="false" selection-start-line="102" selection-start-column="64" selection-end-line="102" selection-end-column="64" />
<folding>
<marker date="1515997518047" expanded="true" signature="7918:7928" ph="..." />
<marker date="1516158222118" expanded="true" signature="7290:7300" ph="..." />
<marker date="1516158222118" expanded="true" signature="17653:17663" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="filterResultDetailTable.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js">
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="125" column="38" lean-forward="true" selection-start-line="125" selection-start-column="38" selection-end-line="125" selection-end-column="52" />
<folding>
<marker date="1514104300498" expanded="true" signature="11023:11035" ph="..." />
<marker date="1514104300498" expanded="true" signature="17278:17288" ph="..." />
</folding>
<state relative-caret-position="264">
<caret line="22" column="36" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="QualityRuleResult.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp">
<file leaf-file-name="KeyLinkProcessAnalysisController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="241" column="37" lean-forward="true" selection-start-line="241" selection-start-column="37" selection-end-line="241" selection-end-column="37" />
<state relative-caret-position="682">
<caret line="102" column="87" lean-forward="false" selection-start-line="102" selection-start-column="87" selection-end-line="102" selection-end-column="87" />
<folding />
</state>
</provider>
......@@ -254,7 +180,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelParameterConfiguration.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AssociateDetail.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java" />
......@@ -294,17 +219,18 @@
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/ReportOperationTable.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/KeyLinkProcessAnalysis.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/RegularityAnalysis.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PageURLController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java" />
<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/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" />
</list>
</option>
</component>
......@@ -380,10 +306,9 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="AndroidView" />
<pane id="Scratches" />
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -407,30 +332,6 @@
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="cmsz" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
......@@ -450,29 +351,11 @@
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="layouts" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="MonitorOperation" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -876,7 +759,9 @@
<workItem from="1515478424195" duration="892000" />
<workItem from="1515565640800" duration="279000" />
<workItem from="1515566044813" duration="22405000" />
<workItem from="1515979833834" duration="6157000" />
<workItem from="1515979833834" duration="7707000" />
<workItem from="1516064938318" duration="12183000" />
<workItem from="1516152453873" duration="5711000" />
</task>
<task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created>
......@@ -1214,11 +1099,18 @@
<option name="project" value="LOCAL" />
<updated>1514345259929</updated>
</task>
<option name="localTasksCounter" value="49" />
<task id="LOCAL-00049" summary="2018年1月15日 --智能分析平台&#10; --修改过滤规则验收新问题">
<created>1515997876828</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1515997876828</updated>
</task>
<option name="localTasksCounter" value="50" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="715385000" />
<option name="totallyTimeSpent" value="734829000" />
</component>
<component name="TodoView" selected-index="2">
<todo-panel id="selected-file">
......@@ -1249,8 +1141,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="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="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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40819672" sideWeight="0.48907563" order="5" 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="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" />
......@@ -1356,7 +1248,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="关联配置明细" />
<MESSAGE value="修改bug ." />
<MESSAGE value="验证判断" />
<MESSAGE value="'指标告警明细 悬浮框' 功能" />
......@@ -1381,7 +1272,8 @@
<MESSAGE value="2017年12月27日 --智能分析平台&#10; --规则运营省份筛选项" />
<MESSAGE value="2017年12月27日 --智能分析平台&#10; --删除规则改为物理删除、质量报告时间精确到日" />
<MESSAGE value="2017年12月27日 --智能分析平台&#10; --质量运营时间展示修改" />
<option name="LAST_COMMIT_MESSAGE" value="2017年12月27日 --智能分析平台&#10; --质量运营时间展示修改" />
<MESSAGE value="2018年1月15日 --智能分析平台&#10; --修改过滤规则验收新问题" />
<option name="LAST_COMMIT_MESSAGE" value="2018年1月15日 --智能分析平台&#10; --修改过滤规则验收新问题" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -1452,20 +1344,98 @@
</buildFile>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="112" column="61" lean-forward="true" selection-start-line="112" selection-start-column="61" selection-end-line="112" selection-end-column="61" />
<state relative-caret-position="528">
<caret line="80" column="16" lean-forward="false" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/PzxAnalysis.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="17" column="23" lean-forward="false" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="23" />
<folding>
<marker date="1515655541929" expanded="true" signature="28903:28927" ph="..." />
<marker date="1515655541929" expanded="true" signature="29145:29159" ph="..." />
<marker date="1515655541929" expanded="true" signature="29431:29445" ph="..." />
<marker date="1515655541929" expanded="true" signature="29719:29733" ph="..." />
<marker date="1515655541929" expanded="true" signature="29896:29913" ph="..." />
<marker date="1511516640241" expanded="true" signature="42118:42166" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="6" lean-forward="false" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" column="36" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2244">
<caret line="102" column="87" lean-forward="false" selection-start-line="102" selection-start-column="87" selection-end-line="102" selection-end-column="87" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10692">
<caret line="486" column="0" lean-forward="false" selection-start-line="486" selection-start-column="0" selection-end-line="486" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1760">
<caret line="80" column="16" lean-forward="false" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/PzxAnalysis.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="17" column="23" lean-forward="false" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="23" />
<folding>
<marker date="1511516640241" expanded="true" signature="42118:42166" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" column="36" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2244">
<caret line="102" column="87" lean-forward="false" selection-start-line="102" selection-start-column="87" selection-end-line="102" selection-end-column="87" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="6" lean-forward="true" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1325">
......@@ -1494,7 +1464,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-7876">
<caret line="80" column="66" lean-forward="false" selection-start-line="80" selection-start-column="66" selection-end-line="80" selection-end-column="66" />
<folding />
</state>
</provider>
</entry>
......@@ -1502,7 +1471,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-308">
<caret line="199" column="77" lean-forward="true" selection-start-line="199" selection-start-column="77" selection-end-line="199" selection-end-column="77" />
<folding />
</state>
</provider>
</entry>
......@@ -1526,7 +1494,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="159">
<caret line="152" column="25" lean-forward="false" selection-start-line="152" selection-start-column="25" selection-end-line="152" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
......@@ -1544,14 +1511,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="80" column="16" lean-forward="false" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/PzxAnalysis.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
......@@ -1562,90 +1521,122 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="102" column="87" lean-forward="false" selection-start-line="102" selection-start-column="87" selection-end-line="102" selection-end-column="87" />
<state relative-caret-position="236">
<caret line="241" column="37" lean-forward="false" selection-start-line="241" selection-start-column="37" selection-end-line="241" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="125" column="38" lean-forward="false" selection-start-line="125" selection-start-column="38" selection-end-line="125" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="74">
<caret line="22" column="36" lean-forward="true" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<state relative-caret-position="968">
<caret line="164" column="31" lean-forward="false" selection-start-line="164" selection-start-column="31" selection-end-line="164" selection-end-column="31" />
<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/java/com/hp/cmsz/web/analysissupport/PzxAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12402">
<caret line="600" column="3" lean-forward="true" selection-start-line="600" selection-start-column="3" selection-end-line="600" selection-end-column="3" />
<state relative-caret-position="528">
<caret line="80" column="16" lean-forward="false" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="58" column="102" lean-forward="false" selection-start-line="58" selection-start-column="102" selection-end-line="58" selection-end-column="102" />
<folding>
<marker date="1515984774349" expanded="true" signature="7045:7055" ph="..." />
<marker date="1515984774349" expanded="true" signature="15104:15114" ph="..." />
</folding>
<state relative-caret-position="264">
<caret line="22" column="36" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="968">
<caret line="164" column="31" lean-forward="true" selection-start-line="164" selection-start-column="31" selection-end-line="164" selection-end-column="31" />
<state relative-caret-position="699">
<caret line="161" column="30" lean-forward="false" selection-start-line="161" selection-start-column="30" selection-end-line="161" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="102" column="87" lean-forward="false" selection-start-line="102" selection-start-column="87" selection-end-line="102" selection-end-column="87" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="151" column="0" lean-forward="true" selection-start-line="151" selection-start-column="0" selection-end-line="151" selection-end-column="0" />
<folding>
<marker date="1515997518047" expanded="true" signature="7918:7928" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="11" column="163" lean-forward="false" selection-start-line="11" selection-start-column="163" selection-end-line="11" selection-end-column="163" />
<state relative-caret-position="154">
<caret line="7" column="6" lean-forward="false" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleReportDetailTable.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-843">
<caret line="105" column="15" lean-forward="false" selection-start-line="105" selection-start-column="15" selection-end-line="105" selection-end-column="15" />
<folding />
<state relative-caret-position="-5808">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleReport.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="241" column="37" lean-forward="true" selection-start-line="241" selection-start-column="37" selection-end-line="241" selection-end-column="37" />
<state relative-caret-position="-469">
<caret line="109" column="77" lean-forward="true" selection-start-line="109" selection-start-column="77" selection-end-line="109" selection-end-column="77" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="125" column="38" lean-forward="true" selection-start-line="125" selection-start-column="38" selection-end-line="125" selection-end-column="52" />
<state relative-caret-position="132">
<caret line="117" column="44" lean-forward="false" selection-start-line="117" selection-start-column="44" selection-end-line="117" selection-end-column="44" />
<folding>
<marker date="1514104300498" expanded="true" signature="11023:11035" ph="..." />
<marker date="1514104300498" expanded="true" signature="17278:17288" ph="..." />
<marker date="1516156091649" expanded="true" signature="28911:28935" ph="..." />
<marker date="1516156091649" expanded="true" signature="29153:29167" ph="..." />
<marker date="1516156091649" expanded="true" signature="29439:29453" ph="..." />
<marker date="1516156091649" expanded="true" signature="29727:29741" ph="..." />
<marker date="1516156091649" expanded="true" signature="29904:29921" ph="..." />
</folding>
</state>
</provider>
</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/QualityRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="36" column="1" lean-forward="true" selection-start-line="25" selection-start-column="0" selection-end-line="36" selection-end-column="1" />
<folding />
</state>
</provider>
</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="286">
<caret line="235" column="58" lean-forward="false" selection-start-line="235" selection-start-column="58" selection-end-line="235" selection-end-column="58" />
<state relative-caret-position="146">
<caret line="102" column="64" lean-forward="false" selection-start-line="102" selection-start-column="64" selection-end-line="102" selection-end-column="64" />
<folding>
<marker date="1515997518047" expanded="true" signature="7918:7928" ph="..." />
<marker date="1516158222118" expanded="true" signature="7290:7300" ph="..." />
<marker date="1516158222118" expanded="true" signature="17653:17663" ph="..." />
</folding>
</state>
</provider>
......
......@@ -103,7 +103,7 @@ public class FilterRuleResultController {
@RequestMapping(value = "queryRule")
@ResponseBody
public void queryRule(
public List<FilterRule> queryRule(
String provinceArr,
String businessArr,
String isRepeat,
......@@ -159,6 +159,7 @@ public class FilterRuleResultController {
// Timestamp time1 = Timestamp.valueOf(startTime);
// Timestamp time2 = Timestamp.valueOf(endTime);
return filterRuleList;
}
......
......@@ -114,7 +114,7 @@
<ul class="dropdown-menu">
<li><a href="${ctx}/MonitorOperation/RegularityAnalysis">数据特征探查</a></li>
<li><a href="${ctx}/MonitorOperation/KeyLinkProcessAnalysis">业务环节分析</a></li>
<li><a href="${ctx}/MonitorOperation/FlowMonitor">实体厅流量监测分析</a></li>
<%--<li><a href="${ctx}/MonitorOperation/FlowMonitor">实体厅流量监测分析</a></li>--%>
</ul>
</li>
</shiro:hasPermission>
......
......@@ -28,8 +28,19 @@
/* .file-box{ position:relative;width:340px}
.txt{ height:22px; border:1px solid #cdcdcd; width:180px;}
.btn{ background-color:#FFF; border:1px solid #CDCDCD;height:24px; width:70px;}
.file{ position:absolute; top:0; right:80px; height:24px; filter:alpha(opacity:0);opacity: 0;width:260px } */
.file{ position:absolute; top:0; right:80px; height:24px; filter:alpha(opacity:0);opacity: 0;width:260px } */
#kpiTable{
margin: 0px;
padding: 0px;
height: 10px;
width: 700px;
}
#kpiTable tr td{
text-align: left;
margin: 0px;
padding: 0px;
height: 10px;
}
</style>
</head>
......@@ -89,14 +100,18 @@
<tr><td>业务(<font color="red">必填</font>):</td>
<td >
<div class="checkbox-inline"><label><input type="checkbox" id="allBusiness" name="allBusiness" checked>全选</label></div><br/>
<div id="businesstd" style="width: 50%"></div>
<div id="businesstd"></div>
</td>
</tr>
<tr><td>指标(<font color="red">必填</font>):</td>
<td>
<div class="checkbox-inline"><label><input type="checkbox" id="allKpi" name="allKpi" checked>全选</label></div><br/>
<div id="kpitd" style="width: 50%"></div>
<div id="kpitd" style="width: 50%">
<table id="kpiTable" class="kpiTable">
<tbody></tbody>
</table>
</div>
</td>
</tr>
......@@ -225,12 +240,33 @@
async: false,
beforeSend: function(data) {},
success: function(data){
var td = $("#kpitd");
td.empty();
var tbody=$('<tbody></tbody>');
data = JSON.parse(data)
data.forEach(function(t){
td.append("<input type='checkbox' name='kpiinput' class='kpiItem' value='"+t[0]+"' checked />"+t[1])
data.forEach(function(t,i){
var tr = $('<tr></tr>');
tr.empty();
if(i % 3 == 0){
if(data.length-1-i >= 3){
tr.append('<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i+1][2]+"' value='"+data[i+1][0]+"' checked >"+data[i+1][1]+"</input>"+'</td>'+
'<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i+2][2]+"' value='"+data[i+2][0]+"' checked >"+data[i+2][1]+"</input>"+'</td>'+
'<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i+3][2]+"' value='"+data[i+3][0]+"' checked >"+data[i+3][1]+"</input>"+'</td>')
tbody.append(tr);
}else if((data.length-1-i) == 2){
tr.append('<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i][2]+"' value='"+data[i][0]+"' checked >"+data[i][1]+"</input>"+'</td>'+
'<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i+1][2]+"' value='"+data[i+1][0]+"' checked >"+data[i+1][1]+"</input>"+'</td>'+
'<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i+2][2]+"' value='"+data[i+2][0]+"' checked >"+data[i+2][1]+"</input>"+'</td>')
tbody.append(tr);
}else if((data.length-1-i) == 1) {
tr.append('<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i][2]+"' value='"+data[i][0]+"' checked >"+data[i][1]+"</input>"+'</td>'+
'<td>' + "<input type='checkbox' name='kpiinput' class='kpiItem' title='" + data[i + 1][2] + "' value='" + data[i + 1][0] + "' checked >" + data[i + 1][1] + "</input>" + '</td>')
tbody.append(tr);
}else if((data.length-1-i) == 0) {
tr.append('<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i][2]+"' value='"+data[i][0]+"' checked >"+data[i][1]+"</input>"+'</td>')
tbody.append(tr);
}
}
});
$('#kpiTable tbody').replaceWith(tbody);
}
});
}
......
......@@ -23,6 +23,18 @@
width: 400px;
}
#kpiTable{
margin: 0px;
padding: 0px;
height: 10px;
width: 700px;
}
#kpiTable tr td{
text-align: left;
margin: 0px;
padding: 0px;
height: 10px;
}
</style>
</head>
......@@ -80,7 +92,9 @@
<tr><td>业务(<font color="red">必填</font>):</td>
<td >
<div class="checkbox-inline"><label><input type="checkbox" id="allBusiness" name="allBusiness" checked>全选</label></div><br/>
<div id="businesstd"></div>
<div id="businesstd">
</div>
</td>
</tr>
......@@ -95,7 +109,11 @@
<tr><td>指标(<font color="red">必填</font>):</td>
<td>
<div class="checkbox-inline"><label><input type="checkbox" id="allKpi" name="allKpi" checked>全选</label></div><br/>
<div id="kpitd"></div>
<div id="kpitd">
<table id="kpiTable" class="kpiTable">
<tbody></tbody>
</table>
</div>
</td>
</tr>
......@@ -444,12 +462,33 @@ function updateKpi(businessIds,calCycleValue){
async: false,
beforeSend: function(data) {},
success: function(data){
var td = $("#kpitd");
td.empty();
var tbody=$('<tbody></tbody>');
data = JSON.parse(data)
data.forEach(function(t){
td.append("<input type='checkbox' name='kpiinput' class='kpiItem' title='"+t[2]+"' value='"+t[0]+"' checked >"+t[1]+"</input>")
data.forEach(function(t,i){
var tr = $('<tr></tr>');
tr.empty();
if(i % 3 == 0){
if(data.length-1-i >= 3){
tr.append('<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i+1][2]+"' value='"+data[i+1][0]+"' checked >"+data[i+1][1]+"</input>"+'</td>'+
'<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i+2][2]+"' value='"+data[i+2][0]+"' checked >"+data[i+2][1]+"</input>"+'</td>'+
'<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i+3][2]+"' value='"+data[i+3][0]+"' checked >"+data[i+3][1]+"</input>"+'</td>')
tbody.append(tr);
}else if((data.length-1-i) == 2){
tr.append('<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i][2]+"' value='"+data[i][0]+"' checked >"+data[i][1]+"</input>"+'</td>'+
'<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i+1][2]+"' value='"+data[i+1][0]+"' checked >"+data[i+1][1]+"</input>"+'</td>'+
'<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i+2][2]+"' value='"+data[i+2][0]+"' checked >"+data[i+2][1]+"</input>"+'</td>')
tbody.append(tr);
}else if((data.length-1-i) == 1) {
tr.append('<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i][2]+"' value='"+data[i][0]+"' checked >"+data[i][1]+"</input>"+'</td>'+
'<td>' + "<input type='checkbox' name='kpiinput' class='kpiItem' title='" + data[i + 1][2] + "' value='" + data[i + 1][0] + "' checked >" + data[i + 1][1] + "</input>" + '</td>')
tbody.append(tr);
}else if((data.length-1-i) == 0) {
tr.append('<td>'+"<input type='checkbox' name='kpiinput' class='kpiItem' title='"+data[i][2]+"' value='"+data[i][0]+"' checked >"+data[i][1]+"</input>"+'</td>')
tbody.append(tr);
}
}
});
$('#kpiTable tbody').replaceWith(tbody);
}
});
}
......
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